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, 75 insertions, 73 deletions

diff --git a/gcc/gthr-dce.h b/gcc/gthr-dce.h
index fe4bba769d9..d876c659e06 100644
--- a/gcc/gthr-dce.h
+++ b/gcc/gthr-dce.h
@@ -44,62 +44,59 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 
 #include <pthread.h>
 
-#ifdef __cplusplus
-#define UNUSED(x) x
-#else
-#define UNUSED(x) x __attribute__((unused))
-#endif
-
 typedef pthread_key_t __gthread_key_t;
 typedef pthread_once_t __gthread_once_t;
 typedef pthread_mutex_t __gthread_mutex_t;
 typedef pthread_mutex_t __gthread_recursive_mutex_t;
 
-#define __GTHREAD_ONCE_INIT __gthrw_pthread_once_init
+#define __GTHREAD_ONCE_INIT pthread_once_init
 
 #define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
 #define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
 
-#define __GTHREAD_MUTEX_INIT_DEFAULT __gthrw_pthread_once_init
+#define __GTHREAD_MUTEX_INIT_DEFAULT pthread_once_init
 
 #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(pthread_once);
-__gthrw(pthread_once_init);
-__gthrw(pthread_keycreate);
-__gthrw(pthread_key_delete);
-__gthrw(pthread_getspecific);
-__gthrw(pthread_setspecific);
-__gthrw(pthread_create);
-__gthrw(pthread_mutex_init);
-__gthrw(pthread_mutex_lock);
-__gthrw(pthread_mutex_trylock);
-__gthrw(pthread_mutex_unlock);
-__gthrw(pthread_mutexattr_create);
-__gthrw(pthread_mutexattr_setkind_np);
-__gthrw(pthread_mutexattr_delete);
+__gthrw(pthread_once)
+__gthrw(pthread_keycreate)
+__gthrw(pthread_getspecific)
+__gthrw(pthread_setspecific)
+__gthrw(pthread_create)
+__gthrw(pthread_mutex_init)
+__gthrw(pthread_mutex_lock)
+__gthrw(pthread_mutex_trylock)
+__gthrw(pthread_mutex_unlock)
+__gthrw(pthread_mutexattr_create)
+__gthrw(pthread_mutexattr_setkind_np)
+__gthrw(pthread_mutexattr_delete)
 
 #ifdef _LIBOBJC
 /* Objective-C.  */
-__gthrw(pthread_cond_broadcast);
-__gthrw(pthread_cond_destroy);
-__gthrw(pthread_cond_init);
-__gthrw(pthread_cond_signal);
-__gthrw(pthread_cond_wait);
-__gthrw(pthread_exit);
-__gthrw(pthread_getunique_np);
-__gthrw(pthread_mutex_destroy);
-__gthrw(pthread_self);
-__gthrw(pthread_yield);
+__gthrw(pthread_cond_broadcast)
+__gthrw(pthread_cond_destroy)
+__gthrw(pthread_cond_init)
+__gthrw(pthread_cond_signal)
+__gthrw(pthread_cond_wait)
+__gthrw(pthread_exit)
+
+#ifdef pthread_getunique_np
+# define __gthrw_pthread_getunique_np pthread_getunique_np
+#else
+__gthrw(pthread_getunique_np)
+# define __gthrw_pthread_getunique_np __gthrw_(pthread_getunique_np)
+#endif
+
+__gthrw(pthread_mutex_destroy)
+__gthrw(pthread_self)
+__gthrw(pthread_yield)
 #endif
 
 #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
@@ -107,7 +104,7 @@ __gthrw(pthread_yield);
 static inline int
 __gthread_active_p (void)
 {
-  static void *const __gthread_active_ptr = (void *) &__gthrw_pthread_create;
+  static void *const __gthread_active_ptr = (void *) &__gthrw_(pthread_create);
   return __gthread_active_ptr != 0;
 }
 
@@ -137,7 +134,7 @@ __gthread_objc_init_thread_system (void)
 {
   if (__gthread_active_p ())
     /* Initialize the thread storage key.  */
-    return __gthrw_pthread_keycreate (&_objc_thread_storage, NULL);
+    return __gthrw_(pthread_keycreate) (&_objc_thread_storage, NULL);
   else
     return -1;
 }
@@ -164,7 +161,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
   if (!__gthread_active_p ())
     return NULL;
 
-  if (!(__gthrw_pthread_create (&new_thread_handle, pthread_attr_default,
+  if (!(__gthrw_(pthread_create) (&new_thread_handle, pthread_attr_default,
 			(void *) func, arg)))
     {
       /* ??? May not work! (64bit) */
@@ -201,7 +198,7 @@ __gthread_objc_thread_set_priority (int priority)
     }
 
   /* Change the priority.  */
-  if (pthread_setprio (__gthrw_pthread_self (), sys_priority) >= 0)
+  if (pthread_setprio (__gthrw_(pthread_self) (), sys_priority) >= 0)
     return 0;
   else
     /* Failed */
@@ -216,7 +213,7 @@ __gthread_objc_thread_get_priority (void)
 
   if (__gthread_active_p ())
     {
-      if ((sys_priority = pthread_getprio (__gthrw_pthread_self ())) >= 0)
+      if ((sys_priority = pthread_getprio (__gthrw_(pthread_self) ())) >= 0)
 	{
 	  if (sys_priority >= PRI_FG_MIN_NP
 	      && sys_priority <= PRI_FG_MAX_NP)
@@ -239,7 +236,7 @@ static inline void
 __gthread_objc_thread_yield (void)
 {
   if (__gthread_active_p ())
-    __gthrw_pthread_yield ();
+    __gthrw_(pthread_yield) ();
 }
 
 /* Terminate the current thread.  */
@@ -248,7 +245,7 @@ __gthread_objc_thread_exit (void)
 {
   if (__gthread_active_p ())
     /* exit the thread */
-    __gthrw_pthread_exit (&__objc_thread_exit_status);
+    __gthrw_(pthread_exit) (&__objc_thread_exit_status);
 
   /* Failed if we reached here */
   return -1;
@@ -260,7 +257,7 @@ __gthread_objc_thread_id (void)
 {
   if (__gthread_active_p ())
     {
-      pthread_t self = __gthrw_pthread_self ();
+      pthread_t self = __gthrw_(pthread_self) ();
 
       return (objc_thread_t) __gthrw_pthread_getunique_np (&self);
     }
@@ -273,7 +270,7 @@ static inline int
 __gthread_objc_thread_set_data (void *value)
 {
   if (__gthread_active_p ())
-    return __gthrw_pthread_setspecific (_objc_thread_storage, value);
+    return __gthrw_(pthread_setspecific) (_objc_thread_storage, value);
   else
     {
       thread_local_storage = value;
@@ -289,7 +286,7 @@ __gthread_objc_thread_get_data (void)
 
   if (__gthread_active_p ())
     {
-      if (!(__gthrw_pthread_getspecific (_objc_thread_storage, &value)))
+      if (!(__gthrw_(pthread_getspecific) (_objc_thread_storage, &value)))
 	return value;
 
       return NULL;
@@ -308,7 +305,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex)
     {
       mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
 
-      if (__gthrw_pthread_mutex_init ((pthread_mutex_t *) mutex->backend,
+      if (__gthrw_(pthread_mutex_init) ((pthread_mutex_t *) mutex->backend,
 			      pthread_mutexattr_default))
 	{
 	  objc_free (mutex->backend);
@@ -326,7 +323,7 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
 {
   if (__gthread_active_p ())
     {
-      if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
+      if (__gthrw_(pthread_mutex_destroy) ((pthread_mutex_t *) mutex->backend))
 	return -1;
 
       objc_free (mutex->backend);
@@ -341,7 +338,7 @@ static inline int
 __gthread_objc_mutex_lock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_pthread_mutex_lock ((pthread_mutex_t *) mutex->backend);
+    return __gthrw_(pthread_mutex_lock) ((pthread_mutex_t *) mutex->backend);
   else
     return 0;
 }
@@ -351,7 +348,7 @@ static inline int
 __gthread_objc_mutex_trylock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && __gthrw_pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 1)
+      && __gthrw_(pthread_mutex_trylock) ((pthread_mutex_t *) mutex->backend) != 1)
     return -1;
 
   return 0;
@@ -362,7 +359,7 @@ static inline int
 __gthread_objc_mutex_unlock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
+    return __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend);
   else
     return 0;
 }
@@ -371,7 +368,8 @@ __gthread_objc_mutex_unlock (objc_mutex_t mutex)
 
 /* Allocate a condition.  */
 static inline int
-__gthread_objc_condition_allocate (objc_condition_t condition)
+__gthread_objc_condition_allocate (objc_condition_t condition
+				   __attribute__ ((__unused__)))
 {
   if (__gthread_active_p ())
     /* Unimplemented.  */
@@ -382,7 +380,8 @@ __gthread_objc_condition_allocate (objc_condition_t condition)
 
 /* Deallocate a condition.  */
 static inline int
-__gthread_objc_condition_deallocate (objc_condition_t condition)
+__gthread_objc_condition_deallocate (objc_condition_t condition
+				     __attribute__ ((__unused__)))
 {
   if (__gthread_active_p ())
     /* Unimplemented.  */
@@ -393,7 +392,9 @@ __gthread_objc_condition_deallocate (objc_condition_t condition)
 
 /* Wait on the condition */
 static inline int
-__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
+__gthread_objc_condition_wait (objc_condition_t condition
+			       __attribute__ ((__unused__)),
+			       objc_mutex_t mutex __attribute__ ((__unused__)))
 {
   if (__gthread_active_p ())
     /* Unimplemented.  */
@@ -404,7 +405,8 @@ __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
 
 /* Wake up all threads waiting on this condition.  */
 static inline int
-__gthread_objc_condition_broadcast (objc_condition_t condition)
+__gthread_objc_condition_broadcast (objc_condition_t condition
+				    __attribute__ ((__unused__)))
 {
   if (__gthread_active_p ())
     /* Unimplemented.  */
@@ -415,7 +417,8 @@ __gthread_objc_condition_broadcast (objc_condition_t condition)
 
 /* Wake up one thread waiting on this condition.  */
 static inline int
-__gthread_objc_condition_signal (objc_condition_t condition)
+__gthread_objc_condition_signal (objc_condition_t condition
+				 __attribute__ ((__unused__)))
 {
   if (__gthread_active_p ())
     /* Unimplemented.  */
@@ -430,7 +433,7 @@ static inline int
 __gthread_once (__gthread_once_t *once, void (*func) (void))
 {
   if (__gthread_active_p ())
-    return __gthrw_pthread_once (once, func);
+    return __gthrw_(pthread_once) (once, func);
   else
     return -1;
 }
@@ -438,11 +441,11 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
 static inline int
 __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
 {
-  return __gthrw_pthread_keycreate (key, dtor);
+  return __gthrw_(pthread_keycreate) (key, dtor);
 }
 
 static inline int
-__gthread_key_delete (UNUSED (__gthread_key_t key))
+__gthread_key_delete (__gthread_key_t key __attribute__ ((__unused__)))
 {
   /* Operation is not supported.  */
   return -1;
@@ -452,7 +455,7 @@ static inline void *
 __gthread_getspecific (__gthread_key_t key)
 {
   void *ptr;
-  if (__gthrw_pthread_getspecific (key, &ptr) == 0)
+  if (__gthrw_(pthread_getspecific) (key, &ptr) == 0)
     return ptr;
   else
     return 0;
@@ -461,21 +464,21 @@ __gthread_getspecific (__gthread_key_t key)
 static inline int
 __gthread_setspecific (__gthread_key_t key, const void *ptr)
 {
-  return __gthrw_pthread_setspecific (key, (void *) ptr);
+  return __gthrw_(pthread_setspecific) (key, (void *) ptr);
 }
 
 static inline void
 __gthread_mutex_init_function (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    __gthrw_pthread_mutex_init (mutex, pthread_mutexattr_default);
+    __gthrw_(pthread_mutex_init) (mutex, pthread_mutexattr_default);
 }
 
 static inline int
 __gthread_mutex_lock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_pthread_mutex_lock (mutex);
+    return __gthrw_(pthread_mutex_lock) (mutex);
   else
     return 0;
 }
@@ -484,7 +487,7 @@ static inline int
 __gthread_mutex_trylock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_pthread_mutex_trylock (mutex);
+    return __gthrw_(pthread_mutex_trylock) (mutex);
   else
     return 0;
 }
@@ -493,7 +496,7 @@ static inline int
 __gthread_mutex_unlock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return __gthrw_pthread_mutex_unlock (mutex);
+    return __gthrw_(pthread_mutex_unlock) (mutex);
   else
     return 0;
 }
@@ -506,15 +509,16 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
       pthread_mutexattr_t attr;
       int r;
 
-      r = __gthrw_pthread_mutexattr_create (&attr);
+      r = __gthrw_(pthread_mutexattr_create) (&attr);
       if (!r)
-	r = __gthrw_pthread_mutexattr_setkind_np (&attr, MUTEX_RECURSIVE_NP);
+	r = __gthrw_(pthread_mutexattr_setkind_np) (&attr, MUTEX_RECURSIVE_NP);
       if (!r)
-	r = __gthrw_pthread_mutex_init (mutex, attr);
+	r = __gthrw_(pthread_mutex_init) (mutex, attr);
       if (!r)
-	r = __gthrw_pthread_mutexattr_delete (&attr);
+	r = __gthrw_(pthread_mutexattr_delete) (&attr);
       return r;
     }
+  return 0;
 }
 
 static inline int
@@ -537,7 +541,5 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
 
 #endif /* _LIBOBJC */
 
-#undef UNUSED
-
 #endif
 #endif /* ! GCC_GTHR_DCE_H */