Update.

	* elf/Versions: Remove functions which are not exported anymore.
	* dlfcn/dlerror.c: Call ld.so functions through GLSO.
	* dlfcn/dlinfo.c: Likewise.
	* elf/dl-close.c: Likewise.
	* elf/dl-libc.c: Likewise.
	* elf/dl-open.c: Likewise.
	* elf/dl-sym.c: Likewise.
	* sysdeps/generic/libc-start.c: Likewise.
	* elf/dl-debug.c: Remove *_internal definition.  Don't use INTUSE for
	functions which are not exported anymore.
	* elf/dl-deps.c: Likewise.
	* elf/dl-dst.h: Likewise.
	* elf/dl-error.c: Likewise.
	* elf/dl-fini.c: Likewise.
	* elf/dl-init.c: Likewise.
	* elf/dl-load.c: Likewise.
	* elf/dl-lookup.c: Likewise.
	* elf/dl-misc.c: Likewise.
	* elf/dl-profile.c: Likewise.
	* elf/dl-profstub.c: Likewise.
	* elf/dl-reloc.c: Likewise.
	* elf/dl-runtime.c: Likewise.
	* elf/dl-version.c: Likewise.
	* elf/do-lookup.h: Likewise.
	* include/dlfcn.h: Likewise.
	* sysdeps/generic/dl-cache.c: Likewise.
	* sysdeps/generic/dl-fptr.c: Likewise.
	* sysdeps/generic/dl-origin.c: Likewise.
	* sysdeps/generic/dl-sysdep.c: Likewise.
	* sysdeps/generic/dl-tls.c: Likewise.
	* sysdeps/generic/ldsodefs.h: Likewise.
	* sysdeps/i386/dl-tls.h: Likewise.
	* sysdeps/unix/sysv/linux/dl-origin.c: Likewise.
	* elf/rtld.c: Likewise.  Export function though _rtld_global_ro.

	* generic/dl-fptr.c: Likewise.
	* mach/hurd/dl-sysdep.c: Likewise.
	* unix/sysv/linux/ia64/dl-static.c: Likewise.
	* unix/sysv/linux/ia64/getpagesize.c: Likewise.
	* unix/sysv/linux/m68k/getpagesize.c: Likewise.
	* unix/sysv/linux/sparc/sparc32/getpagesize.c: Likewise.

39 files changed, 465 insertions, 422 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e1a0cc9e5..d94b82f358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,40 @@
 2004-03-05  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/Versions: Remove functions which are not exported anymore.
+	* dlfcn/dlerror.c: Call ld.so functions through GLSO.
+	* dlfcn/dlinfo.c: Likewise.
+	* elf/dl-close.c: Likewise.
+	* elf/dl-libc.c: Likewise.
+	* elf/dl-open.c: Likewise.
+	* elf/dl-sym.c: Likewise.
+	* sysdeps/generic/libc-start.c: Likewise.
+	* elf/dl-debug.c: Remove *_internal definition.  Don't use INTUSE for
+	functions which are not exported anymore.
+	* elf/dl-deps.c: Likewise.
+	* elf/dl-dst.h: Likewise.
+	* elf/dl-error.c: Likewise.
+	* elf/dl-fini.c: Likewise.
+	* elf/dl-init.c: Likewise.
+	* elf/dl-load.c: Likewise.
+	* elf/dl-lookup.c: Likewise.
+	* elf/dl-misc.c: Likewise.
+	* elf/dl-profile.c: Likewise.
+	* elf/dl-profstub.c: Likewise.
+	* elf/dl-reloc.c: Likewise.
+	* elf/dl-runtime.c: Likewise.
+	* elf/dl-version.c: Likewise.
+	* elf/do-lookup.h: Likewise.
+	* include/dlfcn.h: Likewise.
+	* sysdeps/generic/dl-cache.c: Likewise.
+	* sysdeps/generic/dl-fptr.c: Likewise.
+	* sysdeps/generic/dl-origin.c: Likewise.
+	* sysdeps/generic/dl-sysdep.c: Likewise.
+	* sysdeps/generic/dl-tls.c: Likewise.
+	* sysdeps/generic/ldsodefs.h: Likewise.
+	* sysdeps/i386/dl-tls.h: Likewise.
+	* sysdeps/unix/sysv/linux/dl-origin.c: Likewise.
+	* elf/rtld.c: Likewise.  Export function though _rtld_global_ro.
+
 	* sysdeps/generic/ldsodefs.h (struct rtld_global): Move
 	dl_debug_fd to rtld_global_ro.
 	* elf/rtld.c: Use GLRO instead of GL for dl_debug_fd.
@@ -79,6 +114,12 @@
 	* sysdeps/ia64/dl-machine.h: Likewise.
 	* sysdeps/arm/dl-machine.h: Likewise.
 	* sysdeps/alpha/dl-machine.h: Likewise.
+	* generic/dl-fptr.c: Likewise.
+	* mach/hurd/dl-sysdep.c: Likewise.
+	* unix/sysv/linux/ia64/dl-static.c: Likewise.
+	* unix/sysv/linux/ia64/getpagesize.c: Likewise.
+	* unix/sysv/linux/m68k/getpagesize.c: Likewise.
+	* unix/sysv/linux/sparc/sparc32/getpagesize.c: Likewise.
 
 2004-03-04  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c
index f732deb868..1cde04b080 100644
--- a/dlfcn/dlerror.c
+++ b/dlfcn/dlerror.c
@@ -1,6 +1,5 @@
 /* Return error detail for failing <dlfcn.h> functions.
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003
-	Free Software Foundation, Inc.
+   Copyright (C) 1995-2000,2002,2003,2004 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
@@ -24,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <bits/libc-lock.h>
+#include <ldsodefs.h>
 
 /* Type for storing results of dynamic loading actions.  */
 struct dl_action_result
@@ -141,8 +141,8 @@ _dlerror_run (void (*operate) (void *), void *args)
       result->errstring = NULL;
     }
 
-  result->errcode = _dl_catch_error (&result->objname, &result->errstring,
-				     operate, args);
+  result->errcode = GLRO(dl_catch_error) (&result->objname, &result->errstring,
+					  operate, args);
 
   /* If no error we mark that no error string is available.  */
   result->returned = result->errstring == NULL;
diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c
index 37177f1f1b..7e7f1c759b 100644
--- a/dlfcn/dlinfo.c
+++ b/dlfcn/dlinfo.c
@@ -1,5 +1,5 @@
 /* dlinfo -- Get information from the dynamic linker.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 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
@@ -48,7 +48,7 @@ dlinfo_doit (void *argsblock)
 	  break;
 
       if (l == NULL)
-	_dl_signal_error (0, NULL, NULL, N_("\
+	GLRO(dl_signal_error) (0, NULL, NULL, N_("\
 RTLD_SELF used in code not dynamically loaded"));
     }
 #endif
@@ -58,7 +58,7 @@ RTLD_SELF used in code not dynamically loaded"));
     case RTLD_DI_LMID:
     case RTLD_DI_CONFIGADDR:
     default:
-      _dl_signal_error (0, NULL, NULL, N_("unsupported dlinfo request"));
+      GLRO(dl_signal_error) (0, NULL, NULL, N_("unsupported dlinfo request"));
       break;
 
     case RTLD_DI_LINKMAP:
diff --git a/elf/Versions b/elf/Versions
index 709a657775..3797cc4eee 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -46,17 +46,13 @@ ld {
   GLIBC_PRIVATE {
     # Those are in the dynamic linker, but used by libc.so.
     __libc_enable_secure;
-    _dl_argv; _dl_catch_error; _dl_check_map_versions;
-    _dl_debug_printf; _dl_debug_state; _dl_dst_count;
-    _dl_dst_substitute; _dl_init; _dl_lookup_symbol; _dl_lookup_symbol_skip;
-    _dl_lookup_versioned_symbol; _dl_lookup_versioned_symbol_skip;
-    _dl_map_object; _dl_map_object_deps; _dl_out_of_memory;
-    _dl_relocate_object; _dl_signal_error; _dl_start_profile; _dl_starting_up;
-    _dl_unload_cache;
+    _dl_argv;
+    _dl_out_of_memory;
+    _dl_starting_up;
     _rtld_global; _rtld_global_ro;
-    _dl_tls_symaddr; _dl_allocate_tls; _dl_deallocate_tls;
+    _dl_allocate_tls; _dl_deallocate_tls;
     _dl_get_tls_static_info; _dl_allocate_tls_init;
-    _dl_get_origin; _dl_tls_setup; _dl_rtld_di_serinfo;
+    _dl_tls_setup; _dl_rtld_di_serinfo;
     _dl_make_stack_executable;
   }
 }
diff --git a/elf/dl-close.c b/elf/dl-close.c
index c63dabbfe1..62c257ce4f 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -125,7 +125,7 @@ _dl_close (void *_map)
     return;
 
   if (__builtin_expect (map->l_opencount, 1) == 0)
-    _dl_signal_error (0, map->l_name, NULL, N_("shared object not open"));
+    GLRO(dl_signal_error) (0, map->l_name, NULL, N_("shared object not open"));
 
   /* Acquire the lock.  */
   __rtld_lock_lock_recursive (GL(dl_load_lock));
@@ -135,8 +135,8 @@ _dl_close (void *_map)
     {
       /* There are still references to this object.  Do nothing more.  */
       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-	_dl_debug_printf ("\nclosing file=%s; opencount == %u\n",
-			  map->l_name, map->l_opencount);
+	GLRO(dl_debug_printf) ("\nclosing file=%s; opencount == %u\n",
+				map->l_name, map->l_opencount);
 
       /* Decrement the object's reference counter, not the dependencies'.  */
       --map->l_opencount;
@@ -225,7 +225,7 @@ _dl_close (void *_map)
 	{
 	  /* When debugging print a message first.  */
 	  if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0))
-	    _dl_debug_printf ("\ncalling fini: %s\n\n", imap->l_name);
+	    GLRO(dl_debug_printf) ("\ncalling fini: %s\n\n", imap->l_name);
 
 	  /* Call its termination function.  Do not do it for
 	     half-cooked objects.  */
@@ -318,7 +318,7 @@ _dl_close (void *_map)
 
   /* Notify the debugger we are about to remove some loaded objects.  */
   _r_debug.r_state = RT_DELETE;
-  _dl_debug_state ();
+  GLRO(dl_debug_state) ();
 
 #ifdef USE_TLS
   size_t tls_free_start;
@@ -537,7 +537,7 @@ _dl_close (void *_map)
 
   /* Notify the debugger those objects are finalized and gone.  */
   _r_debug.r_state = RT_CONSISTENT;
-  _dl_debug_state ();
+  GLRO(dl_debug_state) ();
 
   /* Now we can perhaps also remove the modules for which we had
      dependencies because of symbol lookup.  */
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
index e072b685f2..2feb0c5b96 100644
--- a/elf/dl-debug.c
+++ b/elf/dl-debug.c
@@ -1,5 +1,5 @@
 /* Communicate dynamic linker state to the debugger at runtime.
-   Copyright (C) 1996, 1998, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 2000, 2002, 2004 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
@@ -40,7 +40,7 @@ _dl_debug_initialize (ElfW(Addr) ldbase)
       _r_debug.r_version = 1	/* R_DEBUG_VERSION XXX */;
       _r_debug.r_ldbase = ldbase;
       _r_debug.r_map = GL(dl_loaded);
-      _r_debug.r_brk = (ElfW(Addr)) &INTUSE(_dl_debug_state);
+      _r_debug.r_brk = (ElfW(Addr)) &_dl_debug_state;
     }
 
   return &_r_debug;
@@ -55,4 +55,3 @@ void
 _dl_debug_state (void)
 {
 }
-INTDEF (_dl_debug_state)
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index b2e6ec612b..1c383b7b98 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -60,10 +60,10 @@ openaux (void *a)
 {
   struct openaux_args *args = (struct openaux_args *) a;
 
-  args->aux = INTUSE(_dl_map_object) (args->map, args->name, 0,
-				      (args->map->l_type == lt_executable
-				       ? lt_library : args->map->l_type),
-				      args->trace_mode, args->open_mode);
+  args->aux = _dl_map_object (args->map, args->name, 0,
+			      (args->map->l_type == lt_executable
+			       ? lt_library : args->map->l_type),
+			      args->trace_mode, args->open_mode);
 }
 
 static ptrdiff_t
@@ -108,26 +108,26 @@ struct list
 									      \
 	/* DST must not appear in SUID/SGID programs.  */		      \
 	if (INTUSE(__libc_enable_secure))				      \
-	  INTUSE(_dl_signal_error) (0, __str, NULL, N_("\
+	  _dl_signal_error (0, __str, NULL, N_("\
 DST not allowed in SUID/SGID programs"));				      \
 									      \
 	__newp = (char *) alloca (DL_DST_REQUIRED (l, __str, strlen (__str),  \
 						   __cnt));		      \
 									      \
-	__result = INTUSE(_dl_dst_substitute) (l, __str, __newp, 0);	      \
+	__result = _dl_dst_substitute (l, __str, __newp, 0);	      \
 									      \
 	if (*__result == '\0')						      \
 	  {								      \
 	    /* The replacement for the DST is not known.  We can't	      \
 	       processed.  */						      \
 	    if (fatal)							      \
-	      INTUSE(_dl_signal_error) (0, __str, NULL, N_("\
+	      _dl_signal_error (0, __str, NULL, N_("\
 empty dynamics string token substitution"));				      \
 	    else							      \
 	      {								      \
 		/* This is for DT_AUXILIARY.  */			      \
 		if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0))\
-		  INTUSE(_dl_debug_printf) (N_("\
+		  _dl_debug_printf (N_("\
 cannot load auxiliary `%s' because of empty dynamic string token "	      \
 					    "substitution\n"), __str);	      \
 		continue;						      \
@@ -241,8 +241,7 @@ _dl_map_object_deps (struct link_map *map,
 		/* Store the tag in the argument structure.  */
 		args.name = name;
 
-		err = INTUSE(_dl_catch_error) (&objname, &errstring, openaux,
-					       &args);
+		err = _dl_catch_error (&objname, &errstring, openaux, &args);
 		if (__builtin_expect (errstring != NULL, 0))
 		  {
 		    if (err)
@@ -293,16 +292,16 @@ _dl_map_object_deps (struct link_map *map,
 		    /* Say that we are about to load an auxiliary library.  */
 		    if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS,
 					  0))
-		      INTUSE(_dl_debug_printf) ("load auxiliary object=%s"
-						" requested by file=%s\n",
-						name,
-						l->l_name[0]
-						? l->l_name : rtld_progname);
+		      _dl_debug_printf ("load auxiliary object=%s"
+					" requested by file=%s\n",
+					name,
+					l->l_name[0]
+					? l->l_name : rtld_progname);
 
 		    /* We must be prepared that the addressed shared
 		       object is not available.  */
-		    err = INTUSE(_dl_catch_error) (&objname, &errstring,
-						   openaux, &args);
+		    err = _dl_catch_error (&objname, &errstring, openaux,
+					   &args);
 		    if (__builtin_expect (errstring != NULL, 0))
 		      {
 			/* We are not interested in the error message.  */
@@ -321,15 +320,15 @@ _dl_map_object_deps (struct link_map *map,
 		    /* Say that we are about to load an auxiliary library.  */
 		    if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS,
 					  0))
-		      INTUSE(_dl_debug_printf) ("load filtered object=%s"
-						" requested by file=%s\n",
-						name,
-						l->l_name[0]
-						? l->l_name : rtld_progname);
+		      _dl_debug_printf ("load filtered object=%s"
+					" requested by file=%s\n",
+					name,
+					l->l_name[0]
+					? l->l_name : rtld_progname);
 
 		    /* For filter objects the dependency must be available.  */
-		    err = INTUSE(_dl_catch_error) (&objname, &errstring,
-						   openaux, &args);
+		    err = _dl_catch_error (&objname, &errstring, openaux,
+					   &args);
 		    if (__builtin_expect (errstring != NULL, 0))
 		      {
 			if (err)
@@ -457,8 +456,8 @@ _dl_map_object_deps (struct link_map *map,
 	  l->l_initfini = (struct link_map **)
 	    malloc ((2 * nneeded + 1) * sizeof needed[0]);
 	  if (l->l_initfini == NULL)
-	    INTUSE(_dl_signal_error) (ENOMEM, map->l_name, NULL,
-				      N_("cannot allocate dependency list"));
+	    _dl_signal_error (ENOMEM, map->l_name, NULL,
+			      N_("cannot allocate dependency list"));
 	  l->l_initfini[0] = l;
 	  memcpy (&l->l_initfini[1], needed, nneeded * sizeof needed[0]);
 	  memcpy (&l->l_initfini[nneeded + 1], l->l_initfini,
@@ -490,8 +489,8 @@ _dl_map_object_deps (struct link_map *map,
     (struct link_map **) malloc ((2 * nlist + 1)
 				 * sizeof (struct link_map *));
   if (map->l_initfini == NULL)
-    INTUSE(_dl_signal_error) (ENOMEM, map->l_name, NULL,
-			      N_("cannot allocate symbol search list"));
+    _dl_signal_error (ENOMEM, map->l_name, NULL,
+		      N_("cannot allocate symbol search list"));
 
 
   map->l_searchlist.r_list = &map->l_initfini[nlist + 1];
@@ -531,7 +530,7 @@ _dl_map_object_deps (struct link_map *map,
 	      /* As current DT_AUXILIARY/DT_FILTER implementation needs to be
 		 rewritten, no need to bother with prelinking the old
 		 implementation.  */
-	      INTUSE(_dl_signal_error) (EINVAL, l->l_name, NULL, N_("\
+	      _dl_signal_error (EINVAL, l->l_name, NULL, N_("\
 Filters not supported with LD_TRACE_PRELINKING"));
 	    }
 
@@ -545,8 +544,8 @@ Filters not supported with LD_TRACE_PR