Skip to contentSkip to conversation

samples/seccomp: fix 31 bit build on s390

PATCH In review Heiko Carstens 3 participants 3 messages Sep 8, 2012 – Sep 12, 2012

lore
Share & tools
lore

Heiko Carstens

author
#0 lore raw

PATCH 1/1 samples/seccomp: fix 31 bit build on s390

Quoted 1 line

From cea999ef4e68e23c70e64baf054768bdebe15e1b Mon Sep 17 00:00:00 2001

From: Heiko Carstens <[email protected]>
Date: Sat, 8 Sep 2012 10:23:42 +0200
Subject: [PATCH] samples/seccomp: fix 31 bit build on s390

On s390 the flag to force 31 builds is -m31 instead of -m32 unlike on all (?) other architectures.

Fixes this compile error:

HOSTCC samples/seccomp/bpf-direct.o
cc1: error: unrecognized command line option "-m32" make[2]: *** [samples/seccomp/bpf-direct.o] Error 1

Signed-off-by Heiko Carstens <[email protected]>

---

Patch is on top of linux-next of today.

 samples/seccomp/Makefile | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)
samples/seccomp/Makefile +16 -8
index 16aa2d4..bbbd276 100644
@@ -18,14 +18,22 @@ HOSTCFLAGS_bpf-direct.o += -idirafter $(objtree)/include
 bpf-direct-objs := bpf-direct.o
 
 # Try to match the kernel target.
-ifeq ($(CONFIG_64BIT),)
-HOSTCFLAGS_bpf-direct.o += -m32
-HOSTCFLAGS_dropper.o += -m32
-HOSTCFLAGS_bpf-helper.o += -m32
-HOSTCFLAGS_bpf-fancy.o += -m32
-HOSTLOADLIBES_bpf-direct += -m32
-HOSTLOADLIBES_bpf-fancy += -m32
-HOSTLOADLIBES_dropper += -m32
+ifndef CONFIG_64BIT
+
+# s390 has -m31 flag to build 31 bit binaries
+ifndef CONFIG_S390
+MFLAG = -m32
+else
+MFLAG = -m31
+endif
+
+HOSTCFLAGS_bpf-direct.o += $(MFLAG)
+HOSTCFLAGS_dropper.o += $(MFLAG)
+HOSTCFLAGS_bpf-helper.o += $(MFLAG)
+HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
+HOSTLOADLIBES_bpf-direct += $(MFLAG)
+HOSTLOADLIBES_bpf-fancy += $(MFLAG)
+HOSTLOADLIBES_dropper += $(MFLAG)
 endif
 
 # Tell kbuild to always build the programs
Signature · 1 line
1.7.11.5
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Heiko Carstens

On s390 the flag to force 31 builds is -m31 instead of -m32 unlike on all (?) other architectures.

Fixes this compile error:

HOSTCC samples/seccomp/bpf-direct.o
cc1: error: unrecognized command line option "-m32" make[2]: *** [samples/seccomp/bpf-direct.o] Error 1

Signed-off-by Heiko Carstens <[email protected]>

Thanks for the catch!

Acked-by Kees Cook <[email protected]>

-Kees

Signature · 2 lines
Kees Cook
Chrome OS Security
#2 lore raw
In reply to Heiko Carstens
Quoted 8 lines · Heiko Carstens
Quoted 1 line

From cea999ef4e68e23c70e64baf054768bdebe15e1b Mon Sep 17 00:00:00 2001

From: Heiko Carstens <[email protected]>
Date: Sat, 8 Sep 2012 10:23:42 +0200
Subject: [PATCH] samples/seccomp: fix 31 bit build on s390

On s390 the flag to force 31 builds is -m31 instead of -m32 unlike on all (?) other architectures.

Quoted 7 lines

Fixes this compile error:

HOSTCC samples/seccomp/bpf-direct.o
cc1: error: unrecognized command line option "-m32" make[2]: *** [samples/seccomp/bpf-direct.o] Error 1

Signed-off-by Heiko Carstens <[email protected]>

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next