powerpc: Move ptrace32.c from arch/ppc64 to arch/powerpc

[deliverable/linux.git] / arch / powerpc / kernel / Makefile

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 58c130b10ec8cfca1d138b1d4e8dc0f99e134c19..5c5d2b5f3ca24c7e6ae4e11565aedb3e6710b6bf 100644 (file)
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -2,17 +2,51 @@
 # Makefile for the linux kernel.
 #
 
-extra-$(CONFIG_PPC_STD_MMU)    := head.o
-extra_$(CONFIG_PPC64)          := head_64.o
+ifeq ($(CONFIG_PPC64),y)
+EXTRA_CFLAGS   += -mno-minimal-toc
+endif
+ifeq ($(CONFIG_PPC32),y)
+CFLAGS_prom_init.o      += -fPIC
+CFLAGS_btext.o         += -fPIC
+endif
+
+obj-y                          := semaphore.o cputable.o ptrace.o syscalls.o \
+                                  signal_32.o
+obj-$(CONFIG_PPC64)            += binfmt_elf32.o sys_ppc32.o ptrace32.o
+obj-$(CONFIG_ALTIVEC)          += vecemu.o vector.o
+obj-$(CONFIG_POWER4)           += idle_power4.o
+obj-$(CONFIG_PPC_OF)           += of_device.o
+
+ifeq ($(CONFIG_PPC_MERGE),y)
+
+extra-$(CONFIG_PPC_STD_MMU)    := head_32.o
+extra-$(CONFIG_PPC64)          := head_64.o
 extra-$(CONFIG_40x)            := head_4xx.o
 extra-$(CONFIG_44x)            := head_44x.o
 extra-$(CONFIG_FSL_BOOKE)      := head_fsl_booke.o
 extra-$(CONFIG_8xx)            := head_8xx.o
-extra-$(CONFIG_6xx)            += idle_6xx.o
-extra-$(CONFIG_POWER4)         += idle_power4.o
+extra-$(CONFIG_PPC64)          += entry_64.o
 extra-$(CONFIG_PPC_FPU)                += fpu.o
 extra-y                                += vmlinux.lds
 
-obj-y                          := semaphore.o traps.o process.o
+obj-y                          += process.o init_task.o \
+                                  prom.o systbl.o traps.o
+obj-$(CONFIG_PPC32)            += entry_32.o idle_6xx.o setup_32.o misc_32.o
+obj-$(CONFIG_PPC64)            += setup_64.o misc_64.o
+obj-$(CONFIG_PPC_OF)           += prom_init.o
 obj-$(CONFIG_MODULES)          += ppc_ksyms.o
-obj-$(CONFIG_ALTIVEC)          += vecemu.o vector.o
+obj-$(CONFIG_BOOTX_TEXT)       += btext.o
+
+ifeq ($(CONFIG_PPC_ISERIES),y)
+$(obj)/head_64.o: $(obj)/lparmap.s
+AFLAGS_head_64.o += -I$(obj)
+endif
+
+else
+# stuff used from here for ARCH=ppc or ARCH=ppc64
+obj-$(CONFIG_PPC64)            += traps.o process.o init_task.o
+
+fpux-$(CONFIG_PPC32)           += fpu.o
+extra-$(CONFIG_PPC_FPU)                += $(fpux-y)
+
+endif