diff options
author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-01-08 19:58:51 +0100 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-01-08 19:58:51 +0100 |
commit | ad14336de8e9cddae9ed29d45bd2e97abb72eaf9 (patch) | |
tree | 1846c6ca5ecc98a1ab324d9a3a97873067450f7a /arch/ia64 | |
parent | 442ce844e139c1e3c23e8b4df13468041ae35721 (diff) | |
download | linux-ad14336de8e9cddae9ed29d45bd2e97abb72eaf9.tar.gz linux-ad14336de8e9cddae9ed29d45bd2e97abb72eaf9.tar.bz2 linux-ad14336de8e9cddae9ed29d45bd2e97abb72eaf9.zip |
kbuild: remove GCC_VERSION
This was causing some ordering problems. Remove the up-front evaluation
and just revaluate the compiler version each time we need it.
(The up-front evaluation was problematic because some architectures modify
the value of $(CC)).
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 67932ad53082..f722e1a25948 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -25,7 +25,6 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \ -falign-functions=32 -frename-registers -fno-optimize-sibling-calls CFLAGS_KERNEL := -mconstant-gp -GCC_VERSION := $(call cc-version) GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)") CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)") @@ -37,11 +36,7 @@ $(error Sorry, you need a newer version of the assember, one that is built from ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz) endif -ifneq ($(shell if [ $(GCC_VERSION) -lt 0300 ] ; then echo "bad"; fi ;),) -$(error Sorry, your compiler is too old. GCC v2.96 is known to generate bad code.) -endif - -ifeq ($(GCC_VERSION),0304) +ifeq ($(call cc-version),0304) cflags-$(CONFIG_ITANIUM) += -mtune=merced cflags-$(CONFIG_MCKINLEY) += -mtune=mckinley endif |