glib r7744 - in trunk: . gio glib gobject

[matthiasc svn gnome org]

Author: matthiasc
Date: Sat Dec 13 23:56:05 2008
New Revision: 7744
URL: http://svn.gnome.org/viewvc/glib?rev=7744&view=rev

Log:
Make these work on x86_64


Modified:
   trunk/ChangeLog
   trunk/gio/ChangeLog
   trunk/gio/pltcheck.sh
   trunk/glib/pltcheck.sh
   trunk/gobject/ChangeLog
   trunk/gobject/pltcheck.sh

Modified: trunk/gio/pltcheck.sh
==============================================================================
--- trunk/gio/pltcheck.sh	(original)
+++ trunk/gio/pltcheck.sh	Sat Dec 13 23:56:05 2008
@@ -13,7 +13,7 @@
 
 for so in .libs/lib*.so; do
 	echo Checking $so for local PLT entries
-	readelf -r $so | grep 'JU\?MP_SLOT' | grep '\<g_' | grep -v $SKIP && status=1
+	readelf -r $so | grep 'JU\?MP_SLOT\?' | grep '\<g_' | grep -v $SKIP && status=1
 done
 
 exit $status

Modified: trunk/glib/pltcheck.sh
==============================================================================
--- trunk/glib/pltcheck.sh	(original)
+++ trunk/glib/pltcheck.sh	Sat Dec 13 23:56:05 2008
@@ -14,7 +14,7 @@
 	# g_string_insert_c is used in g_string_append_c_inline
 	# unaliased.  Couldn't find a way to fix it.
 	# Same for g_once_init_enter
-	readelf -r $so | grep 'JU\?MP_SLOT' | \
+	readelf -r $so | grep 'JU\?MP_SLOT\?' | \
 		grep -v '\<g_string_insert_c\>' | \
 		grep -v '\<g_atomic_[a-z]*_[sg]et\>' | \
 		grep -v '\<g_once_init_enter_impl\>' | \

Modified: trunk/gobject/pltcheck.sh
==============================================================================
--- trunk/gobject/pltcheck.sh	(original)
+++ trunk/gobject/pltcheck.sh	Sat Dec 13 23:56:05 2008
@@ -11,7 +11,7 @@
 
 for so in .libs/lib*.so; do
 	echo Checking $so for local PLT entries
-	readelf -r $so | grep 'JU\?MP_SLOT' | grep '\<g_type_\|\<g_boxed_\|\<g_value_\|\<g_cclosure_\|\<g_closure_\|\<g_signal\|\<g_enum_\|\<g_flags_\|\<g_io_\|\<g_object_\|\<g_param_' && status=1
+	readelf -r $so | grep 'JU\?MP_SLOT\?' | grep '\<g_type_\|\<g_boxed_\|\<g_value_\|\<g_cclosure_\|\<g_closure_\|\<g_signal\|\<g_enum_\|\<g_flags_\|\<g_io_\|\<g_object_\|\<g_param_' && status=1
 done
 
 exit $status