summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl@gnu.org>1998-03-05 23:09:12 +0000
committerJeff Law <law@gcc.gnu.org>1998-03-05 16:09:12 -0700
commit83ad9cfa811c527a95647864c939a53ce04fb87c (patch)
tree97c2a4b2fefa9ae928dbf270db3e7d0581c759bf
parentd20323edaa49393b2aa385f8c806eebce1228ba0 (diff)
downloadgcc-83ad9cfa811c527a95647864c939a53ce04fb87c.tar.gz
stl_config.h (__STL_PTHREADS): Don't define for glibc 2 if _G_USING_THUNKS is not defined.
* stl_config.h (__STL_PTHREADS): Don't define for glibc 2 if _G_USING_THUNKS is not defined. From-SVN: r18422
-rw-r--r--libstdc++/stl/ChangeLog5
-rw-r--r--libstdc++/stl/stl_config.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index b3aa0987f8d..8a696b46221 100644
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 6 00:12:28 1998 H.J. Lu (hjl@gnu.org)
+
+ * stl_config.h (__STL_PTHREADS): Don't define for glibc 2 if
+ _G_USING_THUNKS is not defined.
+
1998-02-25 Jason Merrill <jason@yorick.cygnus.com>
* stl_config.h: Work around glibc pthread.h bug.
diff --git a/libstdc++/stl/stl_config.h b/libstdc++/stl/stl_config.h
index 06d1cd13929..84699d06d61 100644
--- a/libstdc++/stl/stl_config.h
+++ b/libstdc++/stl/stl_config.h
@@ -114,7 +114,9 @@
# define __STL_EXPLICIT_FUNCTION_TMPL_ARGS
# define __STL_MEMBER_TEMPLATES
# endif
-# if !defined(_NOTHREADS) && __GLIBC__ >= 2
+ /* glibc pre 2.0 is very buggy. We have to disable thread for it.
+ It should be upgraded to glibc 2.0 or later. */
+# if !defined(_NOTHREADS) && __GLIBC__ >= 2 && defined(_G_USING_THUNKS)
# define __STL_PTHREADS
# ifdef __STRICT_ANSI__
/* Work around a bug in the glibc pthread.h. */