aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog37
-rw-r--r--elf/Makefile2
-rw-r--r--elf/dl-addr.c4
-rw-r--r--elf/dl-close.c4
-rw-r--r--elf/dl-debug.c4
-rw-r--r--elf/dl-deps.c5
-rw-r--r--elf/dl-error.c2
-rw-r--r--elf/dl-fini.c2
-rw-r--r--elf/dl-init.c2
-rw-r--r--elf/dl-load.c2
-rw-r--r--elf/dl-lookup.c6
-rw-r--r--elf/dl-minimal.c11
-rw-r--r--elf/dl-object.c6
-rw-r--r--elf/dl-open.c4
-rw-r--r--elf/dl-profile.c2
-rw-r--r--elf/dl-reloc.c2
-rw-r--r--elf/dl-runtime.c2
-rw-r--r--elf/dl-support.c2
-rw-r--r--elf/dl-symbol.c4
-rw-r--r--elf/dl-version.c6
-rw-r--r--elf/dladdr.c6
-rw-r--r--elf/dlclose.c4
-rw-r--r--elf/dlerror.c4
-rw-r--r--elf/dlopen.c6
-rw-r--r--elf/dlsym.c4
-rw-r--r--elf/dlvsym.c4
-rw-r--r--elf/ldsodefs.h385
-rw-r--r--elf/link.h368
-rw-r--r--elf/rtld.c5
-rw-r--r--elf/sprof.c2
-rw-r--r--iconv/gconv_dl.c2
-rw-r--r--nss/nsswitch.c2
-rw-r--r--sysdeps/generic/dl-cache.c2
-rw-r--r--sysdeps/generic/dl-sysdep.c8
-rw-r--r--sysdeps/generic/libc-start.c2
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 Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <link.h>
#include <dlfcn.h>
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
#include <bits/libc-lock.h>
+#include <elf/ldsodefs.h>
/* Type for storing results of dynamic loading actions. */
diff --git a/elf/dlopen.c b/elf/dlopen.c
index 4963e9962e..d616e489f2 100644
--- a/elf/dlopen.c
+++ b/elf/dlopen.c
@@ -1,5 +1,5 @@
/* Load a shared object at run time.
- 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,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>
struct dlopen_args
{
diff --git a/elf/dlsym.c b/elf/dlsym.c
index 0da1902178..8b20dcf90d 100644
--- a/elf/dlsym.c
+++ b/elf/dlsym.c
@@ -17,10 +17,10 @@
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 <setjmp.h>
+#include <stddef.h>
+#include <elf/ldsodefs.h>
struct dlsym_args
{
diff --git a/elf/dlvsym.c b/elf/dlvsym.c
index c42b0d768f..a1ba9504e8 100644
--- a/elf/dlvsym.c
+++ b/elf/dlvsym.c
@@ -17,10 +17,10 @@
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 <setjmp.h>
+#include <stddef.h>
+#include <elf/ldsodefs.h>
#include <dl-hash.h>
diff --git a/elf/ldsodefs.h b/elf/ldsodefs.h
new file mode 100644
index 0000000000..f6202baf2b
--- /dev/null
+++ b/elf/ldsodefs.h
@@ -0,0 +1,385 @@
+/* Run-time dynamic linker data structures for loaded ELF shared objects.
+ 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _LDSODEFS_H
+#define _LDSODEFS_H 1
+
+#include <features.h>
+
+#define __need_size_t
+#define __need_NULL
+#include <stddef.h>
+
+#include <elf.h>
+#include <dlfcn.h>
+#include <link.h>
+
+__BEGIN_DECLS
+
+/* We use this macro to refer to ELF types independent of the native wordsize.
+ `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */
+#define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type)
+
+/* For the version handling we need an array with only names and their
+ hash values. */
+struct r_found_version
+ {
+ const char *name;
+ ElfW(Word) hash;
+
+ int hidden;
+ const char *filename;
+ };
+
+/* We want to cache information about the searches for shared objects. */
+
+enum r_dir_status { unknown, nonexisting, existing };
+
+struct r_search_path_elem
+ {
+ const char *dirname;
+
+ size_t dirnamelen;
+ enum r_dir_status dirstatus;
+
+ size_t machdirnamelen;
+ enum r_dir_status machdirstatus;
+
+ /* Strings saying where the definition came from. */
+ const char *what;
+ const char *where;
+
+ /* This link is only used in the `all_dirs' member of `r_search_path'. */
+ struct r_search_path_elem *next;
+ };
+
+
+/* A data structure for a simple single linked list of strings. */
+struct libname_list
+ {
+ const char *name; /* Name requested (before search). */
+ struct libname_list *next; /* Link to next name for this object. */
+ };
+
+
+/* Test whether given NAME matches any of the names of the given object. */
+static __inline int
+__attribute__ ((unused))
+_dl_name_match_p (const char *__name, struct link_map *__map)
+{
+ int __found = strcmp (__name, __map->l_name) == 0;
+ struct libname_list *__runp = __map->l_libname;
+
+ while (! __found && __runp != NULL)
+ if (strcmp (__name, __runp->name) == 0)
+ __found = 1;
+ else
+ __runp = __runp->next;
+
+ return __found;
+}
+
+/* Function used as argument for `_dl_receive_error' function. The
+ arguments are the error code, error string, and the objname the
+ error occurred in. */
+typedef void (*receiver_fct) (int, const char *, const char *);
+
+/* Internal functions of the run-time dynamic linker.
+ These can be accessed if you link again the dynamic linker
+ as a shared library, as in `-lld' or `/lib/ld.so' explicitly;
+ but are not normally of interest to user programs.
+
+ The `-ldl' library functions in <dlfcn.h> provide a simple
+ user interface to run-time dynamic linking. */
+
+
+/* Parameters passed to the dynamic linker. */
+extern char **_dl_argv;
+
+/* Cached value of `getpagesize ()'. */
+extern size_t _dl_pagesize;
+
+/* File descriptor referring to the zero-fill device. */
+extern int _dl_zerofd;
+
+/* Name of the shared object to be profiled (if any). */
+extern const char *_dl_profile;
+/* Map of shared object to be profiled. */
+extern struct link_map *_dl_profile_map;
+
+/* If nonzero the appropriate debug information is printed. */
+extern int _dl_debug_libs;
+extern int _dl_debug_impcalls;
+extern int _dl_debug_bindings;
+extern int _dl_debug_symbols;
+extern int _dl_debug_versions;
+extern int _dl_debug_reloc;
+extern int _dl_debug_files;
+
+/* File deccriptor to write debug messages to. */
+extern int _dl_debug_fd;
+
+/* OS-dependent function to open the zero-fill device. */
+extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */
+
+/* OS-dependent function to write a message on the specified
+ descriptor FD. All arguments are `const char *'; args until a null
+ pointer are concatenated to form the message to print. */
+extern void _dl_sysdep_output (int fd, const char *string, ...);
+
+/* OS-dependent function to write a debug message on the specified
+ descriptor for this. All arguments are `const char *'; args until
+ a null pointer are concatenated to form the message to print. If
+ NEW_LINE is nonzero it is assumed that the message starts on a new
+ line.*/
+extern void _dl_debug_message (int new_line, const char *string, ...);
+
+/* OS-dependent function to write a message on the standard output.
+ All arguments are `const char *'; args until a null pointer
+ are concatenated to form the message to print. */
+#define _dl_sysdep_message(string, args...) \
+ _dl_sysdep_output (STDOUT_FILENO, string, ##args)
+
+/* OS-dependent function to write a message on the standard error.
+ All arguments are `const char *'; args until a null pointer
+ are concatenated to form the message to print. */
+#define _dl_sysdep_error(string, args...) \
+ _dl_sysdep_output (STDERR_FILENO, string, ##args)
+
+/* OS-dependent function to give a fatal error message and exit
+ when the dynamic linker fails before the program is fully linked.
+ All arguments are `const char *'; args until a null pointer
+ are concatenated to form the message to print. */
+#define _dl_sysdep_fatal(string, args...) \
+ do \
+ { \
+ _dl_sysdep_output (STDERR_FILENO, string, ##args); \
+ _exit (127); \
+ } \
+ while (1)
+
+/* Nonzero if the program should be "secure" (i.e. it's setuid or somesuch).
+ This tells the dynamic linker to ignore environment variables. */
+extern int _dl_secure;
+
+/* This function is called by all the internal dynamic linker functions
+ when they encounter an error. ERRCODE is either an `errno' code or
+ zero; OBJECT is the name of the problematical shared object, or null if
+ it is a general problem; ERRSTRING is a string describing the specific
+ problem. */
+extern void _dl_signal_error (int errcode,
+ const char *object,
+ const char *errstring);
+
+/* Call OPERATE, catching errors from `dl_signal_error'. If there is no
+ error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is
+ set to a string constructed from the strings passed to _dl_signal_error,
+ and the error code passed is the return value. ERRSTRING if nonzero
+ points to a malloc'ed string which the caller has to free after use.
+ ARGS is passed as argument to OPERATE. */
+extern int _dl_catch_error (char **errstring,
+ void (*operate) (void *),
+ void *args);
+
+/* Call OPERATE, receiving errors from `dl_signal_error'. Unlike
+ `_dl_catch_error' the operation is resumed after the OPERATE
+ function returns.
+ ARGS is passed as argument to OPERATE. */
+extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
+ void *args);
+
+
+/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via
+ _dl_catch_error. Returns zero for success, nonzero for failure; and
+ arranges for `dlerror' to return the error details.
+ ARGS is passed as argument to OPERATE. */
+extern int _dlerror_run (void (*operate) (void *), void *args);
+
+
+/* Open the shared object NAME and map in its segments.
+ LOADER's DT_RPATH is used in searching for NAME.
+ If the object is already opened, returns its existing map.
+ For preloaded shared objects PRELOADED is set to a non-zero
+ value to allow additional security checks. */
+extern struct link_map *_dl_map_object (struct link_map *loader,
+ const char *name, int preloaded,
+ int type, int trace_mode);
+
+/* Call _dl_map_object on the dependencies of MAP, and set up
+ MAP->l_searchlist. PRELOADS points to a vector of NPRELOADS previously
+ loaded objects that will be inserted into MAP->l_searchlist after MAP
+ but before its dependencies. */
+extern void _dl_map_object_deps (struct link_map *map,
+ struct link_map **preloads,
+ unsigned int npreloads, int trace_mode);
+
+/* Cache the locations of MAP's hash table. */
+extern void _dl_setup_hash (struct link_map *map);
+
+
+/* Open the shared object NAME, relocate it, and run its initializer if it
+ hasn't already been run. MODE is as for `dlopen' (see <dlfcn.h>). If
+ the object is already opened, returns its existing map. */
+extern struct link_map *_dl_open (const char *name, int mode);
+
+/* Close an object previously opened by _dl_open. */
+extern void _dl_close (struct link_map *map);
+
+
+/* Search loaded objects' symbol tables for a definition of the symbol
+ referred to by UNDEF. *SYM is the symbol table entry containing the
+ reference; it is replaced with the defining symbol, and the base load
+ address of the defining object is returned. SYMBOL_SCOPE is a
+ null-terminated list of object scopes to search; each object's
+ l_searchlist (i.e. the segment of the dependency tree starting at that
+ object) is searched in turn. REFERENCE_NAME should name the object
+ containing the reference; it is used in error messages.
+ RELOC_TYPE is a machine-dependent reloc type, which is passed to
+ the `elf_machine_lookup_*_p' macros in dl-machine.h to affect which
+ symbols can be chosen. */
+extern ElfW(Addr) _dl_lookup_symbol (const char *undef,
+ const ElfW(Sym) **sym,
+ struct link_map *symbol_scope[],
+ const char *reference_name,
+ int reloc_type);
+
+/* Lookup versioned symbol. */
+extern ElfW(Addr) _dl_lookup_versioned_symbol (const char *undef,
+ const ElfW(Sym) **sym,
+ struct link_map *symbol_scope[],
+ const char *reference_name,
+ const struct r_found_version *version,
+ int reloc_type);
+
+/* For handling RTLD_NEXT we must be able to skip shared objects. */
+extern ElfW(Addr) _dl_lookup_symbol_skip (const char *undef,
+ const ElfW(Sym) **sym,
+ struct link_map *symbol_scope[],
+ const char *reference_name,
+ struct link_map *skip_this);
+
+/* For handling RTLD_NEXT with versioned symbols we must be able to
+ skip shared objects. */
+extern ElfW(Addr) _dl_lookup_versioned_symbol_skip (const char *undef,
+ const ElfW(Sym) **sym,
+ struct link_map *symbol_scope[],
+ const char *reference_name,
+ const struct r_found_version *version,
+ struct link_map *skip_this);
+
+/* Locate shared object containing the given address. */
+extern int _dl_addr (const void *address, Dl_info *info);
+
+/* Look up symbol NAME in MAP's scope and return its run-time address. */
+extern ElfW(Addr) _dl_symbol_value (struct link_map *map, const char *name);
+
+
+/* Structure describing the dynamic linker itself. */
+extern struct link_map _dl_rtld_map;
+
+/* The list of objects currently loaded is the third element of the
+ `_dl_default_scope' array, and the fourth element is always null.
+ This leaves two slots before it that are used when resolving
+ DT_SYMBOLIC objects' references one after it for normal references
+ (see below). */
+#define _dl_loaded (_dl_default_scope[2])
+extern struct link_map *_dl_default_scope[5];
+
+/* Null-terminated list of objects in the dynamic `global scope'. The
+ list starts at [2]; i.e. &_dl_global_scope[2] is the argument
+ passed to _dl_lookup_symbol to search the global scope. To search
+ a specific object and its dependencies in preference to the global
+ scope, fill in the [1] slot and pass its address; for two specific
+ object scopes, fill [0] and [1]. The list is double-terminated; to
+ search the global scope and then a specific object and its
+ dependencies, set *_dl_global_scope_end. This variable initially
+ points to _dl_default_scope, and _dl_loaded is always kept in [2]
+ of this list. A new list is malloc'd when new objects are loaded
+ with RTLD_GLOBAL. */
+extern struct link_map **_dl_global_scope, **_dl_global_scope_end;
+extern size_t _dl_global_scope_alloc; /* Number of slots malloc'd. */
+
+/* Hack _dl_global_scope[0] and [1] as necessary, and return a pointer into
+ _dl_global_scope that should be passed to _dl_lookup_symbol for symbol
+ references made in the object MAP's relocations. */
+extern struct link_map **_dl_object_relocation_scope (struct link_map *map);
+
+
+/* Allocate a `struct link_map' for a new object being loaded,
+ and enter it into the _dl_loaded list. */
+extern struct link_map *_dl_new_object (char *realname, const char *libname,
+ int type);
+
+/* Relocate the given object (if it hasn't already been).
+ SCOPE is passed to _dl_lookup_symbol in symbol lookups.
+ If LAZY is nonzero, don't relocate its PLT. */
+extern void _dl_relocate_object (struct link_map *map,
+ struct link_map *scope[],
+ int lazy);
+
+/* Check the version dependencies of all objects available through
+ MAP. If VERBOSE print some more diagnostics. */
+extern int _dl_check_all_versions (struct link_map *map, int verbose);
+
+/* Check the version dependencies for MAP. If VERBOSE print some more
+ diagnostics. */
+extern int _dl_check_map_versions (struct link_map *map, int verbose);
+
+/* Return the address of the next initializer function for MAP or one of
+ its dependencies that has not yet been run. When there are no more
+ initializers to be run, this returns zero. The functions are returned
+ in the order they should be called. */
+extern ElfW(Addr) _dl_init_next (struct link_map *map);
+
+/* Call the finalizer functions of all shared objects whose
+ initializer functions have completed. */
+extern void _dl_fini (void);
+
+/* The dynamic linker calls this function before and having changing
+ any shared object mappings. The `r_state' member of `struct r_debug'
+ says what change is taking place. This function's address is
+ the value of the `r_brk' member. */
+extern void _dl_debug_state (void);
+
+/* Initialize `struct r_debug' if it has not already been done. The
+ argument is the run-time load address of the dynamic linker, to be put
+ in the `r_ldbase' member. Returns the address of the structure. */
+extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase);
+
+/* Initialize the basic data structure for the search paths. */
+extern void _dl_init_paths (const char *library_path);
+
+/* Gather the information needed to install the profiling tables and start
+ the timers. */
+extern void _dl_start_profile (struct link_map *map, const char *output_dir);
+
+/* The actual functions used to keep book on the calls. */
+extern void _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc);
+
+
+/* Show the members of the auxiliary array passed up from the kernel. */
+extern void _dl_show_auxv (void);
+
+/* Return all environment variables starting with `LD_', one after the
+ other. */
+extern char *_dl_next_ld_env_entry (char ***position);
+
+__END_DECLS
+
+#endif /* ldsodefs.h */
diff --git a/elf/link.h b/elf/link.h
index 9b0f898b11..30efa0ed25 100644
--- a/elf/link.h
+++ b/elf/link.h
@@ -1,4 +1,5 @@
-/* Run-time dynamic linker data structures for loaded ELF shared objects.
+/* Data structure for communication from the run-time dynamic linker for
+ loaded ELF shared objects.
Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -21,20 +22,12 @@
#define _LINK_H 1
#include <features.h>
-
-#define __need_size_t
-#define __need_NULL
-#include <stddef.h>
-
#include <elf.h>
#include <dlfcn.h>
-__BEGIN_DECLS
-
/* We use this macro to refer to ELF types independent of the native wordsize.
`ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */
#define ElfW(type) _ElfW (Elf, __ELF_NATIVE_CLASS, type)
-#define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type)
#define _ElfW(e,w,t) _ElfW_1 (e, w, _##t)
#define _ElfW_1(e,w,t) e##w##t
@@ -78,56 +71,24 @@ extern struct r_debug _r_debug;
for (dyn = _DYNAMIC; dyn->d_tag != DT_NULL)
if (dyn->d_tag == DT_DEBUG) r_debug = (struct r_debug) dyn->d_un.d_ptr;
*/
-
extern ElfW(Dyn) _DYNAMIC[];
-/* For the version handling we need an array with only names and their
- hash values. */
-struct r_found_version
- {
- const char *name;
- ElfW(Word) hash;
-
- int hidden;
- const char *filename;
- };
-
-/* We want to cache information about the searches for shared objects. */
-
-enum r_dir_status { unknown, nonexisting, existing };
-
-struct r_search_path_elem
- {
- const char *dirname;
-
- size_t dirnamelen;
- enum r_dir_status dirstatus;
-
- size_t machdirnamelen;
- enum r_dir_status machdirstatus;
-
- /* Strings saying where the definition came from. */
- const char *what;
- const char *where;
- /* This link is only used in the `all_dirs' member of `r_search_path'. */
- struct r_search_path_elem *next;
- };
-
-
-/* A data structure for a simple single linked list of strings. */
-struct libname_list
- {
- const char *name; /* Name requested (before search). */
- struct libname_list *next; /* Link to next name for this object. */
- };
+/* Some internal data structures of the dynamic linker used in the
+ linker map. We only provide forward declarations. */
+struct libname_list;
+struct r_found_version;
+struct r_search_path_elem;
/* Structure describing a loaded shared object. The `l_next' and `l_prev'
members form a chain of all the shared objects loaded at startup.
These data structures exist in space used by the run-time dynamic linker;
- modifying them may have disastrous results. */
+ modifying them may have disastrous results.
+
+ This data structure might change in future, if necessary. User-level
+ programs must avoid defining objects of this type. */
struct link_map
{
@@ -142,7 +103,7 @@ struct link_map
/* All following members are internal to the dynamic linker.
They may change without notice. */
- struct libname_list *l_libname;
+ struct libname_list *l_libname;
/* Indexed pointers to dynamic section.
[0,DT_NUM) are indexed by the processor-independent tags.
[DT_NUM,DT_NUM+DT_PROCNUM) are indexed by the tag minus DT_LOPROC.
@@ -202,309 +163,4 @@ struct link_map
ElfW(Half) *l_versyms;
};
-
-/* Test whether given NAME matches any of the names of the given object. */
-static __inline int
-__attribute__ ((unused))
-_dl_name_match_p (const char *__name, struct link_map *__map)
-{
- int __found = strcmp (__name, __map->l_name) == 0;
- struct libname_list *__runp = __map->l_libname;
-
- while (! __found && __runp != NULL)
- if (strcmp (__name, __runp->name) == 0)
- __found = 1;
- else
- __runp = __runp->next;
-
- return __found;
-}
-
-/* Function used as argument for `_dl_receive_error' function. The
- arguments are the error code, error string, and the objname the
- error occurred in. */
-typedef void (*receiver_fct) (int, const char *, const char *);
-
-/* Internal functions of the run-time dynamic linker.
- These can be accessed if you link again the dynamic linker
- as a shared library, as in `-lld' or `/lib/ld.so' explicitly;
- but are not normally of interest to user programs.
-
- The `-ldl' library functions in <dlfcn.h> provide a simple
- user interface to run-time dynamic linking. */
-
-
-/* Parameters passed to the dynamic linker. */
-extern char **_dl_argv;
-
-/* Cached value of `getpagesize ()'. */
-extern size_t _dl_pagesize;
-
-/* File descriptor referring to the zero-fill device. */
-extern int _dl_zerofd;
-
-/* Name of the shared object to be profiled (if any). */
-extern const char *_dl_profile;
-/* Map of shared object to be profiled. */
-extern struct link_map *_dl_profile_map;
-
-/* If nonzero the appropriate debug information is printed. */
-extern int _dl_debug_libs;
-extern int _dl_debug_impcalls;
-extern int _dl_debug_bindings;
-extern int _dl_debug_symbols;
-extern int _dl_debug_versions;
-extern int _dl_debug_reloc;
-extern int _dl_debug_files;
-
-/* File deccriptor to write debug messages to. */
-extern int _dl_debug_fd;
-
-/* OS-dependent function to open the zero-fill device. */
-extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */
-
-/* OS-dependent function to write a message on the specified
- descriptor FD. All arguments are `const char *'; args until a null
- pointer are concatenated to form the message to print. */
-extern void _dl_sysdep_output (int fd, const char *string, ...);
-
-/* OS-dependent function to write a debug message on the specified
- descriptor for this. All arguments are `const char *'; args until
- a null pointer are concatenated to form the message to print. If
- NEW_LINE is nonzero it is assumed that the message starts on a new
- line.*/
-extern void _dl_debug_message (int new_line, const char *string, ...);
-
-/* OS-dependent function to write a message on the standard output.
- All arguments are `const char *'; args until a null pointer
- are concatenated to form the message to print. */
-#define _dl_sysdep_message(string, args...) \
- _dl_sysdep_output (STDOUT_FILENO, string, ##args)
-
-/* OS-dependent function to write a message on the standard error.
- All arguments are `const char *'; args until a null pointer
- are concatenated to form the message to print. */
-#define _dl_sysdep_error(string, args...) \
- _dl_sysdep_output (STDERR_FILENO, string, ##args)
-
-/* OS-dependent function to give a fatal error message and exit
- when the dynamic linker fails before the program is fully linked.
- All arguments are `const char *'; args until a null pointer
- are concatenated to form the message to print. */
-#define _dl_sysdep_fatal(string, args...) \
- do \
- { \
- _dl_sysdep_output (STDERR_FILENO, string, ##args); \
- _exit (127); \
- } \
- while (1)
-
-/* Nonzero if the program should be "secure" (i.e. it's setuid or somesuch).
- This tells the dynamic linker to ignore environment variables. */
-extern int _dl_secure;
-
-/* This function is called by all the internal dynamic linker functions
- when they encounter an error. ERRCODE is either an `errno' code or
- zero; OBJECT is the name of the problematical shared object, or null if
- it is a general problem; ERRSTRING is a string describing the specific
- problem. */
-extern void _dl_signal_error (int errcode,
- const char *object,
- const char *errstring);
-
-/* Call OPERATE, catching errors from `dl_signal_error'. If there is no
- error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is
- set to a string constructed from the strings passed to _dl_signal_error,
- and the error code passed is the return value. ERRSTRING if nonzero
- points to a malloc'ed string which the caller has to free after use.
- ARGS is passed as argument to OPERATE. */
-extern int _dl_catch_error (char **errstring,
- void (*operate) (void *),
- void *args);
-
-/* Call OPERATE, receiving errors from `dl_signal_error'. Unlike
- `_dl_catch_error' the operation is resumed after the OPERATE
- function returns.
- ARGS is passed as argument to OPERATE. */
-extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
- void *args);
-
-
-/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via
- _dl_catch_error. Returns zero for success, nonzero for failure; and
- arranges for `dlerror' to return the error details.
- ARGS is passed as argument to OPERATE. */
-extern int _dlerror_run (void (*operate) (void *), void *args);
-
-
-/* Open the shared object NAME and map in its segments.
- LOADER's DT_RPATH is used in searching for NAME.
- If the object is already opened, returns its existing map.
- For preloaded shared objects PRELOADED is set to a non-zero
- value to allow additional security checks. */
-extern struct link_map *_dl_map_object (struct link_map *loader,
- const char *name, int preloaded,
- int type, int trace_mode);
-
-/* Call _dl_map_object on the dependencies of MAP, and set up
- MAP->l_searchlist. PRELOADS points to a vector of NPRELOADS previously
- loaded objects that will be inserted into MAP->l_searchlist after MAP
- but before its dependencies. */
-extern void _dl_map_object_deps (struct link_map *map,
- struct link_map **preloads,
- unsigned int npreloads, int trace_mode);
-
-/* Cache the locations of MAP's hash table. */
-extern void _dl_setup_hash (struct link_map *map);
-
-
-/* Open the shared object NAME, relocate it, and run its initializer if it
- hasn't already been run. MODE is as for `dlopen' (see <dlfcn.h>). If
- the object is already opened, returns its existing map. */
-extern struct link_map *_dl_open (const char *name, int mode);
-
-/* Close an object previously opened by _dl_open. */
-extern void _dl_close (struct link_map *map);
-
-
-/* Search loaded objects' symbol tables for a definition of the symbol
- referred to by UNDEF. *SYM is the symbol table entry containing the
- reference; it is replaced with the defining symbol, and the base load
- address of the defining object is returned. SYMBOL_SCOPE is a
- null-terminated list of object scopes to search; each object's
- l_searchlist (i.e. the segment of the dependency tree starting at that
- object) is searched in turn. REFERENCE_NAME should name the object
- containing the reference; it is used in error messages.
- RELOC_TYPE is a machine-dependent reloc type, which is passed to
- the `elf_machine_lookup_*_p' macros in dl-machine.h to affect which
- symbols can be chosen. */
-extern ElfW(Addr) _dl_lookup_symbol (const char *undef,
- const ElfW(Sym) **sym,
- struct link_map *symbol_scope[],
- const char *reference_name,
- int reloc_type);
-
-/* Lookup versioned symbol. */
-extern ElfW(Addr) _dl_lookup_versioned_symbol (const char *undef,
- const ElfW(Sym) **sym,
- struct link_map *symbol_scope[],
- const char *reference_name,
- const struct r_found_version *version,
- int reloc_type);
-
-/* For handling RTLD_NEXT we must be able to skip shared objects. */
-extern ElfW(Addr) _dl_lookup_symbol_skip (const char *undef,
- const ElfW(Sym) **sym,
- struct link_map *symbol_scope[],
- const char *reference_name,
- struct link_map *skip_this);
-
-/* For handling RTLD_NEXT with versioned symbols we must be able to
- skip shared objects. */
-extern ElfW(Addr) _dl_lookup_versioned_symbol_skip (const char *undef,
- const ElfW(Sym) **sym,
- struct link_map *symbol_scope[],
- const char *reference_name,
- const struct r_found_version *version,
- struct link_map *skip_this);
-
-/* Locate shared object containing the given address. */
-extern int _dl_addr (const void *address, Dl_info *info);
-
-/* Look up symbol NAME in MAP's scope and return its run-time address. */
-extern ElfW(Addr) _dl_symbol_value (struct link_map *map, const char *name);
-
-
-/* Structure describing the dynamic linker itself. */
-extern struct link_map _dl_rtld_map;
-
-/* The list of objects currently loaded is the third element of the
- `_dl_default_scope' array, and the fourth element is always null.
- This leaves two slots before it that are used when resolving
- DT_SYMBOLIC objects' references one after it for normal references
- (see below). */
-#define _dl_loaded (_dl_default_scope[2])
-extern struct link_map *_dl_default_scope[5];
-
-/* Null-terminated list of objects in the dynamic `global scope'. The
- list starts at [2]; i.e. &_dl_global_scope[2] is the argument
- passed to _dl_lookup_symbol to search the global scope. To search
- a specific object and its dependencies in preference to the global
- scope, fill in the [1] slot and pass its address; for two specific
- object scopes, fill [0] and [1]. The list is double-terminated; to
- search the global scope and then a specific object and its
- dependencies, set *_dl_global_scope_end. This variable initially
- points to _dl_default_scope, and _dl_loaded is always kept in [2]
- of this list. A new list is malloc'd when new objects are loaded
- with RTLD_GLOBAL. */
-extern struct link_map **_dl_global_scope, **_dl_global_scope_end;
-extern size_t _dl_global_scope_alloc; /* Number of slots malloc'd. */
-
-/* Hack _dl_global_scope[0] and [1] as necessary, and return a pointer into
- _dl_global_scope that should be passed to _dl_lookup_symbol for symbol
- references made in the object MAP's relocations. */
-extern struct link_map **_dl_object_relocation_scope (struct link_map *map);
-
-
-/* Allocate a `struct link_map' for a new object being loaded,
- and enter it into the _dl_loaded list. */
-extern struct link_map *_dl_new_object (char *realname, const char *libname,
- int type);
-
-/* Relocate the given object (if it hasn't already been).
- SCOPE is passed to _dl_lookup_symbol in symbol lookups.
- If LAZY is nonzero, don't relocate its PLT. */
-extern void _dl_relocate_object (struct link_map *map,
- struct link_map *scope[],
- int lazy);
-
-/* Check the version dependencies of all objects available through
- MAP. If VERBOSE print some more diagnostics. */
-extern int _dl_check_all_versions (struct link_map *map, int verbose);
-
-/* Check the version dependencies for MAP. If VERBOSE print some more
- diagnostics. */
-extern int _dl_check_map_versions (struct link_map *map, int verbose);
-
-/* Return the address of the next initializer function for MAP or one of
- its dependencies that has not yet been run. When there are no more
- initializers to be run, this returns zero. The functions are returned
- in the order they should be called. */
-extern ElfW(Addr) _dl_init_next (struct link_map *map);
-
-/* Call the finalizer functions of all shared objects whose
- initializer functions have completed. */
-extern void _dl_fini (void);
-
-/* The dynamic linker calls this function before and having changing
- any shared object mappings. The `r_state' member of `struct r_debug'
- says what change is taking place. This function's address is
- the value of the `r_brk' member. */
-extern void _dl_debug_state (void);
-
-/* Initialize `struct r_debug' if it has not already been done. The
- argument is the run-time load address of the dynamic linker, to be put
- in the `r_ldbase' member. Returns the address of the structure. */
-extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase);
-
-/* Initialize the basic data structure for the search paths. */
-extern void _dl_init_paths (const char *library_path);
-
-/* Gather the information needed to install the profiling tables and start
- the timers. */
-extern void _dl_start_profile (struct link_map *map, const char *output_dir);
-
-/* The actual functions used to keep book on the calls. */
-extern void _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc);
-
-
-/* Show the members of the auxiliary array passed up from the kernel. */
-extern void _dl_show_auxv (void);
-
-/* Return all environment variables starting with `LD_', one after the
- other. */
-extern char *_dl_next_ld_env_entry (char ***position);
-
-__END_DECLS
-
#endif /* link.h */
diff --git a/elf/rtld.c b/elf/rtld.c
index b160522c0c..13643d1e66 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -18,17 +18,16 @@
Boston, MA 02111-1307, USA. */
#include <fcntl.h>
-#include <link.h>
-#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/mman.h> /* Check if MAP_ANON is defined. */
+#include <elf/ldsodefs.h>
#include <stdio-common/_itoa.h>
-#include <assert.h>
#include <entry.h>
#include "dynamic-link.h"
+#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
diff --git a/elf/sprof.c b/elf/sprof.c
index 924d1ea3c1..95e96646d1 100644
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -25,7 +25,6 @@
#include <fcntl.h>
#include <inttypes.h>
#include <libintl.h>
-#include <link.h>
#include <locale.h>
#include <obstack.h>
#include <search.h>
@@ -33,6 +32,7 @@
#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/iconv/gconv_dl.c b/iconv/gconv_dl.c
index bed6f76869..a9a616663e 100644
--- a/iconv/gconv_dl.c
+++ b/iconv/gconv_dl.c
@@ -21,11 +21,11 @@
#include <dlfcn.h>
#include <gconv.h>
#include <inttypes.h>
-#include <link.h>
#include <search.h>
#include <stdlib.h>
#include <string.h>
#include <bits/libc-lock.h>
+#include <elf/ldsodefs.h>
#include <sys/param.h>
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 3b48c85bb5..ab0f850091 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -22,11 +22,11 @@
#include <errno.h>
#include <netdb.h>
#include <bits/libc-lock.h>
-#include <link.h> /* We need some help from ld.so. */
#include <search.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <elf/ldsodefs.h> /* We need some help from ld.so. */
#if !defined DO_STATIC_NSS || defined PIC
# include <gnu/lib-names.h>
diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c
index c885c11d37..5aa1ea20f3 100644
--- a/sysdeps/generic/dl-cache.c
+++ b/sysdeps/generic/dl-cache.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>
#include <sys/mman.h>
/* System-dependent function to read a file's whole contents
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index 21b470c6ae..8db0c7889f 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -18,15 +18,15 @@
Boston, MA 02111-1307, USA. */
#include <elf.h>
-#include <entry.h>
+#include <fcntl.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
-#include <fcntl.h>
-#include <link.h>
-#include <unistd.h>
+#include <elf/ldsodefs.h>
#include <stdio-common/_itoa.h>
+#include <entry.h>
#include <dl-machine.h>
#include <dl-procinfo.h>
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index d32e54f162..2e777a84d2 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -16,9 +16,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <link.h>
#include <stdlib.h>
#include <unistd.h>
+#include <elf/ldsodefs.h>
extern void __libc_init_first (int argc, char **argv, char **envp);