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 e15c691..cf7a3a4 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -13,34 +13,22 @@
 # This must match PAGE_OFFSET in include/asm-ppc/page.h.
 KERNELLOAD     := $(CONFIG_KERNEL_START)
 
-HAS_BIARCH     := $(shell if $(CC) -m32 -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo y; else echo n; fi;)
-ifeq ($(HAS_BIARCH),y)
-AS             := $(AS) -a32
-LD             := $(LD) -m elf32ppc
-CC             := $(CC) -m32
-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
@@ -60,9 +48,7 @@ core-$(CONFIG_XMON)           += arch/ppc/xmon/
 core-$(CONFIG_APUS)            += arch/ppc/amiga/
 drivers-$(CONFIG_8xx)          += arch/ppc/8xx_io/
 drivers-$(CONFIG_4xx)          += arch/ppc/4xx_io/
-drivers-$(CONFIG_CPM2)         += arch/ppc/8260_io/
-
-drivers-$(CONFIG_OPROFILE)     += arch/ppc/oprofile/
+drivers-$(CONFIG_8260)         += arch/ppc/8260_io/
 
 BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
 
@@ -74,6 +60,7 @@ AFLAGS_vmlinux.lds.o  := -Upowerpc
 
 # All the instructions talk about "make bzImage".
 bzImage: zImage
+       cp vmlinux arch/ppc/boot/bzImage
 
 boot := arch/$(ARCH)/boot
 
@@ -111,24 +98,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