PR c/43381

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

diff --git a/gcc/gthr-dce.h b/gcc/gthr-dce.h
index 50b6fdb..4226359 100644 (file)
--- a/gcc/gthr-dce.h
+++ b/gcc/gthr-dce.h
@@ -7,7 +7,7 @@ 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
 
 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 +15,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_DCE_H
 #define GCC_GTHR_DCE_H
 
 #ifndef GCC_GTHR_DCE_H
 #define GCC_GTHR_DCE_H


@@ -40,6 +37,15 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
    DCE threads are based on POSIX threads draft 4, and many things
    have changed since then.  */
 
    DCE threads are based on POSIX threads draft 4, and many things
    have changed since then.  */
 

+/* Make sure CONST_CAST2 (original in system.h) is defined.  */
+#ifndef CONST_CAST2
+#ifdef __cplusplus
+#define CONST_CAST2(TOTYPE,FROMTYPE,X) (const_cast<TOTYPE> (X))
+#else
+#define CONST_CAST2(TOTYPE,FROMTYPE,X) ((__extension__(union {FROMTYPE _q; TOTYPE _nq;})(X))._nq)
+#endif
+#endif
+

 #define __GTHREADS 1
 
 #include <pthread.h>
 #define __GTHREADS 1
 
 #include <pthread.h>


@@ -465,7 +471,8 @@ __gthread_getspecific (__gthread_key_t __key)
 static inline int
 __gthread_setspecific (__gthread_key_t __key, const void *__ptr)
 {
 static inline int
 __gthread_setspecific (__gthread_key_t __key, const void *__ptr)
 {

-  return __gthrw_(pthread_setspecific) (__key, (void *) __ptr);
+  return __gthrw_(pthread_setspecific)
+    (__key, CONST_CAST2(void *, const void *, __ptr));

 }
 
 static inline void
 }
 
 static inline void