Update.

1998-04-08 20:06  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv_conf.c (__gconv_read_conf): Use __realpath not realpath.
	* iconv/gconv_db.c: Use __ protected regex functions.
	* iconv/gconv_simple.c: Use __mbsinit not mbsinit.
	* posix/getopt_init.c: Use __getpid not getpid.
	* posix/regex.c: Rename all global functions to start with __ and
	make old names weak aliases.
	* posix/regex.h: Adopt prototypes for this.
	* stdlib/canonicalize.c: Define __realpath, make canonicalize_file_name
	a weak alias and use __getcwd instead of getcwd.
	* stdlib/stdlib.h: Declare __realpath and __canonicalize_file_name.
	* stdlib/strtod.c: Use __btowc instead of btowc.
	* stdlib/strtol.c: Likewise.
	* sysdeps/libm-ieee754/s_matherr.c: Weaken definition of matherr.
	* sysdeps/unix/sysv/linux/errlist.c: Make sure definitions of sys_nerr
	and sys_errlist are weak.
	* wcsmbs/btowc.c: Define function as __btowc and make btowc weak alias.
	* wcsmbs/mbrtowc.c: Use __mbsinit not mbsinit.
	* wcsmbs/mbsnrtowcs.c: Likewise.
	* wcsmbs/mbsrtowcs.c: Likewise.
	* wcsmbs/wcsnrtombs.c: Likewise.
	* wcsmbs/wcsrtombs.c: Likewise.
	* wcsmbs/mbsinit.c: Define function as __mbsinit and make mbsinit
	weak alias.
	* wcsmbs/wchar.h: Declare __btowc and __mbsinit.
	* wctype/wctype.c: Define function as __wctype and make wctype
	weak alias.
	* wctype/wctype.h: Declare __wctype.

2 files changed, 11 insertions, 6 deletions

diff --git a/sysdeps/libm-ieee754/s_matherr.c b/sysdeps/libm-ieee754/s_matherr.c
index 94103bc464..1ad3eb3334 100644
--- a/sysdeps/libm-ieee754/s_matherr.c
+++ b/sysdeps/libm-ieee754/s_matherr.c
@@ -5,7 +5,7 @@
  *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
+ * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
  */
@@ -18,9 +18,13 @@ static char rcsid[] = "$NetBSD: s_matherr.c,v 1.6 1995/05/10 20:47:53 jtc Exp $"
 #include "math_private.h"
 
 #ifdef __STDC__
-	int __matherr(struct exception *x)
+	int
+	weak_function
+	 __matherr(struct exception *x)
 #else
-	int __matherr(x)
+	int
+	weak_function
+	__matherr(x)
 	struct exception *x;
 #endif
 {
diff --git a/sysdeps/unix/sysv/linux/errlist.c b/sysdeps/unix/sysv/linux/errlist.c
index af28a45954..4d799b1928 100644
--- a/sysdeps/unix/sysv/linux/errlist.c
+++ b/sysdeps/unix/sysv/linux/errlist.c
@@ -38,16 +38,17 @@ extern const char *const *__old_sys_errlist;
 const int __old_sys_nerr = OLD_ERRLIST_SIZE;
 
 strong_alias (__old_sys_nerr, _old_sys_nerr);
+weak_alias (__old_sys_nerr, _old_sys_nerr)
 symbol_version (__old_sys_nerr, _sys_nerr, GLIBC_2.0);
 symbol_version (_old_sys_nerr, sys_nerr, GLIBC_2.0);
-strong_alias (__old_sys_errlist, _old_sys_errlist);
+weak_alias (__old_sys_errlist, _old_sys_errlist);
 symbol_version (__old_sys_errlist, _sys_errlist, GLIBC_2.0);
 symbol_version (_old_sys_errlist, sys_errlist, GLIBC_2.0);
 
-strong_alias (__new_sys_nerr, _new_sys_nerr)
+weak_alias (__new_sys_nerr, _new_sys_nerr)
 default_symbol_version (__new_sys_nerr, _sys_nerr, GLIBC_2.1);
 default_symbol_version (_new_sys_nerr, sys_nerr, GLIBC_2.1);
-strong_alias (__new_sys_errlist, _new_sys_errlist)
+weak_alias (__new_sys_errlist, _new_sys_errlist)
 default_symbol_version (__new_sys_errlist, _sys_errlist, GLIBC_2.1);
 default_symbol_version (_new_sys_errlist, sys_errlist, GLIBC_2.1);