aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-08-02 05:27:50 +0000
committerRoland McGrath <roland@gnu.org>1996-08-02 05:27:50 +0000
commite75154a665018d5756196275634704c95476ea6b (patch)
tree0c8f889a29304e0cc86611c629f1b620d16cf8a7 /elf
parent9ebb936d991a6e08da05e5a942465d64cac39f86 (diff)
downloadglibc-e75154a665018d5756196275634704c95476ea6b.zip
glibc-e75154a665018d5756196275634704c95476ea6b.tar.gz
glibc-e75154a665018d5756196275634704c95476ea6b.tar.bz2
Remade for alpha-1.93cvs/libc-960802
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-cache.c1
-rw-r--r--elf/dl-runtime.c1
-rw-r--r--elf/dynamic-link.h2
-rw-r--r--elf/rtld.c3
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. */