aboutsummaryrefslogtreecommitdiff
path: root/locale/xlocale.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-28 10:39:23 +0000
committerRoland McGrath <roland@gnu.org>2002-08-28 10:39:23 +0000
commit1a0d874ed44e1fe59470497d65af8822a1b3abb8 (patch)
treee182578150b4cc6ad70d2e39fba0baeea4e1ad49 /locale/xlocale.c
parentd10c64301e56bd9cb77f5f480ba62df683ddbc5f (diff)
downloadglibc-1a0d874ed44e1fe59470497d65af8822a1b3abb8.tar
glibc-1a0d874ed44e1fe59470497d65af8822a1b3abb8.tar.gz
glibc-1a0d874ed44e1fe59470497d65af8822a1b3abb8.tar.bz2
glibc-1a0d874ed44e1fe59470497d65af8822a1b3abb8.zip
Make uselocale support static linking.
* locale/xlocale.c: Revert changes putting _nl_global_locale here. This file again just defines _nl_C_locobj. (_nl_C_locobj): Use a categories.def iterator in the initializer. * locale/global-locale.c: New file. Define _nl_global_locale here, using all weak references in the initializer. * locale/Makefile (aux): Add global-locale. * locale/localeinfo.h (_nl_global_locale, _NL_CURRENT_LOCALE): Make these unconditional, along with the tsd decl. [!SHARED && HAVE___THREAD && HAVE_WEAK_SYMBOLS] (NL_CURRENT_INDIRECT): Define it under these conditions. [NL_CURRENT_INDIRECT]: Test this instead of [! SHARED]. Don't declare _nl_current. Declare _nl_current_LC_FOO as `extern __thread struct locale_data *const *'. [NL_CURRENT_INDIRECT] (_NL_CURRENT_DATA, _NL_CURRENT, _NL_CURRENT_WSTR): Add indirection. [NL_CURRENT_INDIRECT] (_NL_CURRENT_DEFINE): Rewritten. Define the thread variable _nl_current_LC_FOO and also a special absolute symbol _nl_current_LC_FOO_used. * locale/uselocale.c (__uselocale) [NL_CURRENT_INDIRECT]: Set each _nl_current_LC_FOO symbol to point into the new locale, using weak references to test if _nl_current_LC_FOO_used was linked in. * locale/setlocale.c [! SHARED]: Replace this conditional ... [NL_CURRENT_INDIRECT]: ... with this one. (_nl_current, _nl_C): Variables removed. [NL_CURRENT_INDIRECT] (_nl_current_used): New variable, table of weak references to _nl_current_LC_FOO_used. [NL_CURRENT_INDIRECT] (CATEGORY_USED): Define using that table. (free_category): New function, broken out of ... (free_mem): ... here. Call that. (free_mem) [NL_CURRENT_INDIRECT]: Use a categories.def iterator instead of a loop. __USING_NAMESPACE_C99 depending on _GLIBCPP_USE_NAMESPACES.
Diffstat (limited to 'locale/xlocale.c')
-rw-r--r--locale/xlocale.c51
1 files changed, 13 insertions, 38 deletions
diff --git a/locale/xlocale.c b/locale/xlocale.c
index 854584cca4..2f9e198aef 100644
--- a/locale/xlocale.c
+++ b/locale/xlocale.c
@@ -32,41 +32,16 @@ extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden;
extern const char _nl_C_LC_CTYPE_tolower[] attribute_hidden;
-#define NL_C_INITIALIZER \
- { \
- .__locales = \
- { \
- [LC_CTYPE] = &_nl_C_LC_CTYPE, \
- [LC_NUMERIC] = &_nl_C_LC_NUMERIC, \
- [LC_TIME] = &_nl_C_LC_TIME, \
- [LC_COLLATE] = &_nl_C_LC_COLLATE, \
- [LC_MONETARY] = &_nl_C_LC_MONETARY, \
- [LC_MESSAGES] = &_nl_C_LC_MESSAGES, \
- [LC_PAPER] = &_nl_C_LC_PAPER, \
- [LC_NAME] = &_nl_C_LC_NAME, \
- [LC_ADDRESS] = &_nl_C_LC_ADDRESS, \
- [LC_TELEPHONE] = &_nl_C_LC_TELEPHONE, \
- [LC_MEASUREMENT] = &_nl_C_LC_MEASUREMENT, \
- [LC_IDENTIFICATION] = &_nl_C_LC_IDENTIFICATION \
- }, \
- .__ctype_b = (const unsigned short int *) _nl_C_LC_CTYPE_class + 128, \
- .__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128, \
- .__ctype_toupper = (const int *) _nl_C_LC_CTYPE_toupper + 128 \
- }
-
-struct __locale_struct _nl_C_locobj attribute_hidden = NL_C_INITIALIZER;
-
-#ifdef SHARED
-struct __locale_struct _nl_global_locale attribute_hidden = NL_C_INITIALIZER;
-
-# if USE_TLS && HAVE___THREAD
-/* The tsd macros don't permit an initializer. */
-__thread void *__libc_tsd_LOCALE = &_nl_global_locale;
-# else
-__libc_tsd_define (, LOCALE)
-/* This is a bad kludge presuming the variable name used by the macros.
- Using typeof makes sure to barf if we do not match the macro definition. */
-__typeof (__libc_tsd_LOCALE_data) __libc_tsd_LOCALE_data = &_nl_global_locale;
-# endif
-
-#endif
+struct __locale_struct _nl_C_locobj attribute_hidden =
+ {
+ .__locales =
+ {
+#define DEFINE_CATEGORY(category, category_name, items, a) \
+ [category] = &_nl_C_##category,
+#include "categories.def"
+#undef DEFINE_CATEGORY
+ },
+ .__ctype_b = (const unsigned short int *) _nl_C_LC_CTYPE_class + 128,
+ .__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128,
+ .__ctype_toupper = (const int *) _nl_C_LC_CTYPE_toupper + 128
+ };