diff options
Diffstat (limited to 'dlfcn')
| -rw-r--r-- | dlfcn/Makefile | 2 | ||||
| -rw-r--r-- | dlfcn/Versions | 3 | ||||
| -rw-r--r-- | dlfcn/dladdr.c | 4 | ||||
| -rw-r--r-- | dlfcn/dladdr1.c | 35 | ||||
| -rw-r--r-- | dlfcn/dlfcn.h | 19 |
5 files changed, 59 insertions, 4 deletions
diff --git a/dlfcn/Makefile b/dlfcn/Makefile index 40eb7888cc..d11336140e 100644 --- a/dlfcn/Makefile +++ b/dlfcn/Makefile @@ -19,7 +19,7 @@ subdir := dlfcn headers := bits/dlfcn.h dlfcn.h extra-libs := libdl -libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr eval +libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr dladdr1 eval distribute := dlopenold.c glreflib1.c glreflib2.c failtestmod.c eval.c \ defaultmod1.c defaultmod2.c errmsg1mod.c modatexit.c \ modcxaatexit.c modstatic.c \ diff --git a/dlfcn/Versions b/dlfcn/Versions index b99822ad08..ca44a4678f 100644 --- a/dlfcn/Versions +++ b/dlfcn/Versions @@ -5,4 +5,7 @@ libdl { GLIBC_2.1 { dlopen; dlvsym; } + GLIBC_2.3.3 { + dladdr1; + } } diff --git a/dlfcn/dladdr.c b/dlfcn/dladdr.c index 2ebc652d3a..b5490e5a8d 100644 --- a/dlfcn/dladdr.c +++ b/dlfcn/dladdr.c @@ -1,5 +1,5 @@ /* Locate the shared object symbol nearest a given address. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2003 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 @@ -22,5 +22,5 @@ int dladdr (const void *address, Dl_info *info) { - return _dl_addr (address, info); + return _dl_addr (address, info, NULL, NULL); } diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c new file mode 100644 index 0000000000..51b53b5861 --- /dev/null +++ b/dlfcn/dladdr1.c @@ -0,0 +1,35 @@ +/* Locate the shared object symbol nearest a given address. + Copyright (C) 2003 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <dlfcn.h> + +int +dladdr1 (const void *address, Dl_info *info, void **extra, int flags) +{ + switch (flags) + { + default: /* Make this an error? */ + case 0: + return _dl_addr (address, info, NULL, NULL); + case RTLD_DL_SYMENT: + return _dl_addr (address, info, NULL, (const ElfW(Sym) **) extra); + case RTLD_DL_LINKMAP: + return _dl_addr (address, info, (struct link_map **) extra, NULL); + } +} diff --git a/dlfcn/dlfcn.h b/dlfcn/dlfcn.h index 6f88a897ce..6c8e4abcc4 100644 --- a/dlfcn/dlfcn.h +++ b/dlfcn/dlfcn.h @@ -1,5 +1,5 @@ /* User functions for run-time dynamic loading. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999,2000,2001,2003 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 @@ -83,6 +83,23 @@ typedef struct /* Fill in *INFO with the following information about ADDRESS. Returns 0 iff no shared object's segments contain that address. */ extern int dladdr (__const void *__address, Dl_info *__info) __THROW; + +/* Same as `dladdr', but additionally sets *EXTRA_INFO according to FLAGS. */ +extern int dladdr1 (__const void *__address, Dl_info *__info, + void **__extra_info, int __flags) __THROW; + +/* These are the possible values for the FLAGS argument to `dladdr1'. + This indicates what extra information is stored at *EXTRA_INFO. + It may also be zero, in which case the EXTRA_INFO argument is not used. */ +enum + { + /* Matching symbol table entry (const ElfNN_Sym *). */ + RTLD_DL_SYMENT = 1, + + /* The object containing the address (struct link_map *). */ + RTLD_DL_LINKMAP = 2 + }; + #endif __END_DECLS |