Update.

2000-12-05  Andreas Jaeger  <aj@suse.de>

	* elf/dl-misc.c (_dl_sysdep_read_whole_file): Mark as
	internal_function.
	* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Likewise.
	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start_cleanup): Likewise.

	* sysdeps/generic/dl-cache.c: Remove declaration of
	_dl_sysdep_read_whole_file.

	* elf/dl-load.c (_dl_map_object): Remove declaration of
	_dl_load_cache_lookup.

	* sysdeps/generic/ldsodefs.h: Add declarations of
	_dl_load_cache_lookup, _dl_unload_cache,
	_dl_sysdep_read_whole_file, _dl_sysdep_start and
	_dl_sysdep_start_cleanup.

	* elf/rtld.c: Remove prototypes that are defined in ldsodefs.h
	now.

	* elf/dl-misc.c: Include <ldsodefs.h> to get prototypes.
	* sysdeps/generic/dl-environ.c: Likewise.

	* stdio-common/printf_fp.c: Include <gmp.h> instead of
	<stdlib/gmp.h>.
	* math/atest-exp.c: Likewise.
	* math/atest-exp2.c: Likewise.
	* math/atest-sincos.c: Likewise.
	* stdio-common/_itoa.c: Likewise.
	* stdio-common/_itowa.c: Likewise.

	* include/gmp.h: New file with internal prototypes.

	* sysdeps/generic/longjmp.c: Move _longjmp_unwind declaration from
	here to...
	* include/setjmp.h: ...here.

	* locale/Makefile (routines): Remove codeset_name since it's not
	needed anywhere.

	* locale/codeset_name.c: Removed.

3 files changed, 2 insertions, 20 deletions

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 45f38f3c44..600f5f9fe9 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1586,7 +1586,6 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 	{
 	  /* Check the list of libraries in the file /etc/ld.so.cache,
 	     for compatibility with Linux's ldconfig program.  */
-	  extern const char *_dl_load_cache_lookup (const char *name);
 	  const char *cached = _dl_load_cache_lookup (name);
 
 #ifdef SHARED
diff --git a/elf/dl-misc.c b/elf/dl-misc.c
index 4a811a0356..5629c2aa82 100644
--- a/elf/dl-misc.c
+++ b/elf/dl-misc.c
@@ -19,6 +19,7 @@
 
 #include <assert.h>
 #include <fcntl.h>
+#include <ldsodefs.h>
 #include <link.h>
 #include <stdarg.h>
 #include <string.h>
@@ -42,6 +43,7 @@ _dl_sysdep_open_zero_fill (void)
    protections.  *SIZEP gets the size of the file.  */
 
 void *
+internal_function
 _dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)
 {
   void *result;
diff --git a/elf/rtld.c b/elf/rtld.c
index c44506acc4..5c794d9a75 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -34,25 +34,6 @@
 
 #include <assert.h>
 
-/* System-specific function to do initial startup for the dynamic linker.
-   After this, file access calls and getenv must work.  This is responsible
-   for setting __libc_enable_secure if we need to be secure (e.g. setuid),
-   and for setting _dl_argc and _dl_argv, and then calling _dl_main.  */
-extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
-				    void (*dl_main) (const ElfW(Phdr) *phdr,
-						     ElfW(Half) phent,
-						     ElfW(Addr) *user_entry));
-extern void _dl_sysdep_start_cleanup (void);
-
-/* This function is used to unload the cache file if necessary.  */
-extern void _dl_unload_cache (void);
-
-/* System-dependent function to read a file's whole contents
-   in the most convenient manner available.  */
-extern void *_dl_sysdep_read_whole_file (const char *filename,
-					 size_t *filesize_ptr,
-					 int mmap_prot);
-
 /* Helper function to handle errors while resolving symbols.  */
 static void print_unresolved (int errcode, const char *objname,
 			      const char *errsting);