git: 9ef5b65085ed - main - arm: bcmp -> memcmp

[Mateusz Guzik]

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=9ef5b65085ed2acdb1db19a1ec4d44ab5137e8b9

commit 9ef5b65085ed2acdb1db19a1ec4d44ab5137e8b9
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-07-19 09:52:23 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
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