summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-09-07 09:04:01 +0000
committerEric Andersen <andersen@codepoet.org>2004-09-07 09:04:01 +0000
commit195bd6441bc6464bc00fa145ebbfadeaf6294914 (patch)
tree29937e55a3c64c844c7b124a762aad11f024bab0
parentcf84d3fc7bb6477cec931e5753b3d1b2f1ded6c6 (diff)
We do not use dl_iterate_phdr, so no need to define it
-rw-r--r--include/link.h20
-rw-r--r--ldso/ldso/frv/dl-sysdep.h1
-rw-r--r--ldso/ldso/frv/elfinterp.c23
3 files changed, 0 insertions, 44 deletions
diff --git a/include/link.h b/include/link.h
index f8e7f629d..c3ef6a6b0 100644
--- a/include/link.h
+++ b/include/link.h
@@ -92,24 +92,4 @@ struct link_map
struct link_map *l_next, *l_prev; /* Chain of loaded objects. */
};
-#ifdef __USE_GNU
-
-struct dl_phdr_info
- {
- ElfW(Addr) dlpi_addr;
- const char *dlpi_name;
- const ElfW(Phdr) *dlpi_phdr;
- ElfW(Half) dlpi_phnum;
- };
-
-__BEGIN_DECLS
-
-extern int dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
- size_t size, void *data),
- void *data) __THROW;
-
-__END_DECLS
-
-#endif
-
#endif /* link.h */
diff --git a/ldso/ldso/frv/dl-sysdep.h b/ldso/ldso/frv/dl-sysdep.h
index b121a934c..d425b5c1c 100644
--- a/ldso/ldso/frv/dl-sysdep.h
+++ b/ldso/ldso/frv/dl-sysdep.h
@@ -172,7 +172,6 @@ while (0)
(TPNT)->loadaddr.got_value) \
: DL_RELOC_ADDR ((SYM)->st_value, (TPNT)->loadaddr))
-/* Make sure dl_iterate_phdr is defined. */
#ifdef __USE_GNU
# include <link.h>
#else
diff --git a/ldso/ldso/frv/elfinterp.c b/ldso/ldso/frv/elfinterp.c
index f69f70b7e..bdf033bae 100644
--- a/ldso/ldso/frv/elfinterp.c
+++ b/ldso/ldso/frv/elfinterp.c
@@ -447,26 +447,3 @@ _dl_parse_copy_information
# include "../../libc/sysdeps/linux/frv/crtreloc.c"
#endif
-#if ! defined LIBDL || (! defined PIC && ! defined __PIC__)
-int
-__dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
- size_t size, void *data), void *data)
-{
- struct elf_resolve *l;
- struct dl_phdr_info info;
- int ret = 0;
-
- for (l = _dl_loaded_modules; l != NULL; l = l->next)
- {
- info.dlpi_addr = l->loadaddr;
- info.dlpi_name = l->libname;
- info.dlpi_phdr = l->ppnt;
- info.dlpi_phnum = l->n_phent;
- ret = callback (&info, sizeof (struct dl_phdr_info), data);
- if (ret)
- break;
- }
-
- return ret;
-}
-#endif