2012-03-13 Richard Guenther <rguenther@suse.de>

	PR target/52569
	* unwind-dw2-fde.c: Make avoid-include-gthr.h hacks work again.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185322 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 61b2c67..de9eebe 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,5 +1,10 @@
 2012-03-13  Richard Guenther  <rguenther@suse.de>
 
+       PR target/52569
+       * unwind-dw2-fde.c: Make avoid-include-gthr.h hacks work again.
+
+2012-03-13  Richard Guenther  <rguenther@suse.de>
+
        * gthr-single.h (__GTHREAD_MUTEX_INIT_FUNCTION): Fix definition.
 
 2012-03-13  Richard Guenther  <rguenther@suse.de>

diff --git a/libgcc/unwind-dw2-fde.c b/libgcc/unwind-dw2-fde.c
index 54eaeba..b99a432 100644 (file)
--- a/libgcc/unwind-dw2-fde.c
+++ b/libgcc/unwind-dw2-fde.c
@@ -49,6 +49,7 @@ static struct object *seen_objects;
 static __gthread_mutex_t object_mutex = __GTHREAD_MUTEX_INIT;
 #define init_object_mutex_once()
 #else
+#ifdef __GTHREAD_MUTEX_INIT_FUNCTION
 static __gthread_mutex_t object_mutex;
 
 static void
@@ -63,6 +64,12 @@ init_object_mutex_once (void)
   static __gthread_once_t once = __GTHREAD_ONCE_INIT;
   __gthread_once (&once, init_object_mutex);
 }
+#else
+/* ???  Several targets include this file with stubbing parts of gthr.h
+   and expect no locking to be done.  */
+#define init_object_mutex_once()
+static __gthread_mutex_t object_mutex;
+#endif
 #endif
 
 /* Called from crtbegin.o to register the unwind info for an object.  */