The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a54e547950f7fd146fefa166aea9bbbbe2c01e7c
commit a54e547950f7fd146fefa166aea9bbbbe2c01e7c Author: Mateusz Guzik <[email protected]> AuthorDate: 2021-07-19 09:54:18 +0000 Commit: Mateusz Guzik <[email protected]> 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 _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
