summaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorGeorge Spelvin <linux@horizon.com>2014-05-07 17:05:52 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2014-05-07 14:14:44 -0700
commit14262d67fe348018af368a07430fbc06eadeabb1 (patch)
tree2bb6357876a66c4a588d6937115c0b4e83f6fba7 /arch/x86/Makefile
parentaadca6fa4068ad1f92c492bc8507b7ed350825a2 (diff)
downloadblackbird-op-linux-14262d67fe348018af368a07430fbc06eadeabb1.tar.gz
blackbird-op-linux-14262d67fe348018af368a07430fbc06eadeabb1.zip
x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
If you are using a 64-bit kernel with 32-bit userland, then scripts/gcc-x86_64-has-stack-protector.sh invokes 32-bit gcc with -mcmodel=kernel, which produces: <stdin>:1:0: error: code model 'kernel' not supported in the 32 bit mode and trips the "broken compiler" test at arch/x86/Makefile:120. There are several places a fix is possible, but the following seems cleanest. (But it's minimal; it would also be possible to factor out a bunch of stuff from the two branches of the if.) Signed-off-by: George Spelvin <linux@horizon.com> Link: http://lkml.kernel.org/r/20140507210552.7581.qmail@ns.horizon.com Cc: <stable@vger.kernel.org> # v3.14 Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/Makefile')
-rw-r--r--arch/x86/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index ce6ad7e6a7d7..33f71b01fd22 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -79,6 +79,7 @@ else
UTS_MACHINE := x86_64
CHECKFLAGS += -D__x86_64__ -m64
+ biarch := -m64
KBUILD_AFLAGS += -m64
KBUILD_CFLAGS += -m64
OpenPOWER on IntegriCloud