From owner-dev-commits-src-main@freebsd.org Mon Jul 19 09:53:50 2021 Return-Path: Delivered-To: dev-commits-src-main@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 B952C653D25; Mon, 19 Jul 2021 09:53:50 +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 4GSxxp4ZVBz3pc3; Mon, 19 Jul 2021 09:53:50 +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 84A8F15254; Mon, 19 Jul 2021 09:53:50 +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 16J9roNS023460; Mon, 19 Jul 2021 09:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16J9rotO023459; Mon, 19 Jul 2021 09:53:50 GMT (envelope-from git) Date: Mon, 19 Jul 2021 09:53:50 GMT Message-Id: <202107190953.16J9rotO023459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 9ef5b65085ed - main - arm: bcmp -> memcmp 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/main X-Git-Reftype: branch X-Git-Commit: 9ef5b65085ed2acdb1db19a1ec4d44ab5137e8b9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2021 09:53:50 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef5b65085ed2acdb1db19a1ec4d44ab5137e8b9 commit 9ef5b65085ed2acdb1db19a1ec4d44ab5137e8b9 Author: Mateusz Guzik AuthorDate: 2021-07-19 09:52:23 +0000 Commit: Mateusz Guzik CommitDate: 2021-07-19 09:52:23 +0000 arm: bcmp -> memcmp The bcmp symbol is not used, at the same time memcmp as pulled from libkern does byte-by-byte comparison. So happens bcmp as found in support.S is in fact renamed memcmp, rename it back. Discussed with: cognet Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/arm/arm/support.S | 4 ++-- sys/conf/files.arm | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S index 7a39c283aed1..bcb0b8cffbbb 100644 --- a/sys/arm/arm/support.S +++ b/sys/arm/arm/support.S @@ -216,7 +216,7 @@ do_memset: EEND(memset) END(bzero) -ENTRY(bcmp) +ENTRY(memcmp) mov ip, r0 cmp r2, #0x06 beq .Lmemcmp_6bytes @@ -324,7 +324,7 @@ ENTRY(bcmp) RETne /* Return if mismatch on #4 */ sub r0, r3, r2 /* r0 = b1#5 - b2#5 */ RET -END(bcmp) +END(memcmp) ENTRY(bcopy) /* switch the source and destination registers */ diff --git a/sys/conf/files.arm b/sys/conf/files.arm index e2af76567549..c68522eddbd0 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