diff --git a/linuxthreads/manager.c b/linuxthreads/manager.c index 11588fbb21..8ad9eb521b 100644 --- a/linuxthreads/manager.c +++ b/linuxthreads/manager.c @@ -27,6 +27,7 @@ #include #include #include /* for waitpid macros */ +#include /* for __uselocale */ #include #include "pthread.h" @@ -301,6 +302,11 @@ pthread_start_thread(void *arg) __sched_setscheduler(THREAD_GETMEM(self, p_pid), SCHED_OTHER, &default_params); } +#if !(USE_TLS && HAVE___THREAD) && defined SHARED + /* Initialize thread-locale current locale to point to the global one. + With __thread support, the variable's initializer takes care of this. */ + __uselocale (LC_GLOBAL_LOCALE); +#endif /* Make gdb aware of new thread */ if (__pthread_threads_debug && __pthread_sig_debug > 0) { request.req_thread = self; diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index a5fcbd8118..ae42ebe1c8 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -32,6 +32,7 @@ #include "restart.h" #include #include +#include /* for __uselocale */ /* Sanity check. */ #if __ASSUME_REALTIME_SIGNALS && !defined __SIGRTMIN @@ -460,6 +461,12 @@ __pthread_initialize_minimal(void) __pthread_initial_thread.p_cpuclock_offset = GL(dl_cpuclock_offset); # endif #endif + +#if !(USE_TLS && HAVE___THREAD) && defined SHARED + /* Initialize thread-locale current locale to point to the global one. + With __thread support, the variable's initializer takes care of this. */ + __uselocale (LC_GLOBAL_LOCALE); +#endif }