From owner-dev-commits-src-branches@freebsd.org Mon Jul 19 09:57:35 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8137654025; Mon, 19 Jul 2021 09:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GSy275s0cz3q0l; Mon, 19 Jul 2021 09:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD53D1530D; Mon, 19 Jul 2021 09:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16J9vZif023884; Mon, 19 Jul 2021 09:57:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16J9vZVp023883; Mon, 19 Jul 2021 09:57:35 GMT (envelope-from git) Date: Mon, 19 Jul 2021 09:57:35 GMT Message-Id: <202107190957.16J9vZVp023883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: a54e547950f7 - stable/13 - arm: replace byte-by-byte memcmp with an already existing asm variant MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a54e547950f7fd146fefa166aea9bbbbe2c01e7c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2021 09:57:36 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a54e547950f7fd146fefa166aea9bbbbe2c01e7c commit a54e547950f7fd146fefa166aea9bbbbe2c01e7c Author: Mateusz Guzik AuthorDate: 2021-07-19 09:54:18 +0000 Commit: Mateusz Guzik CommitDate: 2021-07-19 09:54:18 +0000 arm: replace byte-by-byte memcmp with an already existing asm variant So happens bcmp as found in support.S is in fact renamed memcmp, add memcmp back as a symbol. This is a direct commit to keep the old symbol around, see 9ef5b65085ed2acd ("arm: bcmp -> memcmp") in main for reference. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/arm/arm/support.S | 2 ++ sys/conf/files.arm | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S index a3ee3c3b93ba..83b295feafce 100644 --- a/sys/arm/arm/support.S +++ b/sys/arm/arm/support.S @@ -241,6 +241,7 @@ EEND(memset) END(bzero) ENTRY(bcmp) +EENTRY(memcmp) mov ip, r0 cmp r2, #0x06 beq .Lmemcmp_6bytes @@ -348,6 +349,7 @@ ENTRY(bcmp) RETne /* Return if mismatch on #4 */ sub r0, r3, r2 /* r0 = b1#5 - b2#5 */ RET +EEND(memcmp) END(bcmp) ENTRY(bcopy) diff --git a/sys/conf/files.arm b/sys/conf/files.arm index a3b0d166f020..44402b5aa433 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -123,7 +123,6 @@ libkern/fls.c optional !armv7 !armv6 libkern/flsl.c optional !armv7 !armv6 libkern/flsll.c optional !armv7 !armv6 libkern/lshrdi3.c standard -libkern/memcmp.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/strlen.c standard