PR c++/43509

[pf3gnuchains/gcc-fork.git] / gcc / gthr-posix95.h

diff --git a/gcc/gthr-posix95.h b/gcc/gthr-posix95.h
index d993c13..55e254e 100644 (file)
--- a/gcc/gthr-posix95.h
+++ b/gcc/gthr-posix95.h
@@ -1,12 +1,12 @@
 /* Threads compatibility routines for libgcc2 and libobjc.  */
 /* Compile this one with gcc.  */
 /* Threads compatibility routines for libgcc2 and libobjc.  */
 /* Compile this one with gcc.  */

-/* Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.

 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -14,17 +14,14 @@ WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 

-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.

 
 

-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */

 
 #ifndef GCC_GTHR_POSIX_H
 #define GCC_GTHR_POSIX_H
 
 #ifndef GCC_GTHR_POSIX_H
 #define GCC_GTHR_POSIX_H


@@ -97,7 +94,6 @@ __gthrw(pthread_cond_destroy)
 __gthrw(pthread_cond_init)
 __gthrw(pthread_cond_signal)
 __gthrw(pthread_exit)
 __gthrw(pthread_cond_init)
 __gthrw(pthread_cond_signal)
 __gthrw(pthread_exit)

-__gthrw(pthread_mutex_destroy)

 #ifdef _POSIX_PRIORITY_SCHEDULING
 #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
 __gthrw(sched_get_priority_max)
 #ifdef _POSIX_PRIORITY_SCHEDULING
 #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
 __gthrw(sched_get_priority_max)


@@ -122,9 +118,12 @@ __gthrw(pthread_setschedparam)
    it is passed so we cannot pretend that the interface is active if -pthreads
    is not specified.  On Solaris 2.5.1, the interface is not exposed at all so
    we need to play the usual game with weak symbols.  On Solaris 10 and up, a
    it is passed so we cannot pretend that the interface is active if -pthreads
    is not specified.  On Solaris 2.5.1, the interface is not exposed at all so
    we need to play the usual game with weak symbols.  On Solaris 10 and up, a

-   working interface is always exposed.  */
+   working interface is always exposed.  On FreeBSD 6 and later, libc also
+   exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up
+   to 9 does.  FreeBSD >= 700014 even provides a pthread_cancel stub in libc,
+   which means the alternate __gthread_active_p below cannot be used there.  */

 
 

-#if defined(__sun) && defined(__svr4__)
+#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__))

 
 static volatile int __gthread_active = -1;
 
 
 static volatile int __gthread_active = -1;
 


@@ -167,17 +166,17 @@ __gthread_active_p (void)
   return __gthread_active_latest_value != 0;
 }
 
   return __gthread_active_latest_value != 0;
 }
 

-#else /* not Solaris */
+#else /* neither FreeBSD nor Solaris */

 
 static inline int
 __gthread_active_p (void)
 {
 
 static inline int
 __gthread_active_p (void)
 {

-  static void *const __gthread_active_ptr 
+  static void *const __gthread_active_ptr

     = __extension__ (void *) &__gthrw_(pthread_cancel);
   return __gthread_active_ptr != 0;
 }
 
     = __extension__ (void *) &__gthrw_(pthread_cancel);
   return __gthread_active_ptr != 0;
 }
 

-#endif /* Solaris */
+#endif /* FreeBSD or Solaris */

 
 #else /* not SUPPORTS_WEAK */
 
 
 #else /* not SUPPORTS_WEAK */
 


@@ -608,150 +607,150 @@ __gthread_objc_condition_signal (objc_condition_t condition)
 #else /* _LIBOBJC */
 
 static inline int
 #else /* _LIBOBJC */
 
 static inline int

-__gthread_once (__gthread_once_t *once, void (*func) (void))
+__gthread_once (__gthread_once_t *__once, void (*__func) (void))

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return __gthrw_(pthread_once) (once, func);
+    return __gthrw_(pthread_once) (__once, __func);

   else
     return -1;
 }
 
 static inline int
   else
     return -1;
 }
 
 static inline int

-__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))

 {
 {

-  return __gthrw_(pthread_key_create) (key, dtor);
+  return __gthrw_(pthread_key_create) (__key, __dtor);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_key_delete (__gthread_key_t key)
+__gthread_key_delete (__gthread_key_t __key)

 {
 {

-  return __gthrw_(pthread_key_delete) (key);
+  return __gthrw_(pthread_key_delete) (__key);

 }
 
 static inline void *
 }
 
 static inline void *

-__gthread_getspecific (__gthread_key_t key)
+__gthread_getspecific (__gthread_key_t __key)

 {
 {

-  return __gthrw_(pthread_getspecific) (key);
+  return __gthrw_(pthread_getspecific) (__key);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_setspecific (__gthread_key_t key, const void *ptr)
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)

 {
 {

-  return __gthrw_(pthread_setspecific) (key, ptr);
+  return __gthrw_(pthread_setspecific) (__key, __ptr);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_mutex_destroy (__gthread_mutex_t *mutex)
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return __gthrw_(pthread_mutex_destroy) (mutex);
+    return __gthrw_(pthread_mutex_destroy) (__mutex);

   else
     return 0;
 }
 
 static inline int
   else
     return 0;
 }
 
 static inline int

-__gthread_mutex_lock (__gthread_mutex_t *mutex)
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return __gthrw_(pthread_mutex_lock) (mutex);
+    return __gthrw_(pthread_mutex_lock) (__mutex);

   else
     return 0;
 }
 
 static inline int
   else
     return 0;
 }
 
 static inline int

-__gthread_mutex_trylock (__gthread_mutex_t *mutex)
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return __gthrw_(pthread_mutex_trylock) (mutex);
+    return __gthrw_(pthread_mutex_trylock) (__mutex);

   else
     return 0;
 }
 
 static inline int
   else
     return 0;
 }
 
 static inline int

-__gthread_mutex_unlock (__gthread_mutex_t *mutex)
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return __gthrw_(pthread_mutex_unlock) (mutex);
+    return __gthrw_(pthread_mutex_unlock) (__mutex);

   else
     return 0;
 }
 
 static inline int
   else
     return 0;
 }
 
 static inline int

-__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)

 {
 {

-  mutex->depth = 0;
-  mutex->owner = (pthread_t) 0;
-  return __gthrw_(pthread_mutex_init) (&mutex->actual, NULL);
+  __mutex->depth = 0;
+  __mutex->owner = (pthread_t) 0;
+  return __gthrw_(pthread_mutex_init) (&__mutex->actual, NULL);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
     {
 {
   if (__gthread_active_p ())
     {

-      pthread_t me = __gthrw_(pthread_self) ();
+      pthread_t __me = __gthrw_(pthread_self) ();

 
 

-      if (mutex->owner != me)
+      if (__mutex->owner != __me)

        {
        {

-         __gthrw_(pthread_mutex_lock) (&mutex->actual);
-         mutex->owner = me;
+         __gthrw_(pthread_mutex_lock) (&__mutex->actual);
+         __mutex->owner = __me;

        }
 
        }
 

-      mutex->depth++;
+      __mutex->depth++;

     }
   return 0;
 }
 
 static inline int
     }
   return 0;
 }
 
 static inline int

-__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
     {
 {
   if (__gthread_active_p ())
     {

-      pthread_t me = __gthrw_(pthread_self) ();
+      pthread_t __me = __gthrw_(pthread_self) ();

 
 

-      if (mutex->owner != me)
+      if (__mutex->owner != __me)

        {
        {

-         if (__gthrw_(pthread_mutex_trylock) (&mutex->actual))
+         if (__gthrw_(pthread_mutex_trylock) (&__mutex->actual))

            return 1;
            return 1;

-         mutex->owner = me;
+         __mutex->owner = __me;

        }
 
        }
 

-      mutex->depth++;
+      __mutex->depth++;

     }
   return 0;
 }
 
 static inline int
     }
   return 0;
 }
 
 static inline int

-__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
     {
 {
   if (__gthread_active_p ())
     {

-      if (--mutex->depth == 0)
+      if (--__mutex->depth == 0)

        {
        {

-          mutex->owner = (pthread_t) 0;
-          __gthrw_(pthread_mutex_unlock) (&mutex->actual);
+          __mutex->owner = (pthread_t) 0;
+          __gthrw_(pthread_mutex_unlock) (&__mutex->actual);

        }
     }
   return 0;
 }
 
 static inline int
        }
     }
   return 0;
 }
 
 static inline int

-__gthread_cond_broadcast (__gthread_cond_t *cond)
+__gthread_cond_broadcast (__gthread_cond_t *__cond)

 {
 {

-  return __gthrw_(pthread_cond_broadcast) (cond);
+  return __gthrw_(pthread_cond_broadcast) (__cond);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_cond_wait (__gthread_cond_t *cond, __gthread_mutex_t *mutex)
+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)

 {
 {

-  return __gthrw_(pthread_cond_wait) (cond, mutex);
+  return __gthrw_(pthread_cond_wait) (__cond, __mutex);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_cond_wait_recursive (__gthread_cond_t *cond,
-                              __gthread_recursive_mutex_t *mutex)
+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
+                              __gthread_recursive_mutex_t *__mutex)

 {
 {

-  return __gthrw_(pthread_cond_wait) (cond, mutex->actual);
+  return __gthrw_(pthread_cond_wait) (__cond, &__mutex->actual);

 }
 
 #endif /* _LIBOBJC */
 }
 
 #endif /* _LIBOBJC */