From ddbb6fe309b7f221b21b243ba9385b55bccf493a Mon Sep 17 00:00:00 2001
From: James Morris <james.l.morris@oracle.com>
Date: Wed, 12 Sep 2012 13:16:37 +1000
Subject: [PATCH] --- yaml --- r: 329112 b: refs/heads/master c:
 9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/samples/seccomp/Makefile | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4e4a66f38669..2839646fc0bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8606404fa555c2ee691376fcc640ab89fe752035
+refs/heads/master: 9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252
diff --git a/trunk/samples/seccomp/Makefile b/trunk/samples/seccomp/Makefile
index 16aa2d424985..bbbd276659ba 100644
--- a/trunk/samples/seccomp/Makefile
+++ b/trunk/samples/seccomp/Makefile
@@ -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