about summary refs log tree commit diff
path: root/include/dlfcn.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-03-10 09:12:11 +0000
committerRoland McGrath <roland@gnu.org>2003-03-10 09:12:11 +0000
commit8dd569934c2019dff527f0587f3d809efeec7c03 (patch)
tree56541d1fa27eed805f18da76464f4b1be727adb5 /include/dlfcn.h
parente48f96382f237c0edad5c446eca867092406a51d (diff)
downloadglibc-8dd569934c2019dff527f0587f3d809efeec7c03.tar.gz
glibc-8dd569934c2019dff527f0587f3d809efeec7c03.tar.xz
glibc-8dd569934c2019dff527f0587f3d809efeec7c03.zip
2003-03-10 Roland McGrath <roland@redhat.com>
	* dlfcn/Makefile (libdl-routines): Add dladdr1.
	* dlfcn/dladdr1.c: New file.
	* dlfcn/dlfcn.h [__USE_GNU]: Declare dladdr1.
	[__USE_GNU] (RTLD_DL_SYMENT, RTLD_DL_LINKMAP): New enum constants.
	* elf/dl-addr.c (_dl_addr): Take new args, a struct link_map ** and
	a const ElfNN_Sym ** to fill in.
	* include/dlfcn.h: Update decl.  Include <link.h>.
	* dlfcn/dladdr.c (dladdr): Update caller.
	* malloc/mtrace.c (tr_where): Likewise.
	* sysdeps/generic/elf/backtracesyms.c: Likewise.
	* sysdeps/generic/elf/backtracesymsfd.c: Likewise.
	* dlfcn/Versions (libdl: GLIBC_2.3.3): New set, add dladdr1.
	* Versions.def (libdl): Define GLIBC_2.3.3 set.
Diffstat (limited to 'include/dlfcn.h')
-rw-r--r--include/dlfcn.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/dlfcn.h b/include/dlfcn.h
index fd1c8a96a2..f0af0fc0f1 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,5 +1,6 @@
 #ifndef _DLFCN_H
 #include <dlfcn/dlfcn.h>
+#include <link.h>		/* For ElfW.  */
 
 /* Internally used flag.  */
 #define __RTLD_DLOPEN	0x80000000
@@ -15,9 +16,12 @@ extern void *__libc_dlsym   (void *__map, __const char *__name);
 extern int   __libc_dlclose (void *__map);
 
 /* Locate shared object containing the given address.  */
-extern int _dl_addr (const void *address, Dl_info *info)
+#ifdef ElfW
+extern int _dl_addr (const void *address, Dl_info *info,
+		     struct link_map **mapp, const ElfW(Sym) **symbolp)
      internal_function;
 libc_hidden_proto (_dl_addr)
+#endif
 
 /* 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