diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-09-21 10:16:20 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 09:12:02 +1000 |
commit | 2578bfae84a78bd46fdbc0d2f9d39e9fbc9c8a3f (patch) | |
tree | 9dad1abf1dd5fa31cc1d507d559baa7e52d6a836 /arch/powerpc/lib/Makefile | |
parent | 75918a4b5998c93ee1ab131fbe64b97b5d0d2315 (diff) | |
download | blackbird-op-linux-2578bfae84a78bd46fdbc0d2f9d39e9fbc9c8a3f.tar.gz blackbird-op-linux-2578bfae84a78bd46fdbc0d2f9d39e9fbc9c8a3f.zip |
[POWERPC] Create and use CONFIG_WORD_SIZE
Linus made this suggestion for the x86 merge and this starts the process
for powerpc. We assume that CONFIG_PPC64 implies CONFIG_PPC_MERGE and
CONFIG_PPC_STD_MMU_32 implies CONFIG_PPC_STD_MMU.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/lib/Makefile')
-rw-r--r-- | arch/powerpc/lib/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 23bbb1ea7f9f..65d492e316a6 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -7,11 +7,12 @@ EXTRA_CFLAGS += -mno-minimal-toc endif ifeq ($(CONFIG_PPC_MERGE),y) -obj-y := string.o alloc.o -obj-$(CONFIG_PPC32) += div64.o copy_32.o checksum_32.o +obj-y := string.o alloc.o \ + checksum_$(CONFIG_WORD_SIZE).o +obj-$(CONFIG_PPC32) += div64.o copy_32.o endif -obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o \ +obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ memcpy_64.o usercopy_64.o mem_64.o string.o obj-$(CONFIG_QUICC_ENGINE) += rheap.o obj-$(CONFIG_XMON) += sstep.o |