summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2012-06-19 07:42:21 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2012-06-19 07:42:21 +0000
commitcfed6ba4c857edeadf5397b25d42d35d37828429 (patch)
tree9e80cdb949778bcb5f1c72d54b9b89bd20edd779
parent95f9c4d580e9369faba8a849f9a6d1c715b4535e (diff)
downloadgcc-cfed6ba4c857edeadf5397b25d42d35d37828429.tar.gz
PR libstdc++/53270
* config/os/gnu-linux/os_defines.h: Disable static initializer macros for gthreads types in C++11 mode. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188768 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/config/os/gnu-linux/os_defines.h6
2 files changed, 12 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ae9090ac5a6..7d6dc051e0e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-19 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ PR libstdc++/53270
+ * config/os/gnu-linux/os_defines.h: Disable static initializer macros
+ for gthreads types in C++11 mode.
+
2012-06-19 Jörg Sonnenberger <joerg@britannica.bec.de>
Jonathan Wakely <jwakely.gcc@gmail.com>
diff --git a/libstdc++-v3/config/os/gnu-linux/os_defines.h b/libstdc++-v3/config/os/gnu-linux/os_defines.h
index c4aa305487d..f41160f6055 100644
--- a/libstdc++-v3/config/os/gnu-linux/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/os_defines.h
@@ -46,4 +46,10 @@
# undef _GLIBCXX_HAVE_GETS
#endif
+#if defined(__hppa__) && defined(__GXX_EXPERIMENTAL_CXX0X__)
+# define _GTHREAD_USE_MUTEX_INIT_FUNC
+# define _GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC
+# define _GTHREAD_USE_COND_INIT_FUNC
+#endif
+
#endif