diff options
Diffstat (limited to 'locale/uselocale.c')
| -rw-r--r-- | locale/uselocale.c | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/locale/uselocale.c b/locale/uselocale.c index 1e819381de..d5e53113c1 100644 --- a/locale/uselocale.c +++ b/locale/uselocale.c @@ -20,8 +20,6 @@ #include <locale.h> #include "localeinfo.h" -#ifdef SHARED - /* Switch the current thread's locale to DATASET. If DATASET is null, instead just return the current setting. The special value LC_GLOBAL_LOCALE is the initial setting @@ -35,18 +33,38 @@ __uselocale (locale_t newloc) locale_t loc = __libc_tsd_get (LOCALE); return loc == &_nl_global_locale ? LC_GLOBAL_LOCALE : loc; } - if (newloc == LC_GLOBAL_LOCALE) + else { - __libc_tsd_set (LOCALE, &_nl_global_locale); - return LC_GLOBAL_LOCALE; + const locale_t locobj + = newloc == LC_GLOBAL_LOCALE ? &_nl_global_locale : newloc; + __libc_tsd_set (LOCALE, locobj); + +#ifdef NL_CURRENT_INDIRECT + /* Now we must update all the per-category thread-local variables to + point into the new current locale for this thread. The magic + symbols _nl_current_LC_FOO_used are defined to meaningless values + if _nl_current_LC_FOO was linked in. By using weak references to + both symbols and testing the address of _nl_current_LC_FOO_used, + we can avoid accessing the _nl_current_LC_FOO thread-local + variable at all when no code referring to it was linked in. We + need the special bogus symbol because while TLS symbols can be + weak, there is no reasonable way to test for the default-zero + value as with a heap symbol (taking the address would just use + some bogus offset from our thread pointer). */ + +# define DEFINE_CATEGORY(category, category_name, items, a) \ + { \ + extern char _nl_current_##category##_used; \ + weak_extern (_nl_current_##category##_used) \ + weak_extern (_nl_current_##category) \ + if (&_nl_current_##category##_used != 0) \ + _nl_current_##category = &locobj->__locales[category]; \ + } +# include "categories.def" +# undef DEFINE_CATEGORY +#endif } - __libc_tsd_set (LOCALE, newloc); + return newloc; } weak_alias (__uselocale, uselocale) - -#else - -# warning uselocale not implemented for static linking yet - -#endif |