Skip to content

Commit 5cc10f4

Browse files
MingcongBaiKexyBiscuit
authored andcommitted
AOSCOS: MIPS: lib: exclude generic memset.o if CPU_LOONGSON64 is set
In "AOSCOS: memset optimization for loongson-3", a Loongson-3-specific memset implementation was introduced, with its own set of definitions for `bzero' and `memset' routines. This resulted in multiple definitions for the aforementioned assembly routines, causing vmlinux to fail to link. Exclude generic memset.o if `CPU_LOONGSON64' is set to avoid this error. Fixes: "AOSCOS: memset optimization for loongson-3" Signed-off-by: Mingcong Bai <[email protected]> Signed-off-by: Kexy Biscuit <[email protected]>
1 parent 1631d36 commit 5cc10f4

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/mips/lib/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ lib-y += bitops.o csum_partial.o delay.o memcpy.o memset.o \
1212
obj-y += iomap_copy.o
1313
obj-$(CONFIG_PCI) += iomap-pci.o
1414
lib-$(CONFIG_GENERIC_CSUM) := $(filter-out csum_partial.o, $(lib-y))
15+
lib-$(CONFIG_CPU_LOONGSON64) := $(filter-out memset.o, $(lib-y))
1516

1617
obj-$(CONFIG_CPU_GENERIC_DUMP_TLB) += dump_tlb.o
1718
obj-$(CONFIG_CPU_R3000) += r3k_dump_tlb.o

0 commit comments

Comments
 (0)