about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--locale/setlocale.c3
-rw-r--r--stdlib/strtod.c3
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 04b53e88ff..f859c74789 100644
--- 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 500d8627eb..509bb4ffa1 100644
--- 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 94f9da3bfb..8afacfff14 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -1097,7 +1097,8 @@ INTERNAL (STRTOF) (nptr, endptr, group)
 
 /* External user entry point.  */
 
-weak_symbol (STRTOF)
+#define weak_this(x) weak_symbol(x)
+weak_this (STRTOF)
 
 FLOAT
 STRTOF (nptr, endptr)