Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b25b09ecf98bf6a32f3732281c2db13be6aeb14c

Authored by Heiko Carstens
Committed by James Morris
1 parent 2e4930eb7c
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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 <heiko.carstens@de.ibm.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.l.morris@oracle.com>

Showing 1 changed file with 16 additions and 8 deletions Side-by-side Diff

samples/seccomp/Makefile
Diff comments   View file @ b25b09e
... ... @@ -18,14 +18,22 @@
18 18 bpf-direct-objs := bpf-direct.o
19 19  
20 20 # Try to match the kernel target.
21   -ifeq ($(CONFIG_64BIT),)
22   -HOSTCFLAGS_bpf-direct.o += -m32
23   -HOSTCFLAGS_dropper.o += -m32
24   -HOSTCFLAGS_bpf-helper.o += -m32
25   -HOSTCFLAGS_bpf-fancy.o += -m32
26   -HOSTLOADLIBES_bpf-direct += -m32
27   -HOSTLOADLIBES_bpf-fancy += -m32
28   -HOSTLOADLIBES_dropper += -m32
  21 +ifndef CONFIG_64BIT
  22 +
  23 +# s390 has -m31 flag to build 31 bit binaries
  24 +ifndef CONFIG_S390
  25 +MFLAG = -m32
  26 +else
  27 +MFLAG = -m31
  28 +endif
  29 +
  30 +HOSTCFLAGS_bpf-direct.o += $(MFLAG)
  31 +HOSTCFLAGS_dropper.o += $(MFLAG)
  32 +HOSTCFLAGS_bpf-helper.o += $(MFLAG)
  33 +HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
  34 +HOSTLOADLIBES_bpf-direct += $(MFLAG)
  35 +HOSTLOADLIBES_bpf-fancy += $(MFLAG)
  36 +HOSTLOADLIBES_dropper += $(MFLAG)
29 37 endif
30 38  
31 39 # Tell kbuild to always build the programs