From: Andreas Ruprecht Date: Wed, 17 Dec 2014 11:05:13 +0000 (+0100) Subject: powerpc/lib: Do not include string.o in obj-y twice X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=803d57de2b27000ed4400d16561c75821efe8333;p=openwrt%2Fstaging%2Fblogic.git powerpc/lib: Do not include string.o in obj-y twice In the Makefile, string.o (which is generated from string.S) is included into the list of objects being built unconditionally (obj-y) in line 12. Additionally, if CONFIG_PPC64 is set, it is included again in line 17. This patch removes the latter unnecessary inclusion. Signed-off-by: Andreas Ruprecht Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 597562f69b2d..1b01159b81f3 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -14,8 +14,7 @@ obj-y := string.o alloc.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 \ + usercopy_64.o mem_64.o hweight_64.o \ copyuser_power7.o string_64.o copypage_power7.o ifeq ($(CONFIG_GENERIC_CSUM),) obj-y += checksum_$(CONFIG_WORD_SIZE).o