[uClibc-cvs] CVS update of uClibc (include/link.h ldso/ldso/frv/dl-sysdep.h ldso/ldso/frv/elfinterp.c)

[Erik Andersen]

    Date: Tuesday, September 7, 2004 @ 03:04:01
  Author: andersen
    Path: /var/cvs/uClibc

Modified: include/link.h (1.3 -> 1.4) ldso/ldso/frv/dl-sysdep.h (1.4 ->
          1.5) ldso/ldso/frv/elfinterp.c (1.5 -> 1.6)

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


Index: uClibc/include/link.h
diff -u uClibc/include/link.h:1.3 uClibc/include/link.h:1.4
--- uClibc/include/link.h:1.3	Wed Sep 26 23:21:09 2001
+++ uClibc/include/link.h	Tue Sep  7 03:04:00 2004
@@ -92,24 +92,4 @@
     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 */
Index: uClibc/ldso/ldso/frv/dl-sysdep.h
diff -u uClibc/ldso/ldso/frv/dl-sysdep.h:1.4 uClibc/ldso/ldso/frv/dl-sysdep.h:1.5
--- uClibc/ldso/ldso/frv/dl-sysdep.h:1.4	Thu Aug 26 17:39:02 2004
+++ uClibc/ldso/ldso/frv/dl-sysdep.h	Tue Sep  7 03:04:01 2004
@@ -172,7 +172,6 @@
  		       (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
Index: uClibc/ldso/ldso/frv/elfinterp.c
diff -u uClibc/ldso/ldso/frv/elfinterp.c:1.5 uClibc/ldso/ldso/frv/elfinterp.c:1.6
--- uClibc/ldso/ldso/frv/elfinterp.c:1.5	Thu Aug 26 17:39:02 2004
+++ uClibc/ldso/ldso/frv/elfinterp.c	Tue Sep  7 03:04:01 2004
@@ -447,26 +447,3 @@
 # 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