From 135f368e6ec21b990c656c0e5188edee14b254e0 Mon Sep 17 00:00:00 2001 From: Jeffrey A Law Date: Sat, 27 Jun 1998 23:51:33 +0000 Subject: [PATCH] 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. Bring over from egcs-1.0.3 branch since ppc-linux still uses glibc-1.9x. From-SVN: r20775 --- libstdc++/stl/ChangeLog | 5 +++++ libstdc++/stl/stl_config.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog index 4afbb7105d0..82cdfe39804 100644 --- a/libstdc++/stl/ChangeLog +++ b/libstdc++/stl/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 28 00:49:42 1998 Jeffrey A Law (law@cygnus.com) + + * stl_config.h (__STL_PTHREADS): Don't define for glibc 2 if + _G_USING_THUNKS is not defined. + 1998-04-07 18:32 Ulrich Drepper * stl_hashtable.h (__stl_prime_list): Mark last two numbers as diff --git a/libstdc++/stl/stl_config.h b/libstdc++/stl/stl_config.h index ff730289897..02a1f887174 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 # endif # ifdef __EXCEPTIONS -- 2.30.2