From be914f6841faee3337fe33f4f3d8f5898df7ff8d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Sat, 13 Dec 2008 23:56:05 +0000
Subject: [PATCH] Make these work on x86_64

svn path=/trunk/; revision=7744
---
 ChangeLog           | 4 ++++
 gio/ChangeLog       | 4 ++++
 gio/pltcheck.sh     | 2 +-
 glib/pltcheck.sh    | 2 +-
 gobject/ChangeLog   | 4 ++++
 gobject/pltcheck.sh | 2 +-
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f36c96855..d8170e53e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-12  Dan Winship  <danw@gnome.org>
+
+	* glib/pltcheck.sh: make this work on x86_64
+ 
 2008-12-12  Ryan Lortie  <desrt@desrt.ca>
 
 	* gio/gicon.c (g_icon_to_string_tokenized): free the tokens when done
diff --git a/gio/ChangeLog b/gio/ChangeLog
index fb8d54841..f80dbfe8c 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-12  Dan Winship  <danw@gnome.org>
+
+	* pltcheck.sh: make this work on x86_64
+
 2008-12-10  Alexander Larsson  <alexl@redhat.com>
 
 	Bug 562452 - Ensure we return G_IO_ERROR_CANCELLED if cancelling
diff --git a/gio/pltcheck.sh b/gio/pltcheck.sh
index 57ecd9d9c..e09a587c5 100755
--- a/gio/pltcheck.sh
+++ b/gio/pltcheck.sh
@@ -13,7 +13,7 @@ SKIP='\<g_access\|\<g_array_\|\<g_ascii\|\<g_list_\|\<g_assertion_message\|\<g_w
 
 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
diff --git a/glib/pltcheck.sh b/glib/pltcheck.sh
index b5e7d9a5b..236eeb141 100755
--- a/glib/pltcheck.sh
+++ b/glib/pltcheck.sh
@@ -14,7 +14,7 @@ for so in .libs/lib*.so; do
 	# 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\>' | \
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 13697bdee..d893458e8 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-12  Dan Winship  <danw@gnome.org>
+
+	* pltcheck.sh: make this work on x86_64
+
 2008-12-02  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 473150 – g_type_module_use inconsistently increases the use
diff --git a/gobject/pltcheck.sh b/gobject/pltcheck.sh
index 19edfac02..00d9e9d09 100755
--- a/gobject/pltcheck.sh
+++ b/gobject/pltcheck.sh
@@ -11,7 +11,7 @@ fi
 
 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