Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

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

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 36d94af..75607e9 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -13,23 +13,35 @@
 # 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-y       += -Iarch/$(ARCH) -msoft-float -pipe \
-               -ffixed-r2 -Wno-uninitialized -mmultiple -mstring
+               -ffixed-r2 -Wno-uninitialized -mmultiple
 CPP            = $(CC) -E $(CFLAGS)
 
+ifndef CONFIG_E500
+cflags-y       += -mstring
+endif
+
 cflags-$(CONFIG_4xx)           += -Wa,-m405
+cflags-$(CONFIG_E500)          += -Wa,-me500
 cflags-$(CONFIG_PPC64BRIDGE)   += -Wa,-mppc64bridge
 
 CFLAGS += $(cflags-y)
 
-
 head-y                         := arch/ppc/kernel/head.o
 head-$(CONFIG_8xx)             := arch/ppc/kernel/head_8xx.o
 head-$(CONFIG_4xx)             := arch/ppc/kernel/head_4xx.o
 head-$(CONFIG_44x)             := arch/ppc/kernel/head_44x.o
+head-$(CONFIG_E500)            := arch/ppc/kernel/head_e500.o
 
 head-$(CONFIG_6xx)             += arch/ppc/kernel/idle_6xx.o
 head-$(CONFIG_POWER4)          += arch/ppc/kernel/idle_power4.o
@@ -37,12 +49,15 @@ head-$(CONFIG_POWER4)               += arch/ppc/kernel/idle_power4.o
 core-y                         += arch/ppc/kernel/ arch/ppc/platforms/ \
                                   arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/
 core-$(CONFIG_4xx)             += arch/ppc/platforms/4xx/
+core-$(CONFIG_85xx)            += arch/ppc/platforms/85xx/
 core-$(CONFIG_MATH_EMULATION)  += arch/ppc/math-emu/
 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_8260)         += arch/ppc/8260_io/
+drivers-$(CONFIG_CPM2)         += arch/ppc/8260_io/
+
+drivers-$(CONFIG_OPROFILE)     += arch/ppc/oprofile/
 
 BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
 
@@ -87,7 +102,7 @@ include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
 
 ifdef CONFIG_6xx
 # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later
-NEW_AS := $(shell echo dssall | $(AS) -o /dev/null >/dev/null 2>&1 ; echo $$?)
+NEW_AS := $(shell echo dssall | $(AS) -many -o /dev/null >/dev/null 2>&1 ; echo $$?)
 GOODVER        := 2.12.1
 else
 NEW_AS := 0
@@ -95,7 +110,7 @@ endif
 
 ifneq ($(NEW_AS),0)
 checkbin:
-       @echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build'
+       @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