forked from Minki/linux
275aaa6833
The seccomp filters are currently built for the build host, not for the
machine that they are going to run on, but they are also built for with
the -m32 flag if the kernel is built for a 32 bit machine, both of which
seems rather odd.
It broke allyesconfig on my machine, which is x86-64, but building for
32 bit ARM, with this error message:
In file included from /usr/include/stdio.h:28:0,
from samples/seccomp/bpf-fancy.c:15:
/usr/include/features.h:324:26: fatal error: bits/predefs.h: No such file or directory
because there are no 32 bit libc headers installed on this machine. We
should really be building all the samples for the target machine rather
than the build host, but since the infrastructure for that appears to be
missing right now, let's be a little bit smarter and not pass the '-m32'
flag to the HOSTCC when cross- compiling.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: James Morris <james.l.morris@oracle.com>
Acked-by: Will Drewry <wad@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
43 lines
1.2 KiB
Makefile
43 lines
1.2 KiB
Makefile
# kbuild trick to avoid linker error. Can be omitted if a module is built.
|
|
obj- := dummy.o
|
|
|
|
hostprogs-$(CONFIG_SECCOMP_FILTER) := bpf-fancy dropper bpf-direct
|
|
|
|
HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
|
|
HOSTCFLAGS_bpf-fancy.o += -idirafter $(objtree)/include
|
|
HOSTCFLAGS_bpf-helper.o += -I$(objtree)/usr/include
|
|
HOSTCFLAGS_bpf-helper.o += -idirafter $(objtree)/include
|
|
bpf-fancy-objs := bpf-fancy.o bpf-helper.o
|
|
|
|
HOSTCFLAGS_dropper.o += -I$(objtree)/usr/include
|
|
HOSTCFLAGS_dropper.o += -idirafter $(objtree)/include
|
|
dropper-objs := dropper.o
|
|
|
|
HOSTCFLAGS_bpf-direct.o += -I$(objtree)/usr/include
|
|
HOSTCFLAGS_bpf-direct.o += -idirafter $(objtree)/include
|
|
bpf-direct-objs := bpf-direct.o
|
|
|
|
# Try to match the kernel target.
|
|
ifndef CONFIG_64BIT
|
|
ifndef CROSS_COMPILE
|
|
|
|
# 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
|
|
endif
|
|
|
|
# Tell kbuild to always build the programs
|
|
always := $(hostprogs-y)
|