This is a note to let you know that I've just added the patch titled
x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-64-build-fix-stack-protector-makefile-breakage-with-32-bit-userland.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 14262d67fe348018af368a07430fbc06eadeabb1 Mon Sep 17 00:00:00 2001
From: George Spelvin <linux@xxxxxxxxxxx>
Date: Wed, 7 May 2014 17:05:52 -0400
Subject: x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
From: George Spelvin <linux@xxxxxxxxxxx>
commit 14262d67fe348018af368a07430fbc06eadeabb1 upstream.
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@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20140507210552.7581.qmail@xxxxxxxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/Makefile | 1 +
1 file changed, 1 insertion(+)
--- 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
Patches currently in stable-queue which might be from linux@xxxxxxxxxxx are
queue-3.14/x86-64-build-fix-stack-protector-makefile-breakage-with-32-bit-userland.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html