diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 4ecb62bbf88..47bb54ab9b3 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -95,7 +95,6 @@ libkern/fls.c standard libkern/flsl.c standard libkern/flsll.c standard libkern/lshrdi3.c optional powerpc | powerpcspe -libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c optional powerpc | powerpcspe libkern/qdivrem.c optional powerpc | powerpcspe diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv index 24982606aad..fef89ddec38 100644 --- a/sys/conf/files.riscv +++ b/sys/conf/files.riscv @@ -19,7 +19,6 @@ libkern/ffsll.c standard libkern/fls.c standard libkern/flsl.c standard libkern/flsll.c standard -libkern/memmove.c standard libkern/memset.c standard riscv/riscv/autoconf.c standard riscv/riscv/bus_machdep.c standard diff --git a/sys/libkern/bcopy.c b/sys/libkern/bcopy.c index 3d131eb48f9..1469cb1b707 100644 --- a/sys/libkern/bcopy.c +++ b/sys/libkern/bcopy.c @@ -50,6 +50,10 @@ __FBSDID("$FreeBSD$"); #include #endif +#undef memcpy +#undef memmove +#undef bcopy + /* * sizeof(word) MUST BE A POWER OF TWO * SO THAT wmask BELOW IS ALL ONES @@ -142,6 +146,8 @@ memcpy(void *dst0, const void *src0, size_t length) return (dst0); } +__strong_reference(memcpy, memmove); + void (bcopy)(const void *src0, void *dst0, size_t length) {