[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/check-defs.sh         |    2 +-
 src/check-static-inits.sh |    2 +-
 src/check-symbols.sh      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5fd996c4a4049a75c6d9e964f1a81c00ff191893
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Apr 9 16:38:26 2014 -0700

    Further adjust check-defs and check-symbols for mipsel
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=74491

diff --git a/src/check-defs.sh b/src/check-defs.sh
index d7a8ec2..357347f 100755
--- a/src/check-defs.sh
+++ b/src/check-defs.sh
@@ -21,7 +21,7 @@ for def in $defs; do
 	lib=`echo "$def" | sed 's/[.]def$//;s at .*/@@'`
 	so=.libs/lib${lib}.so
 
-	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
+	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
 
 	if test -f "$so"; then
 
diff --git a/src/check-symbols.sh b/src/check-symbols.sh
index 67bdf71..e000b01 100755
--- a/src/check-symbols.sh
+++ b/src/check-symbols.sh
@@ -18,7 +18,7 @@ echo "Checking that we are not exposing internal symbols"
 tested=false
 for so in `ls .libs/lib*.so .libs/lib*.dylib 2>/dev/null` ; do
 	
-	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
+	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
 	prefix=`basename "$so" | sed 's/libharfbuzz/hb/; s/-/_/g; s/[.].*//'`
 
 	echo "Processing $so"
commit 75ec6d0bc5ca0170c73e4d1099a898d38d8f85c0
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Apr 9 16:33:32 2014 -0700

    Tighten up check-static-inits.sh check
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=74490

diff --git a/src/check-static-inits.sh b/src/check-static-inits.sh
index bb0a7ff..83d02c8 100755
--- a/src/check-static-inits.sh
+++ b/src/check-static-inits.sh
@@ -30,7 +30,7 @@ done
 
 echo "Checking that no object file has lazy static C++ constructors/destructors or other such stuff"
 for obj in $OBJS; do
-	if objdump -t "$obj" | grep '__c'; then
+	if objdump -t "$obj" | grep '__cxa_'; then
 		echo "Ouch, $obj has lazy static C++ constructors/destructors or other such stuff"
 		stat=1
 	fi