The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c0661bbbd0d917f602d42fe4bb9ee3edc5970c8a
commit c0661bbbd0d917f602d42fe4bb9ee3edc5970c8a
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-01-14 21:36:08 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2025-01-15 19:28:03 +0000
depend-cleanup: Fix match expression for AArch64 asm files
Some routines (strcmp, strncmp, strlen) switched from an asm
implementation from arm-optimized-routines to a new asm implementation.
The default clean_dep rule matches both the old and new dependency
string, resulting in those routines always being rebuilt. Instead use
"arm-optimized-routines" (i.e., contrib subdir for the previous
implementation) as the matching regex.
Also delete the old generated src files.
Reviewed by: fuz
Sponsored by: The FreeBSD Foundation
Fixes: d57842ed2dad ("depend-cleanup.sh: clean up after AArch64 libc SIMD
merge")
Differential Revision: https://reviews.freebsd.org/D48459
---
tools/build/depend-cleanup.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 6f97747183a8..30c303d4f90f 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -242,7 +242,8 @@ fi
if [ $MACHINE_ARCH = aarch64 ]; then
# 20250110 5e7d93a60440 add strcmp SIMD implementation
- clean_dep lib/libc strcmp S
+ clean_dep lib/libc strcmp S arm-optimized-routines
+ run rm -f "$OBJTOP"/lib/libc/strcmp.S
# 20250110 b91003acffe7 add strspn optimized implementation
clean_dep lib/libc strspn c
@@ -260,7 +261,8 @@ if [ $MACHINE_ARCH = aarch64 ]; then
clean_dep lib/libc strlcpy c
# 20250110 25c485e14769 add strncmp SIMD implementation
- clean_dep lib/libc strncmp S
+ clean_dep lib/libc strncmp S arm-optimized-routines
+ run rm -f "$OBJTOP"/lib/libc/strncmp.S
# 20250110 bad17991c06d add memccpy SIMD implementation
clean_dep lib/libc memccpy c
@@ -272,7 +274,8 @@ if [ $MACHINE_ARCH = aarch64 ]; then
clean_dep lib/libc strlcat c
# 20250110 3863fec1ce2d add strlen SIMD implementation
- clean_dep lib/libc strlen S
+ clean_dep lib/libc strlen S arm-optimized-routines
+ run rm -f "$OBJTOP"/lib/libc/strlen.S
# 20250110 79e01e7e643c add bcopy & bzero wrapper
clean_dep lib/libc bcopy c
