From owner-svn-src-head@freebsd.org Thu May 10 02:31:50 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D32EFD52CE; Thu, 10 May 2018 02:31:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E06447317D; Thu, 10 May 2018 02:31:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C0D981A308; Thu, 10 May 2018 02:31:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4A2Vndv054327; Thu, 10 May 2018 02:31:49 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4A2VnS0054324; Thu, 10 May 2018 02:31:49 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201805100231.w4A2VnS0054324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 10 May 2018 02:31:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333444 - in head/sys: conf libkern X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys: conf libkern X-SVN-Commit-Revision: 333444 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 May 2018 02:31:50 -0000 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 #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)