summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2012-10-02 16:42:36 +0200
committerMichal Marek <mmarek@suse.cz>2012-10-03 09:03:24 +0200
commitb1e0d8b70fa31821ebca3965f2ef8619d7c5e316 (patch)
tree4df17a3e10de030701ccf0868da1a94c1063b07d /arch/x86
parentfe04ddf7c2910362f3817c8156e41cbd6c0ee35d (diff)
downloadblackbird-obmc-linux-b1e0d8b70fa31821ebca3965f2ef8619d7c5e316.tar.gz
blackbird-obmc-linux-b1e0d8b70fa31821ebca3965f2ef8619d7c5e316.zip
kbuild: Fix gcc -x syntax
The correct syntax for gcc -x is "gcc -x assembler", not "gcc -xassembler". Even though the latter happens to work, the former is what is documented in the manual page and thus what gcc wrappers such as icecream do expect. This isn't a cosmetic change. The missing space prevents icecream from recognizing compilation tasks it can't handle, leading to silent kernel miscompilations. Besides me, credits go to Michael Matz and Dirk Mueller for investigating the miscompilation issue and tracking it down to this incorrect -x parameter syntax. Signed-off-by: Jean Delvare <jdelvare@suse.de> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: stable@vger.kernel.org Cc: Bernhard Walle <bernhard@bwalle.de> Cc: Michal Marek <mmarek@suse.cz> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index b0c5276861ec..cb8ac935df82 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -88,7 +88,7 @@ endif
ifdef CONFIG_X86_X32
x32_ld_ok := $(call try-run,\
/bin/echo -e '1: .quad 1b' | \
- $(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" - && \
+ $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" - && \
$(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \
$(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n)
ifeq ($(x32_ld_ok),y)
OpenPOWER on IntegriCloud