diff options
| author | Jean Delvare <jdelvare@suse.de> | 2012-10-02 10:42:36 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-10-03 03:03:24 -0400 |
| commit | b1e0d8b70fa31821ebca3965f2ef8619d7c5e316 (patch) | |
| tree | 4df17a3e10de030701ccf0868da1a94c1063b07d /tools | |
| parent | fe04ddf7c2910362f3817c8156e41cbd6c0ee35d (diff) | |
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 'tools')
| -rw-r--r-- | tools/perf/Makefile | 2 | ||||
| -rw-r--r-- | tools/power/cpupower/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 77f124fe57ad..d9776568e8cd 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -62,7 +62,7 @@ ifeq ($(ARCH),x86_64) | |||
| 62 | ARCH := x86 | 62 | ARCH := x86 |
| 63 | IS_X86_64 := 0 | 63 | IS_X86_64 := 0 |
| 64 | ifeq (, $(findstring m32,$(EXTRA_CFLAGS))) | 64 | ifeq (, $(findstring m32,$(EXTRA_CFLAGS))) |
| 65 | IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1) | 65 | IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) |
| 66 | endif | 66 | endif |
| 67 | ifeq (${IS_X86_64}, 1) | 67 | ifeq (${IS_X86_64}, 1) |
| 68 | RAW_ARCH := x86_64 | 68 | RAW_ARCH := x86_64 |
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index a93e06cfcc2a..cf397bd26d0c 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile | |||
| @@ -111,7 +111,7 @@ GMO_FILES = ${shell for HLANG in ${LANGUAGES}; do echo $(OUTPUT)po/$$HLANG.gmo; | |||
| 111 | export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS | 111 | export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS |
| 112 | 112 | ||
| 113 | # check if compiler option is supported | 113 | # check if compiler option is supported |
| 114 | cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} | 114 | cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} |
| 115 | 115 | ||
| 116 | # use '-Os' optimization if available, else use -O2 | 116 | # use '-Os' optimization if available, else use -O2 |
| 117 | OPTIMIZATION := $(call cc-supports,-Os,-O2) | 117 | OPTIMIZATION := $(call cc-supports,-Os,-O2) |