From 044d38527664d933c18c751c38fcf6fb4b5f888e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 19 Dec 2012 13:00:16 -0500 Subject: [PATCH] Bug 58498 - Tests fail with gold linker on ARM --- src/check-exported-symbols.sh | 2 +- src/check-internal-symbols.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/check-exported-symbols.sh b/src/check-exported-symbols.sh index ea07e571c..6f0bf7fd8 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\>\| __bss_start\>\| _edata\>\| _end\>' | cut -d' ' -f3 + nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __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 c8d8f44e1..a8fdc537d 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_\| __bss_start\>\| _edata\>\| _end\>'; then + if nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>\| T hb_\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>'; then echo "Ouch, internal symbols exposed" stat=1 fi