diff options
| author | Linus Torvalds | 2009-09-14 07:59:07 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-14 07:59:07 -0700 |
| commit | 6512c0d62589c9f4da00328518e492ddd1c01c7f (patch) | |
| tree | f70613120d00a9882b84f7b3149689b620860972 | |
| parent | 625037cc405eabbfd2a39e9297e583a94886225f (diff) | |
| parent | c7bd0414d681706a32105895cae20fb9090db52e (diff) | |
Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Simplify the Makefile in a minor way through use of cc-ifversion
| -rw-r--r-- | arch/x86/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 5128b178529f..7983c420eaf2 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -32,8 +32,8 @@ ifeq ($(CONFIG_X86_32),y) # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use # a lot more stack due to the lack of sharing of stacklots: - KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \ - echo $(call cc-option,-fno-unit-at-a-time); fi ;) + KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0400, \ + $(call cc-option,-fno-unit-at-a-time)) # CPU-specific tuning. Anything which can be shared with UML should go here. include $(srctree)/arch/x86/Makefile_32.cpu |