Imported gcc-4.4.3

[msp430-gcc.git] / gcc / gthr-rtems.h

diff --git a/gcc/gthr-rtems.h b/gcc/gthr-rtems.h
index 3c6c0c5a14f6c14ce05bcfd63000878696738d04..c5bd52292cf0a8f63714d2da633fe19a3aec8aec 100644 (file)
--- a/gcc/gthr-rtems.h
+++ b/gcc/gthr-rtems.h
@@ -1,13 +1,14 @@
-/* RTEMS threads compatibily routines for libgcc2 and libobjc.
+/* RTEMS threads compatibility routines for libgcc2 and libobjc.

    by: Rosimildo da Silva( rdasilva@connecttel.com ) */
 /* Compile this one with gcc.  */
    by: Rosimildo da Silva( rdasilva@connecttel.com ) */
 /* Compile this one with gcc.  */

-/* Copyright (C) 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2002, 2003, 2005, 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


@@ -15,17 +16,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, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, 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_RTEMS_H
 #define GCC_GTHR_RTEMS_H
 
 #ifndef GCC_GTHR_RTEMS_H
 #define GCC_GTHR_RTEMS_H


@@ -37,34 +35,40 @@ extern "C" {
 #define __GTHREADS 1
 
 #define __GTHREAD_ONCE_INIT  0
 #define __GTHREADS 1
 
 #define __GTHREAD_ONCE_INIT  0

-#define __GTHREAD_MUTEX_INIT 0

 #define __GTHREAD_MUTEX_INIT_FUNCTION  rtems_gxx_mutex_init
 #define __GTHREAD_MUTEX_INIT_FUNCTION  rtems_gxx_mutex_init

+#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION  rtems_gxx_recursive_mutex_init

 
 

-/* avoid depedency on rtems specific headers */
+/* Avoid dependency on rtems specific headers.  */

 typedef void *__gthread_key_t;
 typedef int   __gthread_once_t;
 typedef void *__gthread_mutex_t;
 typedef void *__gthread_key_t;
 typedef int   __gthread_once_t;
 typedef void *__gthread_mutex_t;

+typedef void *__gthread_recursive_mutex_t;

 
 /*
 
 /*

- * External functions provided by RTEMS. They are very similar to their POSIX 
+ * External functions provided by RTEMS. They are very similar to their POSIX

  * counterparts. A "Wrapper API" is being use to avoid dependency on any RTEMS
  * header files.
  */
 
 /* generic per task variables */
  * counterparts. A "Wrapper API" is being use to avoid dependency on any RTEMS
  * header files.
  */
 
 /* generic per task variables */

-extern int rtems_gxx_once (__gthread_once_t *once, void (*func) (void));
-extern int rtems_gxx_key_create (__gthread_key_t *key, void (*dtor) (void *));
-extern int rtems_gxx_key_dtor (__gthread_key_t key, void *ptr);
-extern int rtems_gxx_key_delete (__gthread_key_t key);
-extern void *rtems_gxx_getspecific (__gthread_key_t key);
-extern int rtems_gxx_setspecific (__gthread_key_t key, const void *ptr);
+extern int rtems_gxx_once (__gthread_once_t *__once, void (*__func) (void));
+extern int rtems_gxx_key_create (__gthread_key_t *__key, void (*__dtor) (void *));
+extern int rtems_gxx_key_delete (__gthread_key_t __key);
+extern void *rtems_gxx_getspecific (__gthread_key_t __key);
+extern int rtems_gxx_setspecific (__gthread_key_t __key, const void *__ptr);

 
 /* mutex support */
 
 /* mutex support */

-extern void rtems_gxx_mutex_init (__gthread_mutex_t *mutex);
-extern int rtems_gxx_mutex_lock (__gthread_mutex_t *mutex);
-extern int rtems_gxx_mutex_trylock (__gthread_mutex_t *mutex);
-extern int rtems_gxx_mutex_unlock (__gthread_mutex_t *mutex);
-
+extern void rtems_gxx_mutex_init (__gthread_mutex_t *__mutex);
+extern int rtems_gxx_mutex_destroy (__gthread_mutex_t *__mutex);
+extern int rtems_gxx_mutex_lock (__gthread_mutex_t *__mutex);
+extern int rtems_gxx_mutex_trylock (__gthread_mutex_t *__mutex);
+extern int rtems_gxx_mutex_unlock (__gthread_mutex_t *__mutex);
+
+/* recursive mutex support */
+extern void rtems_gxx_recursive_mutex_init (__gthread_recursive_mutex_t *__mutex);
+extern int rtems_gxx_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex);
+extern int rtems_gxx_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex);
+extern int rtems_gxx_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex);

 
 /* RTEMS threading is always active */
 static inline int
 
 /* RTEMS threading is always active */
 static inline int


@@ -75,57 +79,75 @@ __gthread_active_p (void)
 
 /* Wrapper calls */
 static inline int
 
 /* Wrapper calls */
 static inline int

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

 {
 {

-   return rtems_gxx_once( once, func );
+   return rtems_gxx_once( __once, __func );

 }
 
 static inline int
 }
 
 static inline int

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

 {
 {

-  return rtems_gxx_key_create( key, dtor );
+  return rtems_gxx_key_create( __key, __dtor );

 }
 
 static inline int
 }
 
 static inline int

-__gthread_key_dtor (__gthread_key_t key, void *ptr)
+__gthread_key_delete (__gthread_key_t __key)
+{
+  return rtems_gxx_key_delete (__key);
+}
+
+static inline void *
+__gthread_getspecific (__gthread_key_t __key)

 {
 {

-   return rtems_gxx_key_dtor(key, ptr);
+  return rtems_gxx_getspecific (__key);

 }
 
 static inline int
 }
 
 static inline int

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

 {
 {

-  return rtems_gxx_key_delete (key);
+  return rtems_gxx_setspecific (__key, __ptr);

 }
 
 }
 

-static inline void *
-__gthread_getspecific (__gthread_key_t key)
+static inline int
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
+{
+  return rtems_gxx_mutex_destroy (__mutex);
+}
+
+static inline int
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
+{
+    return rtems_gxx_mutex_lock (__mutex);
+}
+
+static inline int
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)

 {
 {

-  return rtems_gxx_getspecific (key);
+    return rtems_gxx_mutex_trylock (__mutex);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_setspecific (__gthread_key_t key, const void *ptr)
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)

 {
 {

-  return rtems_gxx_setspecific (key, ptr);
+    return rtems_gxx_mutex_unlock( __mutex );

 }
 
 static inline int
 }
 
 static inline int

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

 {
 {

-    return rtems_gxx_mutex_lock (mutex);
+    return rtems_gxx_recursive_mutex_lock (__mutex);

 }
 
 static inline int
 }
 
 static inline int

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

 {
 {

-    return rtems_gxx_mutex_trylock (mutex);
+    return rtems_gxx_recursive_mutex_trylock (__mutex);

 }
 
 static inline int
 }
 
 static inline int

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

 {
 {

-    return rtems_gxx_mutex_unlock( mutex );
+    return rtems_gxx_recursive_mutex_unlock( __mutex );

 }
 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus