diff options
author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-01-08 13:58:51 -0500 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-01-08 13:58:51 -0500 |
commit | ad14336de8e9cddae9ed29d45bd2e97abb72eaf9 (patch) | |
tree | 1846c6ca5ecc98a1ab324d9a3a97873067450f7a /arch/powerpc/Makefile | |
parent | 442ce844e139c1e3c23e8b4df13468041ae35721 (diff) |
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/powerpc/Makefile')
-rw-r--r-- | arch/powerpc/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index a13eb575f834..b98f11b6b25d 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
@@ -76,8 +76,7 @@ LINUXINCLUDE += $(LINUXINCLUDE-y) | |||
76 | CHECKFLAGS += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__ | 76 | CHECKFLAGS += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__ |
77 | 77 | ||
78 | ifeq ($(CONFIG_PPC64),y) | 78 | ifeq ($(CONFIG_PPC64),y) |
79 | GCC_VERSION := $(call cc-version) | 79 | GCC_BROKEN_VEC := $(shell if [ $(call cc-version) -lt 0400 ] ; then echo "y"; fi) |
80 | GCC_BROKEN_VEC := $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi) | ||
81 | 80 | ||
82 | ifeq ($(CONFIG_POWER4_ONLY),y) | 81 | ifeq ($(CONFIG_POWER4_ONLY),y) |
83 | ifeq ($(CONFIG_ALTIVEC),y) | 82 | ifeq ($(CONFIG_ALTIVEC),y) |
@@ -189,10 +188,9 @@ TOUT := .tmp_gas_check | |||
189 | # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec | 188 | # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec |
190 | # instructions. | 189 | # instructions. |
191 | # gcc-3.4 and binutils-2.14 are a fatal combination. | 190 | # gcc-3.4 and binutils-2.14 are a fatal combination. |
192 | GCC_VERSION := $(call cc-version) | ||
193 | 191 | ||
194 | checkbin: | 192 | checkbin: |
195 | @if test "$(GCC_VERSION)" = "0304" ; then \ | 193 | @if test "$(call cc-version)" = "0304" ; then \ |
196 | if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \ | 194 | if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \ |
197 | echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \ | 195 | echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \ |
198 | echo 'correctly with gcc-3.4 and your version of binutils.'; \ | 196 | echo 'correctly with gcc-3.4 and your version of binutils.'; \ |