about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--csu/initfini.c3
-rw-r--r--locale/setlocale.c2
-rw-r--r--misc/efgcvt_r.c4
-rw-r--r--sysdeps/i386/dl-machine.h2
4 files changed, 5 insertions, 6 deletions
diff --git a/csu/initfini.c b/csu/initfini.c
index 8fe2368e36..28e822b38c 100644
--- a/csu/initfini.c
+++ b/csu/initfini.c
@@ -70,8 +70,7 @@ _init (void)
      gcrt1.o to reference a symbol which would be defined by some library
      module which has a constructor; but then user code's constructors
      would come first, and not be profiled.  */
-  extern void __gmon_start__ (void) __attribute__ ((weak));
-  weak_symbol (__gmon_start__)
+  extern void __gmon_start__ (void); weak_extern (__gmon_start__)
   if (__gmon_start__)
     __gmon_start__ ();
 
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 98a4ffe63b..eab1a33f89 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -36,7 +36,7 @@ Boston, MA 02111-1307, 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)
+weak_extern (_nl_current_##category) weak_extern (_nl_C_##category)
 #include "categories.def"
 #undef	DEFINE_CATEGORY
 
diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c
index 1f99c64e48..6a65583a6a 100644
--- a/misc/efgcvt_r.c
+++ b/misc/efgcvt_r.c
@@ -60,7 +60,7 @@ fcvt_r (value, ndigit, decpt, sign, buf, len)
   return 0;
 }
 
-weak_symbol (floor) weak_symbol (log10) weak_symbol (fabs)
+weak_extern (floor) weak_extern (log10) weak_extern (fabs)
 
 int
 ecvt_r (value, ndigit, decpt, sign, buf, len)
@@ -70,7 +70,7 @@ ecvt_r (value, ndigit, decpt, sign, buf, len)
      size_t len;
 {
   double (*log10_function) (double) = &log10;
-  
+
   if (log10_function)
     {
       /* Use the reasonable code if -lm is included.  */
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 50e928ce3a..7a61aaad4c 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -111,7 +111,7 @@ elf_machine_rel (struct link_map *map,
 	   RTLD_BOOTSTRAP) because rtld.c contains the common defn for
 	   _dl_rtld_map, which is incompatible with a weak decl in the same
 	   file.  */
-	weak_symbol (_dl_rtld_map);
+	weak_extern (_dl_rtld_map);
 	if (map == &_dl_rtld_map)
 	  /* Undo the relocation done here during bootstrapping.  Now we will
 	     relocate it anew, possibly using a binding found in the user