vserver 1.9.5.x5

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

diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 59fdc0e..e8f9cd7 100644 (file)
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -32,10 +32,15 @@ CHECKFLAGS  += -m64 -D__powerpc__
 
 LDFLAGS                := -m elf64ppc
 LDFLAGS_vmlinux        := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
-CFLAGS         += -msoft-float -pipe -mminimal-toc -mtraceback=none
+CFLAGS         += -msoft-float -pipe -mminimal-toc -mtraceback=none \
+                  -mcall-aixdesc
 
 ifeq ($(CONFIG_POWER4_ONLY),y)
+ifeq ($(CONFIG_ALTIVEC),y)
+       CFLAGS += $(call cc-option,-mcpu=970)
+else
        CFLAGS += $(call cc-option,-mcpu=power4)
+endif
 else
        CFLAGS += $(call cc-option,-mtune=power4)
 endif
@@ -55,11 +60,13 @@ drivers-$(CONFIG_OPROFILE)  += arch/ppc64/oprofile/
 boot := arch/ppc64/boot
 
 boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd
+boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd
 boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm
 $(boottarget-y): vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 bootimage-$(CONFIG_PPC_PSERIES) := zImage
+bootimage-$(CONFIG_PPC_MAPLE) := zImage
 bootimage-$(CONFIG_PPC_ISERIES) := vmlinux
 BOOTIMAGE := $(bootimage-y)
 install: vmlinux