[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/check-exported-symbols.sh |    2 +-
 src/check-internal-symbols.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 61865745e35eb60aeb59968e7826e37059090780
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Dec 5 19:42:10 2012 -0500

    Fix test with gold linker
    
    Bug 57633 - Symbol tests should ignore __bss_start, _edata, _end

diff --git a/src/check-exported-symbols.sh b/src/check-exported-symbols.sh
index a7d6f9b..ea07e57 100755
--- a/src/check-exported-symbols.sh
+++ b/src/check-exported-symbols.sh
@@ -24,7 +24,7 @@ for def in $defs; do
 		echo "Checking that $so has the same symbol list as $def"
 		{
 			echo EXPORTS
-			nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>' | cut -d' ' -f3
+			nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>\| __bss_start\>\| _edata\>\| _end\>' | cut -d' ' -f3
 			stat=1
 			# cheat: copy the last line from the def file!
 			tail -n1 "$def"
diff --git a/src/check-internal-symbols.sh b/src/check-internal-symbols.sh
index f48d144..c8d8f44 100755
--- a/src/check-internal-symbols.sh
+++ b/src/check-internal-symbols.sh
@@ -19,7 +19,7 @@ for suffix in .so; do
 	so=`echo .libs/libharfbuzz$suffix`
 	if test -f "$so"; then
 		echo "Checking that we are not exposing internal symbols"
-		if nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>\| T hb_'; then
+		if nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>\| T hb_\| __bss_start\>\| _edata\>\| _end\>'; then
 			echo "Ouch, internal symbols exposed"
 			stat=1
 		fi