Revert:

	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.

diff --git a/ChangeLog b/ChangeLog
index 93c0f79b0b05d29b567e4a4e2bbc6bb5a84a7b57..f471b858599799b132319e4087f3693d93ee327c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -117,14 +117,6 @@
        (mcheck): Call __libc_malloc and __libc_free instead of
        malloc and free.
 
-       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.
-
 2005-12-19  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #1955]

diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index f69bf8350ddc393d7542ddc7487222d07c84b1b0..8ee940719e0637ecbce2d2b25e2d2f56d5a51e03 100644 (file)
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -114,8 +114,8 @@
   extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
 
 /* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined).  */
-#  define weak_extern(symbol) extern __typeof (symbol) symbol __attribute__ ((weak));
-#  define weak_tls_extern(symbol) extern __thread __typeof (symbol) symbol __attribute__ ((weak));
+#  define weak_extern(symbol) _weak_extern (weak symbol)
+#  define _weak_extern(expr) _Pragma (#expr)
 
 # else
 

diff --git a/locale/setlocale.c b/locale/setlocale.c
index dc65d93b30ac05b1eff570ba2bc3e952a2e33f04..50bf8e772f7be7468437b664d36589b26dbee075 100644 (file)
--- 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 671c519531c5c525dfb4896a70fb6568b5d4a693..4e63dabd8e7bc616fc87e537accc2a8e64dd3c58 100644 (file)
--- 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];              \
       }