Page MenuHomeFreeBSD

depend-cleanup: Fix match for asm files
ClosedPublic

Authored by emaste on Tue, Jan 14, 9:41 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Jan 18, 8:32 AM
Unknown Object (File)
Sat, Jan 18, 7:34 AM
Unknown Object (File)
Sat, Jan 18, 6:35 AM
Unknown Object (File)
Sat, Jan 18, 4:07 AM
Unknown Object (File)
Sat, Jan 18, 3:34 AM
Unknown Object (File)
Wed, Jan 15, 7:28 PM
Subscribers

Details

Summary

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.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

emaste created this revision.

This looks reasonable. Please also apply the following hunks to remove generated source files that otherwise interfere with the build:

diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 6f97747183a8..c40fdb53346b 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -243,6 +243,7 @@ fi
 if [ $MACHINE_ARCH = aarch64 ]; then
 	# 20250110  5e7d93a60440  add strcmp SIMD implementation
 	clean_dep   lib/libc strcmp S
+	run rm -f "$OBJTOP"/lib/libc/strcmp.S
 
 	# 20250110  b91003acffe7  add strspn optimized implementation
 	clean_dep   lib/libc strspn c
@@ -261,6 +262,7 @@ if [ $MACHINE_ARCH = aarch64 ]; then
 
 	# 20250110  25c485e14769  add strncmp SIMD implementation
 	clean_dep   lib/libc strncmp S
+	run rm -f "$OBJTOP"/lib/libc/strncmp.S
 
 	# 20250110  bad17991c06d  add memccpy SIMD implementation
 	clean_dep   lib/libc memccpy c
@@ -273,6 +275,7 @@ if [ $MACHINE_ARCH = aarch64 ]; then
 
 	# 20250110  3863fec1ce2d  add strlen SIMD implementation
 	clean_dep   lib/libc strlen S
+	run rm -f "$OBJTOP"/lib/libc/strlen.S
 
 	# 20250110  79e01e7e643c  add bcopy & bzero wrapper
 	clean_dep   lib/libc bcopy c

also remove generated files

Thanks. I think that should be good now.

This revision is now accepted and ready to land.Wed, Jan 15, 7:24 PM