The branch main has been updated by emaste:

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

commit d355c28a0954de487e45c4349631c2b9449ba28d
Author:     Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-01-17 15:05:26 +0000
Commit:     Ed Maste <ema...@freebsd.org>
CommitDate: 2025-01-17 15:17:45 +0000

    depend-cleanup: bea89d038ac5 also moved memchr
    
    Commit bea89d038ac5 added strlcat but also introduced a memchr wrapper
    in the source tree rather than using the autogenerated one used for
    AARCH64_STRING_FUNCS.  Move memchr.S to MDSRS and add a cleanup rule for
    the old wrapper.
    
    Reviewed by:    fuz
    Sponsored by:   The FreeBSD Foundation
    Fixes: bea89d038ac5 ("lib/libc/aarch64/string: add strlcat SIMD 
implementation")
    Differential Revision: https://reviews.freebsd.org/D48502
---
 lib/libc/aarch64/string/Makefile.inc | 2 +-
 tools/build/depend-cleanup.sh        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/libc/aarch64/string/Makefile.inc 
b/lib/libc/aarch64/string/Makefile.inc
index 9574aad95933..f0f0f6495782 100644
--- a/lib/libc/aarch64/string/Makefile.inc
+++ b/lib/libc/aarch64/string/Makefile.inc
@@ -4,7 +4,6 @@
 #
 
 AARCH64_STRING_FUNCS= \
-       memchr \
        memcmp \
        memcpy \
        memmove \
@@ -19,6 +18,7 @@ AARCH64_STRING_FUNCS= \
 
 # SIMD-enhanced routines not derived from Arm's code
 MDSRCS+= \
+       memchr.S \
        strcmp.S \
        strspn.S \
        strcspn.S \
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 30c303d4f90f..b7695370f1dd 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -270,8 +270,9 @@ if [ $MACHINE_ARCH = aarch64 ]; then
        # 20250110  3dc5429158cf  add strncat SIMD implementation
        clean_dep   lib/libc strncat c
 
-       # 20250110  bea89d038ac5  add strlcat SIMD implementation
+       # 20250110  bea89d038ac5  add strlcat SIMD implementation, and move 
memchr
        clean_dep   lib/libc strlcat c
+       run rm -f "$OBJTOP"/lib/libc/memchr.S
 
        # 20250110  3863fec1ce2d  add strlen SIMD implementation
        clean_dep   lib/libc strlen S arm-optimized-routines

Reply via email to