We do not use dl_iterate_phdr, so no need to define it

diff --git a/include/link.h b/include/link.h
index f8e7f62..c3ef6a6 100644 (file)
--- 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 b121a93..d425b5c 100644 (file)
--- 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 f69f70b..bdf033b 100644 (file)
--- 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