svn commit: r281814 - head/tools/build

[Bryan Drewery]

Author: bdrewery
Date: Tue Apr 21 05:41:56 2015
New Revision: 281814
URL: https://svnweb.freebsd.org/changeset/base/281814

Log:
  Tweak BSS symbol handling from r281811 to not consider them unresolved

Modified:
  head/tools/build/check-links.sh

Modified: head/tools/build/check-links.sh
==============================================================================
--- head/tools/build/check-links.sh	Tue Apr 21 05:10:18 2015	(r281813)
+++ head/tools/build/check-links.sh	Tue Apr 21 05:41:56 2015	(r281814)
@@ -36,7 +36,8 @@ case $mime in
 esac
 
 # Gather all symbols from the target
-unresolved_symbols=$(nm -D --format=posix "$1" | awk -v isbin=${isbin} '$2 == "U" || ($2 == "B" && $4 != "" && isbin == 1) {print $1}' | tr '\n' ' ')
+unresolved_symbols=$(nm -u -D --format=posix "$1" | awk '$2 == "U" {print $1}' | tr '\n' ' ')
+[ ${isbin} -eq 1 ] && bss_symbols=$(nm -D --format=posix "$1" | awk '$2 == "B" && $4 != "" {print $1}' | tr '\n' ' ')
 ldd_libs=$(ldd $(realpath $1) | awk '{print $1 ":" $3}')
 
 # Check for useful libs
@@ -62,7 +63,7 @@ for lib in $(readelf -d $1 | awk '$2 ~ /
 		setvar "${libkey}" "${lib_symbols}"
 	fi
 	for fct in ${lib_symbols}; do
-		case " ${unresolved_symbols} " in
+		case " ${unresolved_symbols} ${bss_symbols} " in
 			*\ ${fct}\ *) foundone="${fct}" && break ;;
 		esac
 	done