diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 18:56:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 18:56:10 -0400 |
| commit | d43b7167d4c74137f9a6c61fdcead127d60357f9 (patch) | |
| tree | 21661650720837e3f5ed8f8c5ded4c9b91a10e83 /tools | |
| parent | 80b810b276cf89587cdaa103e39027813b1be46c (diff) | |
| parent | b1e0d8b70fa31821ebca3965f2ef8619d7c5e316 (diff) | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fixes from Michal Marek:
"Here are two fixes I intended to send after v3.6-rc7, but failed to do
so. So please pull them for v3.7-rc1 and they will be picked up by
stable.
The first one fixes gcc -x <language> syntax in various build-time
tests, which icecream and possible other gcc wrappers did not
understand (and yes, icecream is going to be fixed as well).
The second one fixes make tar-pkg so that unpacking the tarball does
not replace the /lib -> /usr/lib symlink on recent Fedora releases."
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Fix gcc -x syntax
kbuild: Do not package /boot and /lib in make tar-pkg
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 e5e71e7d95a0..86258c2a2c23 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -72,7 +72,7 @@ ifeq ($(ARCH),x86_64) | |||
| 72 | override ARCH := x86 | 72 | override ARCH := x86 |
| 73 | IS_X86_64 := 0 | 73 | IS_X86_64 := 0 |
| 74 | ifeq (, $(findstring m32,$(EXTRA_CFLAGS))) | 74 | ifeq (, $(findstring m32,$(EXTRA_CFLAGS))) |
| 75 | IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1) | 75 | IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) |
| 76 | endif | 76 | endif |
| 77 | ifeq (${IS_X86_64}, 1) | 77 | ifeq (${IS_X86_64}, 1) |
| 78 | RAW_ARCH := x86_64 | 78 | 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) |