mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
1a0d874ed4
* 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.
64 lines
2.5 KiB
C
64 lines
2.5 KiB
C
/* Locale object representing the global locale controlled by setlocale.
|
|
Copyright (C) 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <locale.h>
|
|
#include "localeinfo.h"
|
|
|
|
#define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
extern struct locale_data _nl_C_##category; weak_extern (_nl_C_##category)
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
|
|
/* Defined in locale/C-ctype.c. */
|
|
extern const char _nl_C_LC_CTYPE_class[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_tolower[] attribute_hidden;
|
|
weak_extern (_nl_C_LC_CTYPE_class)
|
|
weak_extern (_nl_C_LC_CTYPE_toupper)
|
|
weak_extern (_nl_C_LC_CTYPE_tolower)
|
|
|
|
/* Here we define the locale object maintained by setlocale.
|
|
The references in the initializer are weak, so the parts of
|
|
the structure that are never referred to will be zero. */
|
|
|
|
struct __locale_struct _nl_global_locale 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
|
|
};
|
|
|
|
#include <tls.h>
|
|
#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
|