svn commit: r333444 - in head/sys: conf libkern

[Warner Losh]

Author: imp
Date: Thu May 10 02:31:48 2018
New Revision: 333444
URL: https://svnweb.freebsd.org/changeset/base/333444

Log:
  Simplify things a little
  
  Rather than include a copy for memmove to call bcopy to call memcpy
  (which handles overlapping copies), make memmove a strong reference to
  memcpy to save the two calls.
  
  Differential Revision: https://reviews.freebsd.org/D15374

Modified:
  head/sys/conf/files.powerpc
  head/sys/conf/files.riscv
  head/sys/libkern/bcopy.c

Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc	Thu May 10 02:31:38 2018	(r333443)
+++ head/sys/conf/files.powerpc	Thu May 10 02:31:48 2018	(r333444)
@@ -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

Modified: head/sys/conf/files.riscv
==============================================================================
--- head/sys/conf/files.riscv	Thu May 10 02:31:38 2018	(r333443)
+++ head/sys/conf/files.riscv	Thu May 10 02:31:48 2018	(r333444)
@@ -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

Modified: head/sys/libkern/bcopy.c
==============================================================================
--- head/sys/libkern/bcopy.c	Thu May 10 02:31:38 2018	(r333443)
+++ head/sys/libkern/bcopy.c	Thu May 10 02:31:48 2018	(r333444)
@@ -50,6 +50,10 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #endif
 
+#undef memcpy
+#undef memmove
+#undef bcopy
+
 /*
  * sizeof(word) MUST BE A POWER OF TWO
  * SO THAT wmask BELOW IS ALL ONES
@@ -141,6 +145,8 @@ memcpy(void *dst0, const void *src0, size_t length)
 done:
 	return (dst0);
 }
+
+__strong_reference(memcpy, memmove);
 
 void
 (bcopy)(const void *src0, void *dst0, size_t length)