Remade for alpha-1.93cvs/libc-960802

4 files changed, 5 insertions, 2 deletions

diff --git a/elf/dl-cache.c b/elf/dl-cache.c
index a282d31..6cd454c 100644
--- a/elf/dl-cache.c
+++ b/elf/dl-cache.c
@@ -18,6 +18,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #include <link.h>
+#include <stddef.h>
 #include <sys/mman.h>
 
 /* System-dependent function to read a file's whole contents
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 2785592..16e0379 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -18,6 +18,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #include <link.h>
+#include <stddef.h>
 
 
 /* The global scope we will use for symbol lookups.
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index 45b6b2d..e4bb022 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -24,7 +24,7 @@ Cambridge, MA 02139, USA.  */
 
 /* Read the dynamic section at DYN and fill in INFO with indices DT_*.  */
 
-static inline void
+static inline void __attribute__ ((unused))
 elf_get_dynamic_info (ElfW(Dyn) *dyn, ElfW(Dyn) *info[DT_NUM + DT_PROCNUM])
 {
   unsigned int i;
diff --git a/elf/rtld.c b/elf/rtld.c
index 3657efd..fe5d269 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -245,7 +245,8 @@ of this helper program; chances are you did not intend to run this program.\n",
   if (mode == verify)
     /* We were called just to verify that this is a dynamic executable
        using us as the program interpreter.  */
-    _exit (strcmp (_dl_rtld_map.l_libname, _dl_rtld_map.l_name)
+    _exit ((strcmp (_dl_rtld_map.l_libname, _dl_rtld_map.l_name) ||
+	    l->l_ld == NULL)
 	   ? EXIT_FAILURE : EXIT_SUCCESS);
 
   /* Extract the contents of the dynamic section for easy access.  */