summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-12-20 10:55:59 +0000
committerJakub Jelinek <jakub@redhat.com>2005-12-20 10:55:59 +0000
commit24a640bf2a13a96aa3b582c13c767effcd946dbf (patch)
tree427bcf280f6c0454caed84b744cfdfaeec7eafc2 /locale
parent7d0bcd10a7e3455697985522580267c8470cfcb9 (diff)
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.c2
-rw-r--r--locale/uselocale.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 50bf8e772f..dc65d93b30 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_extern (_nl_current_##category)
+ weak_tls_extern (_nl_current_##category)
# include "categories.def"
# undef DEFINE_CATEGORY
diff --git a/locale/uselocale.c b/locale/uselocale.c
index 4e63dabd8e..671c519531 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_extern (_nl_current_##category) \
+ weak_tls_extern (_nl_current_##category) \
if (&_nl_current_##category##_used != 0) \
_nl_current_##category = &locobj->__locales[category]; \
}