diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-12-21 09:46:55 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-12-21 09:46:55 +0000 |
| commit | e3173d2c996d8e30dfe44e9bf530881da6df6aaa (patch) | |
| tree | 88d7db2140348f9328c7250d20aecb7f8adcb79b /locale | |
| parent | baa0a2c9a410a88fcacdf82abc7d21b0c99c7cd3 (diff) | |
Revert:cvs/fedora-glibc-2_3_90-22
Workaround for http://gcc.gnu.org/PR25240
* include/libc-symbols.h (weak_extern): Define using weak attribute.
(_weak_extern): Remove.
(weak_tls_extern): Define.
* locale/uselocale.c (DEFINE_CATEGORY): Use weak_tls_extern for
_nl_current_##category.
* locale/setlocale.c (DEFINE_CATEGORY): Likewise.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/setlocale.c | 2 | ||||
| -rw-r--r-- | locale/uselocale.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c index dc65d93b30..50bf8e772f 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -39,7 +39,7 @@ # define DEFINE_CATEGORY(category, category_name, items, a) \ extern char _nl_current_##category##_used; \ weak_extern (_nl_current_##category##_used) \ - weak_tls_extern (_nl_current_##category) + weak_extern (_nl_current_##category) # include "categories.def" # undef DEFINE_CATEGORY diff --git a/locale/uselocale.c b/locale/uselocale.c index 671c519531..4e63dabd8e 100644 --- a/locale/uselocale.c +++ b/locale/uselocale.c @@ -54,7 +54,7 @@ __uselocale (locale_t newloc) { \ extern char _nl_current_##category##_used; \ weak_extern (_nl_current_##category##_used) \ - weak_tls_extern (_nl_current_##category) \ + weak_extern (_nl_current_##category) \ if (&_nl_current_##category##_used != 0) \ _nl_current_##category = &locobj->__locales[category]; \ } |