Update.

1998-03-24  Ulrich Drepper  <drepper@cygnus.com>

	* elf/ldsodesf.h: New file.
	* elf/Makefile (distribute): Add ldsodefs.h.
	* elf/link.h: Separate internal information in exter header.
	* elf/rtld.c: Include elf/ldsodefs.h not link.h.
	* elf/dl-minimal.c: Likewise.
	* sysdeps/generic/dl-sysdep.c: Likewise.
	* elf/sprof.c: Likewise.
	* elf/dlsym.c: Likewise.
	* elf/dlvsym.c: Likewise.
	* elf/dlerror.c: Likewise.
	* elf/dladdr.c: Likewise.
	* elf/dlclose.c: Likewise.
	* elf/dlopen.c: Likewise.
	* elf/dl-addr.c: Likewise.
	* elf/dl-close.c: Likewise.
	* elf/dl-debug.c: Likewise.
	* elf/dl-deps.c: 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-object.c: Likewise.
	* elf/dl-open.c: Likewise.
	* elf/dl-profile.c: Likewise.
	* elf/dl-reloc.c: Likewise.
	* elf/dl-runtime.c: Likewise.
	* elf/dl-support.c: Likewise.
	* elf/dl-symbol.c: Likewise.
	* elf/dl-version.c: Likewise.
	* sysdeps/generic/dl-cache.c: Likewise.
	* sysdeps/generic/libc-start.c: Likewise.
	* iconv/gconv_dl.c: Likewise.
	* nss/nsswitch.c: Likewise.

35 files changed, 496 insertions, 417 deletions

diff --git a/ChangeLog b/ChangeLog
index 62af96b4e9..24d300605a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+1998-03-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf/ldsodesf.h: New file.
+	* elf/Makefile (distribute): Add ldsodefs.h.
+	* elf/link.h: Separate internal information in exter header.
+	* elf/rtld.c: Include elf/ldsodefs.h not link.h.
+	* elf/dl-minimal.c: Likewise.
+	* sysdeps/generic/dl-sysdep.c: Likewise.
+	* elf/sprof.c: Likewise.
+	* elf/dlsym.c: Likewise.
+	* elf/dlvsym.c: Likewise.
+	* elf/dlerror.c: Likewise.
+	* elf/dladdr.c: Likewise.
+	* elf/dlclose.c: Likewise.
+	* elf/dlopen.c: Likewise.
+	* elf/dl-addr.c: Likewise.
+	* elf/dl-close.c: Likewise.
+	* elf/dl-debug.c: Likewise.
+	* elf/dl-deps.c: 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-object.c: Likewise.
+	* elf/dl-open.c: Likewise.
+	* elf/dl-profile.c: Likewise.
+	* elf/dl-reloc.c: Likewise.
+	* elf/dl-runtime.c: Likewise.
+	* elf/dl-support.c: Likewise.
+	* elf/dl-symbol.c: Likewise.
+	* elf/dl-version.c: Likewise.
+	* sysdeps/generic/dl-cache.c: Likewise.
+	* sysdeps/generic/libc-start.c: Likewise.
+	* iconv/gconv_dl.c: Likewise.
+	* nss/nsswitch.c: Likewise.
+
 1998-03-23 13:45  Ulrich Drepper  <drepper@cygnus.com>
 
 	* manual/nss.texi: The database is not called network but networks.
diff --git a/elf/Makefile b/elf/Makefile
index 45494de4a8..5e221ec352 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -38,7 +38,7 @@ rtld-routines	:= rtld $(dl-routines) dl-sysdep dl-minimal
 ld-map		= $(libc-map)
 distribute	= $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
 		  dl-hash.h soinit.c sofini.c ldd.sh.in ldd.bash.in eval.c \
-		  genrtldtbl.awk atomicity.h dl-procinfo.h
+		  genrtldtbl.awk atomicity.h dl-procinfo.h ldsodefs.h
 
 extra-libs	 = libdl
 extra-libs-others = $(extra-libs)
diff --git a/elf/dl-addr.c b/elf/dl-addr.c
index 4d78738e64..d085ebe21a 100644
--- a/elf/dl-addr.c
+++ b/elf/dl-addr.c
@@ -17,9 +17,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <stddef.h>
-#include <link.h>
 #include <dlfcn.h>
+#include <stddef.h>
+#include <elf/ldsodefs.h>
 
 
 int
diff --git a/elf/dl-close.c b/elf/dl-close.c
index a7824523ef..ad84f94338 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -17,13 +17,13 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
 #include <dlfcn.h>
 #include <stdlib.h>
 #include <string.h>
+#include <bits/libc-lock.h>
+#include <elf/ldsodefs.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <bits/libc-lock.h>
 
 
 /* During the program run we must not modify the global data of
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
index 38e0e38420..4c8c51a94c 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 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998 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
@@ -17,7 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
+#include <elf/ldsodefs.h>
 
 /* This structure communicates dl state to the debugger.  The debugger
    normally finds it via the DT_DEBUG entry in the dynamic section, but in
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 5dbef6cabf..2a945479f4 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -17,11 +17,12 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
-#include <errno.h>
 #include <dlfcn.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <elf/ldsodefs.h>
+
 #include <assert.h>
 
 /* Whether an shared object references one or more auxiliary objects
diff --git a/elf/dl-error.c b/elf/dl-error.c
index 5b4c0a3108..ab15094ebc 100644
--- a/elf/dl-error.c
+++ b/elf/dl-error.c
@@ -17,11 +17,11 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
 #include <setjmp.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <elf/ldsodefs.h>
 
 /* This is the internal function we use to generate the error string.  */
 extern char *_strerror_internal __P ((int, char *, size_t));
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index abbd8c878e..ae220ae50e 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -17,7 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
+#include <elf/ldsodefs.h>
 
 void
 _dl_fini (void)
diff --git a/elf/dl-init.c b/elf/dl-init.c
index 6bdad4e841..d9af0802b5 100644
--- a/elf/dl-init.c
+++ b/elf/dl-init.c
@@ -18,7 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
-#include <link.h>
+#include <elf/ldsodefs.h>
 
 
 /* Run initializers for MAP and its dependencies, in inverse dependency
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 06c8ad57b4..c75a91392e 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -20,10 +20,10 @@
 #include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <link.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <elf/ldsodefs.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 9a2a1052f1..5a613587f2 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -18,14 +18,14 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <alloca.h>
-#include <link.h>
-#include <assert.h>
 #include <string.h>
 #include <unistd.h>
-
+#include <elf/ldsodefs.h>
 #include "dl-hash.h"
 #include <dl-machine.h>
 
+#include <assert.h>
+
 #define VERSTAG(tag)	(DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (tag))
 
 /* We need this string more than once.  */
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
index daf623318d..6592ca0baf 100644
--- a/elf/dl-minimal.c
+++ b/elf/dl-minimal.c
@@ -17,14 +17,15 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <unistd.h>
-#include <assert.h>
-#include <string.h>
-#include <link.h>
+#include <elf/ldsodefs.h>
 #include <stdio-common/_itoa.h>
-#include <errno.h>
+
+#include <assert.h>
 
 /* Minimal `malloc' allocator for use while loading shared libraries.
    No block is ever freed.  */
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 9bd600dd9e..3705dd47ce 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -17,12 +17,12 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
-#include <assert.h>
+#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <elf/ldsodefs.h>
 
+#include <assert.h>
 
 /* List of objects currently loaded is [2] of this, aka _dl_loaded.  */
 struct link_map *_dl_default_scope[5];
diff --git a/elf/dl-open.c b/elf/dl-open.c
index c5a5fde285..4bec833634 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -17,11 +17,11 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
 #include <dlfcn.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <bits/libc-lock.h>
+#include <elf/ldsodefs.h>
 
 
 extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
diff --git a/elf/dl-profile.c b/elf/dl-profile.c
index cd3f07eb3e..5839dede67 100644
--- a/elf/dl-profile.c
+++ b/elf/dl-profile.c
@@ -23,11 +23,11 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <link.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <elf/ldsodefs.h>
 #include <sys/gmon.h>
 #include <sys/gmon_out.h>
 #include <sys/mman.h>
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index d38c6c13a0..16296959ce 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -18,9 +18,9 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <errno.h>
-#include <link.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <elf/ldsodefs.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include "dynamic-link.h"
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index b01338a304..cd414c3606 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -17,8 +17,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
 #include <unistd.h>
+#include <elf/ldsodefs.h>
 
 
 /* The global scope we will use for symbol lookups.
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 0f3a4c5f66..36932bb5b6 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -20,9 +20,9 @@
 /* This file defines some things that for the dynamic linker are defined in
    rtld.c and dl-sysdep.c in ways appropriate to bootstrap dynamic linking.  */
 
-#include <link.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <elf/ldsodefs.h>
 #include <dl-machine.h>
 
 extern char *__progname;
diff --git a/elf/dl-symbol.c b/elf/dl-symbol.c
index e27018c7d4..2b7b821bad 100644
--- a/elf/dl-symbol.c
+++ b/elf/dl-symbol.c
@@ -1,5 +1,5 @@
 /* Look up a symbol's run-time value in the scope of a loaded object.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1998 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
@@ -18,7 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
-#include <link.h>
+#include <elf/ldsodefs.h>
 
 /* Look up symbol NAME in MAP's scope and return its run-time address.  */
 
diff --git a/elf/dl-version.c b/elf/dl-version.c
index a8bdeef89b..9c93eff3f2 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -20,13 +20,13 @@
 
 #include <elf.h>
 #include <errno.h>
-#include <link.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-
+#include <elf/ldsodefs.h>
 #include <stdio-common/_itoa.h>
 
+#include <assert.h>
+
 
 #define VERSTAG(tag)	(DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (tag))
 
diff --git a/elf/dladdr.c b/elf/dladdr.c
index d82a9e78cb..3456aae9ad 100644
--- a/elf/dladdr.c
+++ b/elf/dladdr.c
@@ -1,5 +1,5 @@
 /* Locate the shared object symbol nearest a given address.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 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
@@ -17,9 +17,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <stddef.h>
-#include <link.h>
 #include <dlfcn.h>
+#include <stddef.h>
+#include <elf/ldsodefs.h>
 
 
 int
diff --git a/elf/dlclose.c b/elf/dlclose.c
index a2ec750baf..b25ca48d65 100644
--- a/elf/dlclose.c
+++ b/elf/dlclose.c
@@ -1,5 +1,5 @@
 /* Close a handle opened by `dlopen'.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 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
@@ -17,8 +17,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <link.h>
 #include <dlfcn.h>
+#include <elf/ldsodefs.h>
 
 static void
 dlclose_doit (void *handle)
diff --git a/elf/dlerror.c b/elf/dlerror.c
index 3edafe4f1c..b984b3d908 100644
--- a/elf/dlerror.c
+++ b/elf/dlerror.c
@@ -17,12 +17,12 @@
    write to the Fr