This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / Makefile

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 6cf4405..75607e9 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -23,24 +23,19 @@ endif
 LDFLAGS_vmlinux        := -Ttext $(KERNELLOAD) -Bstatic
 CPPFLAGS       += -Iarch/$(ARCH)
 AFLAGS         += -Iarch/$(ARCH)
-CFLAGS         += -Iarch/$(ARCH) -msoft-float -pipe \
+cflags-y       += -Iarch/$(ARCH) -msoft-float -pipe \
                -ffixed-r2 -Wno-uninitialized -mmultiple
 CPP            = $(CC) -E $(CFLAGS)
 
-CHECK          := $(CHECK) -D__powerpc__=1
-
 ifndef CONFIG_E500
-CFLAGS         += -mstring
+cflags-y       += -mstring
 endif
 
-cpu-as-$(CONFIG_PPC64BRIDGE)   += -Wa,-mppc64bridge
-cpu-as-$(CONFIG_4xx)           += -Wa,-m405
-cpu-as-$(CONFIG_6xx)           += -Wa,-maltivec
-cpu-as-$(CONFIG_POWER4)                += -Wa,-maltivec
-cpu-as-$(CONFIG_E500)          += -Wa,-me500
+cflags-$(CONFIG_4xx)           += -Wa,-m405
+cflags-$(CONFIG_E500)          += -Wa,-me500
+cflags-$(CONFIG_PPC64BRIDGE)   += -Wa,-mppc64bridge
 
-AFLAGS += $(cpu-as-y)
-CFLAGS += $(cpu-as-y)
+CFLAGS += $(cflags-y)
 
 head-y                         := arch/ppc/kernel/head.o
 head-$(CONFIG_8xx)             := arch/ppc/kernel/head_8xx.o
@@ -112,24 +107,17 @@ GOODVER   := 2.12.1
 else
 NEW_AS := 0
 endif
-# gcc-3.4 and binutils-2.14 are a fatal combination.
-GCC_VERSION    := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
-BAD_GCC_AS     := $(shell echo mftb 5 | $(AS) -mppc -many -o /dev/null >/dev/null 2>&1 && echo 0 || echo 1)
 
-checkbin:
-ifeq ($(GCC_VERSION)$(BAD_GCC_AS),03041)
-       @echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '
-       @echo 'correctly with gcc-3.4 and your version of binutils.'
-       @echo '*** Please upgrade your binutils or downgrade your gcc'
-       @false
-endif
 ifneq ($(NEW_AS),0)
+checkbin:
        @echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '
        @echo 'correctly with old versions of binutils.'
        @echo '*** Please upgrade your binutils to ${GOODVER} or newer'
        @false
-endif
+else
+checkbin:
        @true
+endif
 
 CLEAN_FILES += include/asm-$(ARCH)/offsets.h \
                arch/$(ARCH)/kernel/asm-offsets.s