aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile2
-rw-r--r--elf/dl-open.c2
-rw-r--r--elf/dl-support.c37
3 files changed, 38 insertions, 3 deletions
diff --git a/elf/Makefile b/elf/Makefile
index a19a8b42ba..cf9eaa8cb4 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -69,8 +69,6 @@ $(objpfx)dl-allobjs.so: $(rtld-routines:%=$(objpfx)%.so)
$(reloc-link) $^
# Link together the dynamic linker into a single relocatable object.
-# We use this to produce both the ABI-compliant and Linux-compatible
-# dynamic linker shared objects below.
$(objpfx)librtld.so: $(objpfx)dl-allobjs.so $(common-objpfx)libc_pic.a
$(reloc-link) '-Wl,-(' $^ -lgcc '-Wl,-)'
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 021c4bea74..9dda31e761 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -97,7 +97,7 @@ _dl_open (const char *file, int mode)
else
{
if (_dl_global_scope_alloc <
- _dl_global_scope_end - _dl_global_scope + 2)
+ (size_t) (_dl_global_scope_end - _dl_global_scope + 2))
{
/* Must extend the list. */
struct link_map **new = realloc (_dl_global_scope,
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 50ebfbfe5a..03c9d9c5c7 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -20,6 +20,8 @@ Cambridge, MA 02139, USA. */
#include <assert.h>
#include <fcntl.h>
#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
/* This file defines some things that for the dynamic linker are defined in
rtld.c and dl-sysdep.c in ways appropriate to bootstrap dynamic linking. */
@@ -46,3 +48,38 @@ _dl_sysdep_fatal (void)
{
assert (! "_dl_sysdep_fatal called");
}
+
+/* Read the whole contents of FILE into new mmap'd space with given
+ protections. *SIZEP gets the size of the file. */
+
+void *
+_dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)
+{
+ void *result;
+ struct stat st;
+ int fd = __open (file, O_RDONLY);
+ if (fd < 0)
+ return NULL;
+ if (__fstat (fd, &st) < 0)
+ result = NULL;
+ else
+ {
+ /* Map a copy of the file contents. */
+ result = __mmap (0, st.st_size, prot,
+#ifdef MAP_COPY
+ MAP_COPY
+#else
+ MAP_PRIVATE
+#endif
+#ifdef MAP_FILE
+ | MAP_FILE
+#endif
+ , fd, 0);
+ if (result == (void *) -1)
+ result = NULL;
+ else
+ *sizep = st.st_size;
+ }
+ __close (fd);
+ return result;
+}