From 15868f9c3d22fb51b38d7aafd88d95fb2193e734 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Mon, 16 Jan 2006 18:29:52 +0000
Subject: s/weak_alias/strong_alias/, only what I knew as needed are kept. We
 will now see what libpthread will do ...

---
 libc/misc/ctype/ctype.c           |  2 +-
 libc/misc/error/error.c           |  9 ++++-----
 libc/misc/intl/intl.c             | 10 +++++-----
 libc/misc/regex/regcomp.c         | 12 ++++++------
 libc/misc/regex/regex_old.c       | 24 ++++++++++++------------
 libc/misc/regex/regexec.c         | 12 ++++++------
 libc/misc/search/hsearch.c        |  1 -
 libc/misc/time/time.c             |  2 +-
 libc/sysdeps/linux/common/lstat.c |  2 +-
 libc/sysdeps/linux/common/stat.c  |  2 +-
 libc/termios/tcdrain.c            |  2 +-
 11 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index 9a220ac63..c6195d89f 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -93,7 +93,7 @@ libc_hidden_proto(__ctype_b)
 #ifdef __UCLIBC_DO_XLOCALE
 #define CTYPE_NAME(X)  __is ## X ## _l
 #define ISCTYPE(C,F)   __isctype_l( C, F, locale_arg)
-#define CTYPE_ALIAS(NAME)    weak_alias( __is ## NAME ## _l , is ## NAME ## _l)
+#define CTYPE_ALIAS(NAME)    strong_alias( __is ## NAME ## _l , is ## NAME ## _l)
 #else
 #define CTYPE_NAME(X)  is ## X
 #define ISCTYPE(C,F)   __isctype( C, F )
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index 6528e28ce..5c1109ea0 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -52,7 +52,7 @@ int error_one_per_line;
 void (*error_print_progname) (void) = NULL;
 
 
-void __error (int status, int errnum, const char *message, ...)
+attribute_hidden void __error (int status, int errnum, const char *message, ...)
 {
     va_list args;
 
@@ -70,7 +70,7 @@ void __error (int status, int errnum, const char *message, ...)
 	exit (status);
 }
 
-void __error_at_line (int status, int errnum, const char *file_name,
+attribute_hidden void __error_at_line (int status, int errnum, const char *file_name,
 	       unsigned int line_number, const char *message, ...)
 {
     va_list args;
@@ -106,8 +106,7 @@ void __error_at_line (int status, int errnum, const char *file_name,
 	exit (status);
 }
 
-/* Use the weaks here in an effort at controlling namespace pollution */
 #undef error
 #undef error_at_line
-weak_alias (__error, error)
-weak_alias (__error_at_line, error_at_line)
+strong_alias(__error,error)
+strong_alias(__error_at_line,error_at_line)
diff --git a/libc/misc/intl/intl.c b/libc/misc/intl/intl.c
index fa3e407bd..c807a4d88 100644
--- a/libc/misc/intl/intl.c
+++ b/libc/misc/intl/intl.c
@@ -16,7 +16,7 @@
  */
 
 /*
- *  Supply some weaks for use by strerror*(), etc.
+ *  Supply some strongs for use by strerror*(), etc.
  *
  *  Aug 30, 2003
  *  Add some hidden names to support locale-enabled libstd++.
@@ -40,7 +40,7 @@ char *__uClibc_dgettext(const char *domainname,
 	return (char *) msgid;
 }
 
-weak_alias(__uClibc_dgettext, __dgettext)
+strong_alias(__uClibc_dgettext, __dgettext)
 
 #endif
 /**********************************************************************/
@@ -52,7 +52,7 @@ char *__uClibc_dcgettext(const char *domainname,
 	return (char *) msgid;
 }
 
-weak_alias(__uClibc_dcgettext, __dcgettext)
+strong_alias(__uClibc_dcgettext, __dcgettext)
 
 #endif
 /**********************************************************************/
@@ -69,7 +69,7 @@ char *__uClibc_textdomain(const char *domainname)
 	return (char *) default_str;
 }
 
-weak_alias(__uClibc_textdomain, __textdomain)
+strong_alias(__uClibc_textdomain, __textdomain)
 
 #endif
 /**********************************************************************/
@@ -95,7 +95,7 @@ char *__uClibc_bindtextdomain(const char *domainname, const char *dirname)
 	return (char *) dir;
 }
 
-weak_alias(__uClibc_bindtextdomain, __bindtextdomain)
+strong_alias(__uClibc_bindtextdomain, __bindtextdomain)
 
 #endif
 /**********************************************************************/
diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c
index 848097c26..9da0562ff 100644
--- a/libc/misc/regex/regcomp.c
+++ b/libc/misc/regex/regcomp.c
@@ -233,7 +233,7 @@ re_compile_pattern (pattern, length, bufp)
   return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_compile_pattern, re_compile_pattern)
+strong_alias(__re_compile_pattern, re_compile_pattern)
 #endif
 
 /* Set by `re_set_syntax' to the current regexp syntax to recognize.  Can
@@ -261,7 +261,7 @@ re_set_syntax (syntax)
   return ret;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_set_syntax, re_set_syntax)
+strong_alias(__re_set_syntax, re_set_syntax)
 #endif
 
 int
@@ -283,7 +283,7 @@ re_compile_fastmap (bufp)
   return 0;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_compile_fastmap, re_compile_fastmap)
+strong_alias(__re_compile_fastmap, re_compile_fastmap)
 #endif
 
 static inline void
@@ -499,7 +499,7 @@ regcomp (preg, pattern, cflags)
   return (int) ret;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__regcomp, regcomp)
+strong_alias(__regcomp, regcomp)
 #endif
 
 /* Returns a message corresponding to an error code, ERRCODE, returned
@@ -546,7 +546,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
   return msg_size;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__regerror, regerror)
+strong_alias(__regerror, regerror)
 #endif
 
 
@@ -630,7 +630,7 @@ regfree (preg)
   preg->translate = NULL;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__regfree, regfree)
+strong_alias(__regfree, regfree)
 #endif
 
 /* Entry points compatible with 4.2 BSD regex library.  We don't define
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index b64014e98..85a1b8e6f 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -1390,7 +1390,7 @@ re_set_syntax (syntax)
   return ret;
 }
 # if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_set_syntax, re_set_syntax)
+strong_alias(__re_set_syntax, re_set_syntax)
 # endif
 
 /* This table gives an error message for each of the error codes listed
@@ -5010,7 +5010,7 @@ re_compile_fastmap (bufp)
     return byte_re_compile_fastmap(bufp);
 } /* re_compile_fastmap */
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_compile_fastmap, re_compile_fastmap)
+strong_alias(__re_compile_fastmap, re_compile_fastmap)
 #endif
 
 
@@ -5049,7 +5049,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends)
     }
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_set_registers, re_set_registers)
+strong_alias(__re_set_registers, re_set_registers)
 #endif
 
 /* Searching routines.  */
@@ -5068,7 +5068,7 @@ re_search (bufp, string, size, startpos, range, regs)
 		      regs, size);
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_search, re_search)
+strong_alias(__re_search, re_search)
 #endif
 
 
@@ -5113,7 +5113,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
 			     range, regs, stop);
 } /* re_search_2 */
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_search_2, re_search_2)
+strong_alias(__re_search_2, re_search_2)
 #endif
 
 #endif /* not INSIDE_RECURSION */
@@ -5572,7 +5572,7 @@ re_match (bufp, string, size, pos, regs)
   return result;
 }
 # if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_match, re_match)
+strong_alias(__re_match, re_match)
 # endif
 #endif /* not emacs */
 
@@ -5633,7 +5633,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
   return result;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_match_2, re_match_2)
+strong_alias(__re_match_2, re_match_2)
 #endif
 
 #endif /* not INSIDE_RECURSION */
@@ -7972,7 +7972,7 @@ re_compile_pattern (pattern, length, bufp)
   return gettext (re_error_msgid + re_error_msgid_idx[(int) ret]);
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_compile_pattern, re_compile_pattern)
+strong_alias(__re_compile_pattern, re_compile_pattern)
 #endif
 
 /* Entry points compatible with 4.2 BSD regex library.  We don't define
@@ -8168,7 +8168,7 @@ regcomp (preg, pattern, cflags)
   return (int) ret;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__regcomp, regcomp)
+strong_alias(__regcomp, regcomp)
 #endif
 
 
@@ -8246,7 +8246,7 @@ regexec (preg, string, nmatch, pmatch, eflags)
   return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__regexec, regexec)
+strong_alias(__regexec, regexec)
 #endif
 
 
@@ -8294,7 +8294,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
   return msg_size;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__regerror, regerror)
+strong_alias(__regerror, regerror)
 #endif
 
 
@@ -8321,7 +8321,7 @@ regfree (preg)
   preg->translate = NULL;
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__regfree, regfree)
+strong_alias(__regfree, regfree)
 #endif
 
 #endif /* not emacs  */
diff --git a/libc/misc/regex/regexec.c b/libc/misc/regex/regexec.c
index e8e2946b4..c56fb9d4a 100644
--- a/libc/misc/regex/regexec.c
+++ b/libc/misc/regex/regexec.c
@@ -275,7 +275,7 @@ __compat_regexec (const regex_t *__restrict preg,
 compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
 # endif
 #elif __UCLIBC__
-weak_alias(__regexec,regexec)
+strong_alias(__regexec,regexec)
 #endif
 
 /* Entry points for GNU code.  */
@@ -317,7 +317,7 @@ re_match (bufp, string, length, start, regs)
   return re_search_stub (bufp, string, length, start, 0, length, regs, 1);
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_match, re_match)
+strong_alias(__re_match, re_match)
 #endif
 
 int
@@ -330,7 +330,7 @@ re_search (bufp, string, length, start, range, regs)
   return re_search_stub (bufp, string, length, start, range, length, regs, 0);
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_search, re_search)
+strong_alias(__re_search, re_search)
 #endif
 
 int
@@ -344,7 +344,7 @@ re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop)
 			   start, 0, regs, stop, 1);
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_match_2, re_match_2)
+strong_alias(__re_match_2, re_match_2)
 #endif
 
 int
@@ -358,7 +358,7 @@ re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop)
 			   start, range, regs, stop, 0);
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_search_2, re_search_2)
+strong_alias(__re_search_2, re_search_2)
 #endif
 
 static int
@@ -593,7 +593,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends)
     }
 }
 #if defined _LIBC || defined __UCLIBC__
-weak_alias (__re_set_registers, re_set_registers)
+strong_alias(__re_set_registers, re_set_registers)
 #endif
 
 /* Entry points compatible with 4.2 BSD regex library.  We don't define
diff --git a/libc/misc/search/hsearch.c b/libc/misc/search/hsearch.c
index b369408cb..3370545fd 100644
--- a/libc/misc/search/hsearch.c
+++ b/libc/misc/search/hsearch.c
@@ -53,7 +53,6 @@ void hdestroy (void)
 {
   hdestroy_r (&htab);
 }
-/* weak_alias (__hdestroy, hdestroy) */
 
 /* Make sure the table is freed if we want to free everything before
    exiting.  */
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 24eca9e43..ea28e1a4f 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -756,7 +756,7 @@ time_t mktime(struct tm *timeptr)
 
 /* Another name for `mktime'.  */
 /* time_t timelocal(struct tm *tp) */
-weak_alias(mktime,timelocal)
+strong_alias(mktime,timelocal)
 
 #endif
 /**********************************************************************/
diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
index b654a8fb1..f92750c5d 100644
--- a/libc/sysdeps/linux/common/lstat.c
+++ b/libc/sysdeps/linux/common/lstat.c
@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-/* need to hide the 64bit prototype or the weak_alias()
+/* need to hide the 64bit prototype or the strong_alias()
  * will fail when __NR_lstat64 doesnt exist */
 #define lstat64 __hidelstat64
 
diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
index aeb9f16db..cc5e8fdb5 100644
--- a/libc/sysdeps/linux/common/stat.c
+++ b/libc/sysdeps/linux/common/stat.c
@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-/* need to hide the 64bit prototype or the weak_alias()
+/* need to hide the 64bit prototype or the strong_alias()
  * will fail when __NR_stat64 doesnt exist */
 #define stat64 __hidestat64
 
diff --git a/libc/termios/tcdrain.c b/libc/termios/tcdrain.c
index 62bbd9179..e1579060d 100644
--- a/libc/termios/tcdrain.c
+++ b/libc/termios/tcdrain.c
@@ -27,4 +27,4 @@ int __libc_tcdrain (int fd)
 {
       return ioctl(fd, TCSBRK, 1);
 }
-weak_alias (__libc_tcdrain, tcdrain)
+strong_alias(__libc_tcdrain,tcdrain)
-- 
cgit v1.2.3