* include/search.h: Use libc_hidden_proto for hsearch_r, lfind.

	* misc/hsearch_r.c: Add libc_hidden_def.
	* misc/lsearch.c: Likewise.

	* include/ttyent.h: Use libc_hidden_proto for getttyent, setttyent,
	endttyent.
	* misc/getttyent.c: Add libc_hidden_def.

	* include/mcheck.h: Use libc_hidden_proto for mcheck.
	* malloc/mcheck.c: Add libc_hidden_def.

	* include/envz.h: Use libc_hidden_proto for envz_entry, enz_remove.
	* include/argz.h: Use libc_hidden_proto for argz_delete.
	* string/argz-delete.c: Add libc_hidden_def.
	* string/envz.c: Likewise.  Use <envz.h>, not "envz.h".

	* sysdeps/unix/sysv/linux/x86_64/clone.S (thread_start): Use
	HIDDEN_JUMPTARGET for _exit.
	* sysdeps/unix/sysv/linux/m68k/clone.S (thread_start): Likewise.
	* sysdeps/unix/sysv/linux/i386/clone.S (thread_start): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/clone.S: Likewise.
	* sysdeps/unix/_exit.S (_exit): Add libc_hidden_def.

	* include/libc-symbols.h: Fix [__ASSEMBLY__] -> [__ASSEMBLER__].
	[__ASSEMBLER__] (hidden_weak): Define using hidden_def, or to empty.
	[__ASSEMBLER__] (HIDDEN_JUMPTARGET): New macro.
	* sysdeps/unix/sysv/linux/i386/makecontext.S: Use it for exit.

	* include/stdlib.h: Use libc_hidden_proto for abort,
	__strtof_internal, __strtod_internal, __strtold_internal,
	__strtol_internal, __strtoll_internal, __strtoul_internal,
	__strtoull_internal. __strtof_l_internal, __strtod_l_internal,
	__strtold_l_internal, __strtol_l_internal, __strtoll_l_internal,
	__strtoul_l_internal, __strtoull_l_internal.
	* include/wchar.h: Use libc_hidden_proto for __wcstof_internal,
	__wcstod_internal, __wcstold_internal, __wcstol_internal,
	__wcstoll_internal, __wcstoul_internal, ____wcstof_l_internal,
	____wcstod_l_internal, ____wcstold_l_internal, ____wcstol_l_internal,
	____wcstoll_l_internal, ____wcstoul_l_internal, __wcscasecmp_l,
	__wcsncasecmp_l.
	* sysdeps/generic/abort.c: Add libc_hidden_def.
	* stdlib/strtod.c: Likewise.
	* sysdeps/generic/strtol.c: Likewise.
	* sysdeps/wordsize-64/strtol.c: Likewise.
	* sysdeps/wordsize-64/wcstol.c: Likewise.
	* sysdeps/wordsize-64/wcstol_l.c: Likewise.

15 files changed, 120 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f4a51bdb5d..e69a58930c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,52 @@
 2002-08-03  Roland McGrath  <roland@redhat.com>
 
+	* include/search.h: Use libc_hidden_proto for hsearch_r, lfind.
+	* misc/hsearch_r.c: Add libc_hidden_def.
+	* misc/lsearch.c: Likewise.
+
+	* include/ttyent.h: Use libc_hidden_proto for getttyent, setttyent,
+	endttyent.
+	* misc/getttyent.c: Add libc_hidden_def.
+
+	* include/mcheck.h: Use libc_hidden_proto for mcheck.
+	* malloc/mcheck.c: Add libc_hidden_def.
+
+	* include/envz.h: Use libc_hidden_proto for envz_entry, enz_remove.
+	* include/argz.h: Use libc_hidden_proto for argz_delete.
+	* string/argz-delete.c: Add libc_hidden_def.
+	* string/envz.c: Likewise.  Use <envz.h>, not "envz.h".
+
+	* sysdeps/unix/sysv/linux/x86_64/clone.S (thread_start): Use
+	HIDDEN_JUMPTARGET for _exit.
+	* sysdeps/unix/sysv/linux/m68k/clone.S (thread_start): Likewise.
+	* sysdeps/unix/sysv/linux/i386/clone.S (thread_start): Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/clone.S: Likewise.
+	* sysdeps/unix/_exit.S (_exit): Add libc_hidden_def.
+
+	* include/libc-symbols.h: Fix [__ASSEMBLY__] -> [__ASSEMBLER__].
+	[__ASSEMBLER__] (hidden_weak): Define using hidden_def, or to empty.
+	[__ASSEMBLER__] (HIDDEN_JUMPTARGET): New macro.
+	* sysdeps/unix/sysv/linux/i386/makecontext.S: Use it for exit.
+
+	* include/stdlib.h: Use libc_hidden_proto for abort,
+	__strtof_internal, __strtod_internal, __strtold_internal,
+	__strtol_internal, __strtoll_internal, __strtoul_internal,
+	__strtoull_internal. __strtof_l_internal, __strtod_l_internal,
+	__strtold_l_internal, __strtol_l_internal, __strtoll_l_internal,
+	__strtoul_l_internal, __strtoull_l_internal.
+	* include/wchar.h: Use libc_hidden_proto for __wcstof_internal,
+	__wcstod_internal, __wcstold_internal, __wcstol_internal,
+	__wcstoll_internal, __wcstoul_internal, ____wcstof_l_internal,
+	____wcstod_l_internal, ____wcstold_l_internal, ____wcstol_l_internal,
+	____wcstoll_l_internal, ____wcstoul_l_internal, __wcscasecmp_l,
+	__wcsncasecmp_l.
+	* sysdeps/generic/abort.c: Add libc_hidden_def.
+	* stdlib/strtod.c: Likewise.
+	* sysdeps/generic/strtol.c: Likewise.
+	* sysdeps/wordsize-64/strtol.c: Likewise.
+	* sysdeps/wordsize-64/wcstol.c: Likewise.
+	* sysdeps/wordsize-64/wcstol_l.c: Likewise.
+
 	* include/stdlib.h: Use libc_hidden_proto for qsort.
 	* stdlib/msort.c: Add libc_hidden_def.
 
diff --git a/include/mcheck.h b/include/mcheck.h
index 90a48d5f9a..aa91d87715 100644
--- a/include/mcheck.h
+++ b/include/mcheck.h
@@ -1 +1,7 @@
+#ifndef _MCHECK_H
+
 #include <malloc/mcheck.h>
+
+libc_hidden_proto (mcheck)
+
+#endif
diff --git a/include/search.h b/include/search.h
index 14d913a63c..60bb59a39b 100644
--- a/include/search.h
+++ b/include/search.h
@@ -1,6 +1,9 @@
 #ifndef _SEARCH_H
 #include <misc/search.h>
 
+libc_hidden_proto (hsearch_r)
+libc_hidden_proto (lfind)
+
 /* Now define the internal interfaces.  */
 extern void __hdestroy (void);
 extern void *__tsearch (__const void *__key, void **__rootp,
diff --git a/include/stdlib.h b/include/stdlib.h
index b699010908..c681aecf65 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -10,10 +10,18 @@
 #ifndef __Need_M_And_C
 
 libc_hidden_proto (exit)
+libc_hidden_proto (abort)
 libc_hidden_proto (getenv)
 libc_hidden_proto (bsearch)
 libc_hidden_proto (qsort)
 libc_hidden_proto (__secure_getenv)
+libc_hidden_proto (__strtof_internal)
+libc_hidden_proto (__strtod_internal)
+libc_hidden_proto (__strtold_internal)
+libc_hidden_proto (__strtol_internal)
+libc_hidden_proto (__strtoll_internal)
+libc_hidden_proto (__strtoul_internal)
+libc_hidden_proto (__strtoull_internal)
 
 extern long int __random (void);
 extern void __srandom (unsigned int __seed);
@@ -112,6 +120,14 @@ extern unsigned long long int ____strtoull_l_internal (__const char *
 						       __locale_t __loc)
      __THROW;
 
+libc_hidden_proto (____strtof_l_internal)
+libc_hidden_proto (____strtod_l_internal)
+libc_hidden_proto (____strtold_l_internal)
+libc_hidden_proto (____strtol_l_internal)
+libc_hidden_proto (____strtoll_l_internal)
+libc_hidden_proto (____strtoul_l_internal)
+libc_hidden_proto (____strtoull_l_internal)
+
 extern __inline double
 __strtod_l (__const char *__restrict __nptr, char **__restrict __endptr,
 	    __locale_t __loc) __THROW
diff --git a/include/ttyent.h b/include/ttyent.h
index ba790e3542..e510df8260 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -1 +1,8 @@
-#include <misc/ttyent.h>
+#ifndef	_TTYENT_H
+# include <misc/ttyent.h>
+
+libc_hidden_proto (getttyent)
+libc_hidden_proto (setttyent)
+libc_hidden_proto (endttyent)
+
+#endif
diff --git a/include/wchar.h b/include/wchar.h
index 461b7400b1..8395392de6 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -2,6 +2,19 @@
 #include <wcsmbs/wchar.h>
 
 # ifdef _WCHAR_H
+
+libc_hidden_proto (__wcstof_internal)
+libc_hidden_proto (__wcstod_internal)
+libc_hidden_proto (__wcstold_internal)
+libc_hidden_proto (__wcstol_internal)
+libc_hidden_proto (__wcstoll_internal)
+libc_hidden_proto (__wcstoul_internal)
+libc_hidden_proto (__wcstoull_internal)
+
+libc_hidden_proto (__wcscasecmp_l)
+libc_hidden_proto (__wcsncasecmp_l)
+
+
 /* Now define the internal interfaces.  */
 extern int __wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2)
      __attribute_pure__;
diff --git a/malloc/mcheck.c b/malloc/mcheck.c
index a9993c8d9d..9d9200d45d 100644
--- a/malloc/mcheck.c
+++ b/malloc/mcheck.c
@@ -1,5 +1,5 @@
 /* Standard debugging hooks for `malloc'.
-   Copyright (C) 1990-1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997,99,2000,01,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written May 1989 by Mike Haertel.
 
@@ -338,6 +338,9 @@ mcheck (func)
 
   return mcheck_used ? 0 : -1;
 }
+#ifdef _LIBC
+libc_hidden_def (mcheck)
+#endif
 
 int
 mcheck_pedantic (func)
diff --git a/misc/getttyent.c b/misc/getttyent.c
index dfc57d5ce8..1bc82e6938 100644
--- a/misc/getttyent.c
+++ b/misc/getttyent.c
@@ -133,6 +133,7 @@ getttyent()
 		*p = '\0';
 	return (&tty);
 }
+libc_hidden_def (getttyent)
 
 #define	QUOTED	1
 
@@ -198,6 +199,7 @@ setttyent()
 	}
 	return (0);
 }
+libc_hidden_def (setttyent)
 
 int
 endttyent()
@@ -211,3 +213,4 @@ endttyent()
 	}
 	return (1);
 }
+libc_hidden_def (endttyent)
diff --git a/misc/hsearch_r.c b/misc/hsearch_r.c
index a7629a5da4..d7c604cc56 100644
--- a/misc/hsearch_r.c
+++ b/misc/hsearch_r.c
@@ -224,3 +224,4 @@ hsearch_r (item, action, retval, htab)
   *retval = NULL;
   return 0;
 }
+libc_hidden_def (hsearch_r)
diff --git a/misc/lsearch.c b/misc/lsearch.c
index 3d104617ca..057ff396e1 100644
--- a/misc/lsearch.c
+++ b/misc/lsearch.c
@@ -1,5 +1,5 @@
 /* Linear search functions.
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996,97,98,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -56,3 +56,4 @@ lfind (const void *key, const void *base, size_t *nmemb, size_t size,
 
   return cnt < *nmemb ? (void *) result : NULL;
 }
+libc_hidden_def (lfind)
diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index db0938404c..7509a9d3f3 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -1,6 +1,6 @@
 /* Read decimal floating point numbers.
    This file is part of the GNU C Library.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,2000,01,02 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -1560,6 +1560,10 @@ INTERNAL (STRTOF) (nptr, endptr, group LOCALE_PARAM)
 
   /* NOTREACHED */
 }
+#if defined _LIBC \
+    && !(defined USE_IN_EXTENDED_LOCALE_MODEL && defined USE_WIDE_CHAR)
+libc_hidden_def (INTERNAL (STRTOF))
+#endif
 
 /* External user entry point.  */
 
diff --git a/sysdeps/generic/abort.c b/sysdeps/generic/abort.c
index 0f638ddc0c..00788f22c7 100644
--- a/sysdeps/generic/abort.c
+++ b/sysdeps/generic/abort.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 93, 95, 96, 97, 98, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991,93,95,96,97,98,2001,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -137,3 +137,4 @@ abort (void)
     /* Try for ever and ever.  */
     ABORT_INSTRUCTION;
 }
+libc_hidden_def (abort)
diff --git a/sysdeps/generic/strtol.c b/sysdeps/generic/strtol.c
index d2e09c8404..7e174d488b 100644
--- a/sysdeps/generic/strtol.c
+++ b/sysdeps/generic/strtol.c
@@ -1,5 +1,6 @@
 /* Convert string representation of a number into an integer value.
-   Copyright (C) 1991,92,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc.
+   Copyright (C) 1991,92,94,95,96,97,98,99,2000,01,02
+   	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -532,6 +533,10 @@ noconv:
 
   return 0L;
 }
+#if defined _LIBC \
+    && !(defined USE_IN_EXTENDED_LOCALE_MODEL && defined USE_WIDE_CHAR)
+libc_hidden_def (INTERNAL (strtol))
+#endif
 
 /* External user entry point.  */
 
diff --git a/sysdeps/wordsize-64/strtol.c b/sysdeps/wordsize-64/strtol.c
index 4ffbca6bdc..e6370150a4 100644
--- a/sysdeps/wordsize-64/strtol.c
+++ b/sysdeps/wordsize-64/strtol.c
@@ -9,5 +9,6 @@
 #undef strtoll
 #undef strtoq
 strong_alias (__strtol_internal, __strtoll_internal)
+libc_hidden_def (__strtoll_internal)
 weak_alias (strtol, strtoll)
 weak_alias (strtol, strtoq)
diff --git a/sysdeps/wordsize-64/wcstol.c b/sysdeps/wordsize-64/wcstol.c
index fcfbcf36fa..0aaa5f6ca9 100644
--- a/sysdeps/wordsize-64/wcstol.c
+++ b/sysdeps/wordsize-64/wcstol.c
@@ -9,5 +9,8 @@
 #undef wcstoll
 #undef wcstoq
 strong_alias (__wcstol_internal, __wcstoll_internal)
+libc_hidden_def (__wcstoll_internal)
 weak_alias (wcstol, wcstoll)
+libc_hidden_weak (wcstoll)
 weak_alias (wcstol, wcstoq)
+libc_hidden_weak (wcstoq)