Pull misc into release branch

[linux-2.6] / arch / powerpc / platforms / cell / spufs / Makefile

diff --git a/arch/powerpc/platforms/cell/spufs/Makefile b/arch/powerpc/platforms/cell/spufs/Makefile
index 7963d520b67ba5f24164d681d92196cc5f1b80e5..328afcf895032e50a7f36b0a7f00a38d3ca7aade 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/Makefile
+++ b/arch/powerpc/platforms/cell/spufs/Makefile
@@ -1,8 +1,8 @@
-obj-y += switch.o
+obj-y += switch.o fault.o lscsa_alloc.o
 
 obj-$(CONFIG_SPU_FS) += spufs.o
-spufs-y += inode.o file.o context.o syscalls.o
-spufs-y += sched.o backing_ops.o hw_ops.o run.o
+spufs-y += inode.o file.o context.o syscalls.o coredump.o
+spufs-y += sched.o backing_ops.o hw_ops.o run.o gang.o
 
 # Rules to build switch.o with the help of SPU tool chain
 SPU_CROSS      := spu-
@@ -10,11 +10,14 @@ SPU_CC              := $(SPU_CROSS)gcc
 SPU_AS         := $(SPU_CROSS)gcc
 SPU_LD         := $(SPU_CROSS)ld
 SPU_OBJCOPY    := $(SPU_CROSS)objcopy
-SPU_CFLAGS     := -O2 -Wall -I$(srctree)/include -I$(objtree)/include2
-SPU_AFLAGS     := -c -D__ASSEMBLY__ -I$(srctree)/include -I$(objtree)/include2
+SPU_CFLAGS     := -O2 -Wall -I$(srctree)/include \
+                  -I$(objtree)/include2 -D__KERNEL__
+SPU_AFLAGS     := -c -D__ASSEMBLY__ -I$(srctree)/include \
+                  -I$(objtree)/include2 -D__KERNEL__
 SPU_LDFLAGS    := -N -Ttext=0x0
 
 $(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h
+clean-files := spu_save_dump.h spu_restore_dump.h
 
 # Compile SPU files
       cmd_spu_cc = $(SPU_CC) $(SPU_CFLAGS) -c -o $@ $<
@@ -47,7 +50,8 @@ cmd_hexdump   = ( \
                echo " * Hex-dump auto generated from $*.c." ; \
                echo " * Do not edit!" ; \
                echo " */" ; \
-               echo "static unsigned int $*_code[] __page_aligned = {" ; \
+               echo "static unsigned int $*_code[] " \
+                       "__attribute__((__aligned__(128))) = {" ; \
                hexdump -v -e '"0x" 4/1 "%02x" "," "\n"' $< ; \
                echo "};" ; \
                ) > $@