Mon Apr 10 14:53:15 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

	* stdlib/strtod.c (STRTOF): Use extra macro to make STRTOF's #defn
 	a weak symbol instead of literal "STRTOF".

	* locale/setlocale.c: Work around ld bug: don't weakify refs to
 	_nl_{current,C}_*.

diff --git a/ChangeLog b/ChangeLog
index 04b53e88ff402708f20a8086bafc1d62d9b7172b..f859c747891d2fc623a226b4b18ae159d02a1935 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Apr 10 14:53:15 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+       * stdlib/strtod.c (STRTOF): Use extra macro to make STRTOF's #defn
+       a weak symbol instead of literal "STRTOF".
+
+       * locale/setlocale.c: Work around ld bug: don't weakify refs to
+       _nl_{current,C}_*.
+
 Sun Apr  9 01:24:33 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
        * Makerules (+depfiles): Translate %.so to %.o in $(extra-objs).

diff --git a/locale/setlocale.c b/locale/setlocale.c
index 500d8627eb45037469b603a9fb2b48e767d173bc..509bb4ffa1e45674940aef1648ff03c3af2ad345 100644 (file)
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -33,7 +33,8 @@ Cambridge, MA 02139, USA.  */
 #define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \
 extern const struct locale_data *_nl_current_##category;                     \
 extern const struct locale_data _nl_C_##category;                            \
-weak_symbol (_nl_current_##category) weak_symbol (_nl_C_##category)
+/* XXX The linker is broken so we cannot do the weak symbols right just now. */
+/* weak_symbol (_nl_current_##category) weak_symbol (_nl_C_##category) */
 #include "categories.def"
 #undef DEFINE_CATEGORY
 

diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index 94f9da3bfb890c35893b463e5a7d2dbce61d6a45..8afacfff14dbde352eefd0c10e50157ace07fa78 100644 (file)
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -1097,7 +1097,8 @@ INTERNAL (STRTOF) (nptr, endptr, group)
 \f
 /* External user entry point.  */
 
-weak_symbol (STRTOF)
+#define weak_this(x) weak_symbol(x)
+weak_this (STRTOF)
 
 FLOAT
 STRTOF (nptr, endptr)