git: 5b97b0d41940 - stable/12 - arm: replace byte-by-byte memcmp with an already existing asm variant

[Mateusz Guzik]

The branch stable/12 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=5b97b0d41940c886fe6e0b9883b9c3cd706828fa

commit 5b97b0d41940c886fe6e0b9883b9c3cd706828fa
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-07-19 09:58:15 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-07-19 09:58:15 +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 8f1191f03098..0bcd7b65e924 100644
--- a/sys/arm/arm/support.S
+++ b/sys/arm/arm/support.S
@@ -282,6 +282,7 @@ EEND(memset)
 END(bzero)
 
 ENTRY(bcmp)
+EENTRY(memcmp)
 	mov	ip, r0
 	cmp	r2, #0x06
 	beq	.Lmemcmp_6bytes
@@ -389,6 +390,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 88a3b5efe90d..468bc471458b 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -147,7 +147,6 @@ libkern/fls.c			standard
 libkern/flsl.c			standard
 libkern/flsll.c			standard
 libkern/lshrdi3.c		standard
-libkern/memcmp.c		standard
 libkern/moddi3.c		standard
 libkern/qdivrem.c		standard
 libkern/ucmpdi2.c		standard