PR other/24829

	PR target/24831
	* gthr-dce.h: Do not gthrw-ify pthread_once_init,
	pthread_key_delete.  From John David Anglin.  gthrw-ify
	pthread_getunique_np only if it it's not a macro.  Delete
	UNUSED macro.
	(__gthread_objc_condition_allocate, __gthread_objc_condition_deallocate,
	__gthread_objc_condition_wait, __gthread_objc_condition_broadcast,
	__gthread_objc_condition_signal, __gthread_key_delete): Add
	"__attribute__ ((__unused__))" to unused arguments.
	(__gthread_recursive_mutex_init_function): Add missing return.
	* gthr-dce.h, gthr-tpf.h, gthr-solaris.h, gthr-posix.h,
	gthr-posix95.h: Use macro-based approach for name redirection
	on targets missing weakref.



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

1 files changed, 60 insertions, 62 deletions

diff --git a/gcc/gthr-solaris.h b/gcc/gthr-solaris.h
index b0ceba6d1c4..f0d5d1e0f0a 100644
--- a/gcc/gthr-solaris.h
+++ b/gcc/gthr-solaris.h
@@ -58,40 +58,38 @@ typedef struct {
 
 #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
 # define __gthrw(name) \
-  static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
+  static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
+# define __gthrw_(name) __gthrw_ ## name
 #else
-# define __gthrw_asmname(cname) __gthrw_asmnamep (__USER_LABEL_PREFIX__, cname)
-# define __gthrw_asmnamep(prefix, cname) __gthrw_string (prefix) cname
-# define __gthrw_string(x) #x
-# define __gthrw(name) \
-  extern __typeof(name) __gthrw_ ## name __asm (__gthrw_asmname (#name))
+# define __gthrw(name)
+# define __gthrw_(name) name
 #endif
 
-__gthrw(thr_keycreate);
-__gthrw(thr_getspecific);
-__gthrw(thr_setspecific);
-__gthrw(thr_create);
+__gthrw(thr_keycreate)
+__gthrw(thr_getspecific)
+__gthrw(thr_setspecific)
+__gthrw(thr_create)
 
-__gthrw(mutex_lock);
-__gthrw(mutex_trylock);
-__gthrw(mutex_unlock);
+__gthrw(mutex_lock)
+__gthrw(mutex_trylock)
+__gthrw(mutex_unlock)
 
 #ifdef _LIBOBJC
-__gthrw(thr_exit);
-__gthrw(thr_keycreate);
-__gthrw(thr_getprio);
-__gthrw(thr_self);
-__gthrw(thr_setprio);
-__gthrw(thr_yield);
-
-__gthrw(cond_init);
-__gthrw(cond_destroy);
-__gthrw(cond_wait);
-__gthrw(cond_broadcast);
-__gthrw(cond_signal);
-
-__gthrw(mutex_init);
-__gthrw(mutex_destroy);
+__gthrw(thr_exit)
+__gthrw(thr_keycreate)
+__gthrw(thr_getprio)
+__gthrw(thr_self)
+__gthrw(thr_setprio)
+__gthrw(thr_yield)
+
+__gthrw(cond_init)
+__gthrw(cond_destroy)
+__gthrw(cond_wait)
+__gthrw(cond_broadcast)
+__gthrw(cond_signal)
+
+__gthrw(mutex_init)
+__gthrw(mutex_destroy)
 #endif
 
 #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
@@ -102,7 +100,7 @@ __gthrw(mutex_destroy);
 static inline int
 __gthread_active_p (void)
 {
-  static void *const __gthread_active_ptr = (void *) &__gthrw_thr_create;
+  static void *const __gthread_active_ptr = (void *) &__gthrw_(thr_create);
   return __gthread_active_ptr != 0;
 }
 
@@ -132,7 +130,7 @@ __gthread_objc_init_thread_system (void)
 {
   /* Initialize the thread storage key.  */
   if (__gthread_active_p ()
-      && __gthrw_thr_keycreate (&_objc_thread_storage, NULL) == 0)
+      && __gthrw_(thr_keycreate) (&_objc_thread_storage, NULL) == 0)
     return 0;
 
   return -1;
@@ -160,7 +158,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
   if (!__gthread_active_p ())
     return NULL;
 
-  if (__gthrw_thr_create (NULL, 0, (void *) func, arg,
+  if (__gthrw_(thr_create) (NULL, 0, (void *) func, arg,
 		  THR_DETACHED | THR_NEW_LWP,
 		  &new_thread_id) == 0)
     thread_id = *(objc_thread_t *) &new_thread_id;
@@ -194,7 +192,7 @@ __gthread_objc_thread_set_priority (int priority)
     }
 
   /* Change priority */
-  if (__gthrw_thr_setprio (__gthrw_thr_self (), sys_priority) == 0)
+  if (__gthrw_(thr_setprio) (__gthrw_(thr_self) (), sys_priority) == 0)
     return 0;
   else
     return -1;
@@ -209,7 +207,7 @@ __gthread_objc_thread_get_priority (void)
   if (!__gthread_active_p ())
     return OBJC_THREAD_INTERACTIVE_PRIORITY;
 
-  if (__gthrw_thr_getprio (__gthrw_thr_self (), &sys_priority) == 0)
+  if (__gthrw_(thr_getprio) (__gthrw_(thr_self) (), &sys_priority) == 0)
     {
       if (sys_priority >= 250)
 	return OBJC_THREAD_INTERACTIVE_PRIORITY;
@@ -227,7 +225,7 @@ static inline void
 __gthread_objc_thread_yield (void)
 {
   if (__gthread_active_p ())
-    __gthrw_thr_yield ();
+    __gthrw_(thr_yield) ();
 }
 
 /* Terminate the current thread.  */
@@ -236,7 +234,7 @@ __gthread_objc_thread_exit (void)
 {
   if (__gthread_active_p ())
     /* exit the thread */
-    __gthrw_thr_exit (&__objc_thread_exit_status);
+    __gthrw_(thr_exit) (&__objc_thread_exit_status);
 
   /* Failed if we reached here */
   return -1;
@@ -247,7 +245,7 @@ static inline objc_thread_t
 __gthread_objc_thread_id (void)
 {
   if (__gthread_active_p ())
-    return (objc_thread_t) __gthrw_thr_self ();
+    return (objc_thread_t) __gthrw_(thr_self) ();
   else
     return (objc_thread_t) 1;
 }
@@ -258,7 +256,7 @@ __gthread_objc_thread_set_data (void *value)
 {
   if (__gthread_active_p ())
     {
-      if (__gthrw_thr_setspecific (_objc_thread_storage, value) == 0)
+      if (__gthrw_(thr_setspecific) (_objc_thread_storage, value) == 0)
 	return 0;
       else
 	return -1;
@@ -278,7 +276,7 @@ __gthread_objc_thread_get_data (void)
 
   if (__gthread_active_p ())
     {
-      if (__gthrw_thr_getspecific (_objc_thread_storage, &value) == 0)
+      if (__gthrw_(thr_getspecific) (_objc_thread_storage, &value) == 0)
 	return value;
       else
 	return NULL;
@@ -294,7 +292,7 @@ static inline int
 __gthread_objc_mutex_allocate (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && __gthrw_mutex_init ((mutex_t *) (&(mutex->backend)), USYNC_THREAD, 0))
+      && __gthrw_(mutex_init) ((mutex_t *) (&(mutex->backend)), USYNC_THREAD, 0))
     return -1;
 
   return 0;
@@ -305,7 +303,7 @@ static inline int
 __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
 {
   if (__gthread_active_p ())
-    __gthrw_mutex_destroy ((mutex_t *) (&(mutex->backend)));
+    __gthrw_(mutex_destroy) ((mutex_t *) (&(mutex->backend)));
 
   return 0;
 }
@@ -315,7 +313,7 @@ static inline int
 __gthread_objc_mutex_lock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && __gthrw_mutex_lock ((mutex_t *) (&(mutex->backend))) != 0)
+      && __gthrw_(mutex_lock) ((mutex_t *) (&(mutex->backend))) != 0)
     return -1;
 
   return 0;
@@ -326,7 +324,7 @@ static inline int
 __gthread_objc_mutex_trylock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && __gthrw_mutex_trylock ((mutex_t *) (&(mutex->backend))) != 0)
+      && __gthrw_(mutex_trylock) ((mutex_t *) (&(mutex->backend))) != 0)
     return -1;
 
   return 0;
@@ -337,7 +335,7 @@ static inline int
 __gthread_objc_mutex_unlock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && __gthrw_mutex_unlock ((mutex_t *) (&(mutex->backend))) != 0)
+      && __gthrw_(mutex_unlock) ((mutex_t *) (&(mutex->backend))) != 0)
     return -1;
 
   return 0;
@@ -350,7 +348,7 @@ static inline int
 __gthread_objc_condition_allocate (objc_condition_t condition)
 {
   if (__gthread_active_p ())
-    return __gthrw_cond_init ((cond_t *) (&(condition->backend)), USYNC_THREAD,
+    return __gthrw_(cond_init) ((cond_t *) (&(condition->backend)), USYNC_THREAD,
 		      NULL);
   else
     return 0;
@@ -361,7 +359,7 @@ static inline int
 __gthread_objc_condition_deallocate (objc_condition_t condition)
 {
   if (__gthread_active_p ())
-    return __gthrw_cond_destroy ((cond_t *) (&(condition->backend)));
+    return __gthrw_(cond_destroy) ((cond_t *) (&(condition->backend)));
   else
     return 0;
 }
@@ -371,7 +369,7 @@ static inline int
 __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_cond_wait ((cond_t *) (&(condition->backend)),
+    return __gthrw_(cond_wait) ((cond_t *) (&(condition->backend)),
 		      (mutex_t *) (&(mutex->backend)));
   else
     return 0;
@@ -382,7 +380,7 @@ static inline int
 __gthread_objc_condition_broadcast (objc_condition_t condition)
 {
   if (__gthread_active_p ())
-    return __gthrw_cond_broadcast ((cond_t *) (&(condition->backend)));
+    return __gthrw_(cond_broadcast) ((cond_t *) (&(condition->backend)));
   else
     return 0;
 }
@@ -392,7 +390,7 @@ static inline int
 __gthread_objc_condition_signal (objc_condition_t condition)
 {
   if (__gthread_active_p ())
-    return __gthrw_cond_signal ((cond_t *) (&(condition->backend)));
+    return __gthrw_(cond_signal) ((cond_t *) (&(condition->backend)));
   else
     return 0;
 }
@@ -410,7 +408,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
 
   if (once->once == 0)
     {
-      int status = __gthrw_mutex_lock (&once->mutex);
+      int status = __gthrw_(mutex_lock) (&once->mutex);
       if (status != 0)
 	return status;
       if (once->once == 0)
@@ -418,7 +416,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
 	  (*func) ();
 	  once->once++;
 	}
-      __gthrw_mutex_unlock (&once->mutex);
+      __gthrw_(mutex_unlock) (&once->mutex);
     }
   return 0;
 }
@@ -429,7 +427,7 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
   /* Solaris 2.5 contains thr_* routines no-op in libc, so test if we actually
      got a reasonable key value, and if not, fail.  */
   *key = (__gthread_key_t)-1;
-  if (__gthrw_thr_keycreate (key, dtor) != 0 || *key == (__gthread_key_t)-1)
+  if (__gthrw_(thr_keycreate) (key, dtor) != 0 || *key == (__gthread_key_t)-1)
     return -1;
   else
     return 0;
@@ -446,7 +444,7 @@ static inline void *
 __gthread_getspecific (__gthread_key_t key)
 {
   void *ptr;
-  if (__gthrw_thr_getspecific (key, &ptr) == 0)
+  if (__gthrw_(thr_getspecific) (key, &ptr) == 0)
     return ptr;
   else
     return 0;
@@ -455,14 +453,14 @@ __gthread_getspecific (__gthread_key_t key)
 static inline int
 __gthread_setspecific (__gthread_key_t key, const void *ptr)
 {
-  return __gthrw_thr_setspecific (key, (void *) ptr);
+  return __gthrw_(thr_setspecific) (key, (void *) ptr);
 }
 
 static inline int
 __gthread_mutex_lock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_mutex_lock (mutex);
+    return __gthrw_(mutex_lock) (mutex);
   else
     return 0;
 }
@@ -471,7 +469,7 @@ static inline int
 __gthread_mutex_trylock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_mutex_trylock (mutex);
+    return __gthrw_(mutex_trylock) (mutex);
   else
     return 0;
 }
@@ -480,7 +478,7 @@ static inline int
 __gthread_mutex_unlock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_mutex_unlock (mutex);
+    return __gthrw_(mutex_unlock) (mutex);
   else
     return 0;
 }
@@ -490,7 +488,7 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
 {
   mutex->depth = 0;
   mutex->owner = (thread_t) 0;
-  return __gthrw_mutex_init (&mutex->actual, USYNC_THREAD, 0);
+  return __gthrw_(mutex_init) (&mutex->actual, USYNC_THREAD, 0);
 }
 
 static inline int
@@ -498,11 +496,11 @@ __gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
 {
   if (__gthread_active_p ())
     {
-      thread_t me = __gthrw_thr_self ();
+      thread_t me = __gthrw_(thr_self) ();
 
       if (mutex->owner != me)
 	{
-	  __gthrw_mutex_lock (&mutex->actual);
+	  __gthrw_(mutex_lock) (&mutex->actual);
 	  mutex->owner = me;
 	}
 
@@ -516,11 +514,11 @@ __gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
 {
   if (__gthread_active_p ())
     {
-      thread_t me = __gthrw_thr_self ();
+      thread_t me = __gthrw_(thr_self) ();
 
       if (mutex->owner != me)
 	{
-	  if (__gthrw_mutex_trylock (&mutex->actual))
+	  if (__gthrw_(mutex_trylock) (&mutex->actual))
 	    return 1;
 	  mutex->owner = me;
 	}
@@ -538,7 +536,7 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
       if (--mutex->depth == 0)
 	{
 	   mutex->owner = (thread_t) 0;
-	   __gthrw_mutex_unlock (&mutex->actual);
+	   __gthrw_(mutex_unlock) (&mutex->actual);
 	}
     }
   return 0;