1 files changed, 12 insertions, 15 deletions

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 597562f69b2d..7902802a19a5 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -9,33 +9,30 @@ ccflags-$(CONFIG_PPC64)	:= $(NO_MINIMAL_TOC)
 CFLAGS_REMOVE_code-patching.o = -pg
 CFLAGS_REMOVE_feature-fixups.o = -pg
 
-obj-y                   := string.o alloc.o \
-                           crtsavres.o ppc_ksyms.o
+obj-y += string.o alloc.o crtsavres.o ppc_ksyms.o code-patching.o \
+         feature-fixups.o
+
 obj-$(CONFIG_PPC32)     += div64.o copy_32.o
 
-obj-$(CONFIG_PPC64)     += copypage_64.o copyuser_64.o \
-                           usercopy_64.o mem_64.o string.o \
-                           hweight_64.o \
-                           copyuser_power7.o string_64.o copypage_power7.o
+obj64-y += copypage_64.o copyuser_64.o usercopy_64.o mem_64.o hweight_64.o \
+           copyuser_power7.o string_64.o copypage_power7.o memcpy_power7.o \
+           memcpy_64.o memcmp_64.o
+
+obj64-$(CONFIG_SMP)     += locks.o
+obj64-$(CONFIG_ALTIVEC) += vmx-helper.o
+
 ifeq ($(CONFIG_GENERIC_CSUM),)
 obj-y                   += checksum_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_PPC64)     += checksum_wrappers_64.o
 endif
 
-obj-$(CONFIG_PPC64)             += memcpy_power7.o memcpy_64.o 
-
 obj-$(CONFIG_PPC_EMULATE_SSTEP) += sstep.o ldstfp.o
 
-ifeq ($(CONFIG_PPC64),y)
-obj-$(CONFIG_SMP)       += locks.o
-obj-$(CONFIG_ALTIVEC)   += vmx-helper.o
-endif
-
 obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
 
-obj-y                   += code-patching.o
-obj-y                   += feature-fixups.o
 obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o
 
 obj-$(CONFIG_ALTIVEC)   += xor_vmx.o
 CFLAGS_xor_vmx.o += -maltivec -mabi=altivec
+
+obj-$(CONFIG_PPC64) += $(obj64-y)