This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/nacl-port/master updated. 6d46ff3dad0f220229ba2a6151e7e6c5476a4932
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 Mar 2014 19:43:28 -0000
- Subject: GNU C Library master sources branch roland/nacl-port/master updated. 6d46ff3dad0f220229ba2a6151e7e6c5476a4932
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/nacl-port/master has been updated
via 6d46ff3dad0f220229ba2a6151e7e6c5476a4932 (commit)
via b6561026ab333cbc88dcf440da230e48c3e0a697 (commit)
via d1718a99c06a763ee4896bfad798040011e6445c (commit)
from 11318913122b29322b4b1a130ad9932fbcd2f12e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6d46ff3dad0f220229ba2a6151e7e6c5476a4932
commit 6d46ff3dad0f220229ba2a6151e7e6c5476a4932
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Mar 14 12:43:16 2014 -0700
Working dynamic linking.
diff --git a/sysdeps/nacl/dl-map-segments.h b/sysdeps/nacl/dl-map-segments.h
new file mode 100644
index 0000000..a5b7846
--- /dev/null
+++ b/sysdeps/nacl/dl-map-segments.h
@@ -0,0 +1,223 @@
+/* Map in a shared object's segments. NaCl version.
+ Copyright (C) 2014 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <assert.h>
+#include <dl-load.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <unistd.h>
+
+
+/* This is basically pread, but with iteration after short reads. */
+static bool
+read_in_data (int fd, void *data, size_t len, off_t pos)
+{
+ if (__glibc_unlikely (__lseek (fd, pos, SEEK_SET) == (off_t) -1))
+ return true;
+ while (len > 0)
+ {
+ ssize_t n = __read (fd, data, len);
+ if (__glibc_unlikely (n < 0))
+ return true;
+ if (__glibc_unlikely (n == 0))
+ {
+ errno = EFTYPE;
+ return true;
+ }
+ data += n;
+ len -= n;
+ }
+ return false;
+}
+
+static int
+dyncode_create (void *dst, const void *src, size_t len)
+{
+ /* XXX */
+ return ENOSYS;
+}
+
+/* XXX to be replaced by use of new IRT interface */
+static uintptr_t
+choose_location (uintptr_t hint, size_t total_length,
+ const struct loadcmd loadcmds[], size_t nloadcmds)
+{
+ assert (loadcmds[0].prot & PROT_EXEC);
+ assert (loadcmds[0].allocend % 0x10000 == 0);
+
+ static uintptr_t next_start = 0x4000000;
+ uintptr_t start = next_start;
+ next_start += loadcmds[0].allocend - loadcmds[0].mapstart;
+
+ return start;
+}
+
+static const char *
+_dl_map_segments (struct link_map *l, int fd,
+ const ElfW(Ehdr) *header, int type,
+ const struct loadcmd loadcmds[], size_t nloadcmds,
+ const size_t maplength, bool has_holes,
+ struct link_map *loader)
+{
+ if (__builtin_expect (type, ET_DYN) == ET_DYN)
+ {
+ /* This is a position-independent shared object. Let the system
+ choose where to place it.
+
+ As a refinement, sometimes we have an address that we would
+ prefer to map such objects at; but this is only a preference,
+ the OS can do whatever it likes. */
+ ElfW(Addr) mappref
+ = (ELF_PREFERRED_ADDRESS (loader, maplength,
+ loadcmds[0].mapstart & GLRO(dl_use_load_bias))
+ - MAP_BASE_ADDR (l));
+
+ ElfW(Addr) mapstart = choose_location (mappref, maplength,
+ loadcmds, nloadcmds);
+
+ l->l_addr = mapstart - loadcmds[0].mapstart;
+ }
+
+ /* Remember which part of the address space this object uses. */
+ l->l_map_start = loadcmds[0].mapstart + l->l_addr;
+ l->l_map_end = l->l_map_start + maplength;
+ l->l_contiguous = !has_holes;
+
+ for (const struct loadcmd *c = loadcmds; c < &loadcmds[nloadcmds]; ++c)
+ if (__glibc_likely (c->mapend > c->mapstart))
+ {
+ /* Unlike POSIX mmap, NaCl's mmap does not reliably handle COW
+ faults in the remainder of the final partial page. So to get
+ the expected behavior for the unaligned boundary between data
+ and bss, it's necessary to allocate the final partial page of
+ data as anonymous memory rather than mapping it from the file. */
+
+ size_t maplen = c->mapend - c->mapstart;
+ if (c->mapend > c->dataend && c->allocend > c->dataend)
+ maplen = (c->dataend & -GLRO(dl_pagesize)) - c->mapstart;
+
+ /* Map the segment contents from the file. */
+ if (__glibc_unlikely (__mmap ((void *) (l->l_addr + c->mapstart),
+ maplen, c->prot,
+ MAP_FIXED|MAP_COPY|MAP_FILE,
+ fd, c->mapoff)
+ == MAP_FAILED))
+ {
+ switch (errno)
+ {
+ case EINVAL:
+ case ENOTSUP:
+ case ENOSYS:
+ break;
+ default:
+ return DL_MAP_SEGMENTS_ERROR_MAP_SEGMENT;
+ }
+
+ /* No mmap support for this file. */
+ if (c->prot & PROT_EXEC)
+ {
+ /* Read the data into a temporary buffer. */
+ const size_t len = c->mapend - c->mapstart;
+ void *data = __mmap (NULL, len, PROT_READ | PROT_WRITE,
+ MAP_ANON|MAP_PRIVATE, -1, 0);
+ if (__glibc_unlikely (data == MAP_FAILED))
+ return DL_MAP_SEGMENTS_ERROR_MAP_ZERO_FILL;
+ int error
+ = dyncode_create ((void *) (l->l_addr + c->mapstart),
+ data, len);
+ __munmap (data, len);
+ if (__glibc_unlikely (error))
+ {
+ errno = error;
+ return DL_MAP_SEGMENTS_ERROR_MAP_SEGMENT;
+ }
+ }
+ else
+ {
+ /* Allocate the pages. */
+ if (__mmap ((void *) (l->l_addr + c->mapstart),
+ c->mapend - c->mapstart, c->prot | PROT_WRITE,
+ MAP_FIXED|MAP_ANON|MAP_PRIVATE, -1, 0)
+ == MAP_FAILED)
+ return DL_MAP_SEGMENTS_ERROR_MAP_ZERO_FILL;
+ /* Now read in the data. */
+ if (read_in_data (fd, (void *) (l->l_addr + c->mapstart),
+ c->dataend - c->mapstart, c->mapoff))
+ return DL_MAP_SEGMENTS_ERROR_MAP_SEGMENT;
+ /* Now that we've filled the pages, reset the page
+ protections to what they should be. */
+ if (!(c->prot & PROT_WRITE)
+ && __mprotect ((void *) (l->l_addr + c->mapstart),
+ c->mapend - c->mapstart, c->prot) < 0)
+ return DL_MAP_SEGMENTS_ERROR_MPROTECT;
+ }
+ }
+ else if (c->allocend > c->dataend)
+ {
+ /* Extra zero pages should appear at the end of this segment,
+ after the data mapped from the file. */
+
+ uintptr_t allocend = c->mapend;
+ if (c->mapend > c->dataend)
+ {
+ /* The final data page was partial. So we didn't map it in.
+ Instead, we must allocate an anonymous page to fill. */
+ if (c->prot & PROT_WRITE)
+ /* Do the whole allocation right here. */
+ allocend = c->allocend;
+ if (__mmap ((void *) (l->l_addr + c->mapstart + maplen),
+ allocend - (c->mapstart + maplen), c->prot,
+ MAP_FIXED|MAP_ANON|MAP_PRIVATE, -1, 0)
+ == MAP_FAILED)
+ return DL_MAP_SEGMENTS_ERROR_MAP_ZERO_FILL;
+ if (read_in_data (fd,
+ (void *) (l->l_addr + c->mapstart + maplen),
+ c->dataend & (GLRO(dl_pagesize) - 1),
+ c->mapoff + maplen))
+ return DL_MAP_SEGMENTS_ERROR_MAP_SEGMENT;
+ /* Now that we've filled the page, reset its
+ protections to what they should be. */
+ if (!(c->prot & PROT_WRITE)
+ && __mprotect ((void *) (l->l_addr + c->mapstart + maplen),
+ c->mapend - (c->mapstart + maplen),
+ c->prot) < 0)
+ return DL_MAP_SEGMENTS_ERROR_MPROTECT;
+ }
+
+ /* Now allocate the pure zero-fill pages. */
+ if (allocend < c->allocend
+ && (__mmap ((void *) (l->l_addr + c->mapstart + allocend),
+ c->allocend - (c->mapstart + allocend), c->prot,
+ MAP_FIXED|MAP_ANON|MAP_PRIVATE, -1, 0)
+ == MAP_FAILED))
+ return DL_MAP_SEGMENTS_ERROR_MAP_ZERO_FILL;
+ }
+
+ _dl_postprocess_loadcmd (l, header, c);
+
+ _dl_debug_printf ("XXX '%s' load[%u] at [%x,%x)\n",
+ l->l_name, c - loadcmds,
+ l->l_addr + c->mapstart, l->l_addr + c->allocend);
+ }
+
+ /* Notify ELF_PREFERRED_ADDRESS that we have to load this one
+ fixed. */
+ ELF_FIXED_ADDRESS (loader, c->mapstart);
+
+ return NULL;
+}
diff --git a/sysdeps/nacl/dl-sysdep.c b/sysdeps/nacl/dl-sysdep.c
index 7e6a092..0366274 100644
--- a/sysdeps/nacl/dl-sysdep.c
+++ b/sysdeps/nacl/dl-sysdep.c
@@ -18,13 +18,14 @@
#ifdef SHARED
-#include <assert.h>
-#include <ldsodefs.h>
-#include <stdint.h>
+# include <assert.h>
+# include <ldsodefs.h>
+# include <stdint.h>
+# include <nacl-interfaces.h>
/* NaCl's elf32.h is incompatible with the real <elf.h>. */
-#define NATIVE_CLIENT_SRC_INCLUDE_ELF32_H_
-#include <native_client/src/untrusted/nacl/nacl_startup.h>
+# define NATIVE_CLIENT_SRC_INCLUDE_ELF32_H_
+# include <native_client/src/untrusted/nacl/nacl_startup.h>
/* The RTLD_START code sets up the pointer that gets to these
macros as COOKIE to point to two words:
@@ -32,7 +33,7 @@
[1] the stack base
*/
-#define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
+# define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
do { \
uint32_t *_info = ((void **) (cookie))[0]; \
(argc) = nacl_startup_argc (_info); \
@@ -41,7 +42,7 @@
(auxp) = nacl_startup_auxv (_info); \
} while (0)
-#define DL_STACK_END(cookie) (((void **) (cookie))[1])
+# define DL_STACK_END(cookie) (((void **) (cookie))[1])
/* This is called from the entry point (_start), defined by the RTLD_START
macro in the machine-specific dl-machine.h file. At this point, dynamic
@@ -78,6 +79,8 @@ _dl_start_user (void (*user_entry) (uint32_t info[]), uint32_t info[])
(*user_entry) (info);
}
+# define DL_SYSDEP_INIT __nacl_initialize_interfaces ()
+
#endif /* SHARED */
#include <elf/dl-sysdep.c>
diff --git a/sysdeps/nacl/dl-unmap-segments.h b/sysdeps/nacl/dl-unmap-segments.h
new file mode 100644
index 0000000..97e14e9
--- /dev/null
+++ b/sysdeps/nacl/dl-unmap-segments.h
@@ -0,0 +1,57 @@
+/* Unmap a shared object's segments. NaCl version.
+ Copyright (C) 2014 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _DL_UNMAP_SEGMENTS_H
+#define _DL_UNMAP_SEGMENTS_H 1
+
+#include <link.h>
+#include <sys/mman.h>
+
+/* There is always a big gap between the executable segment and the
+ data segments. Other code segments and data pages lie in there.
+ So we must unmap each segment individually. */
+
+static void __always_inline
+_dl_unmap_segments (struct link_map *l)
+{
+ /* Normally l_phdr points into the RODATA segment, which we will unmap in
+ one iteration of the loop. So we cannot use it directly throughout. */
+
+ struct { void *start; size_t size; } segments[l->l_phnum], *seg = segments;
+
+ for (const ElfW(Phdr) *ph = l->l_phdr; ph < &l->l_phdr[l->l_phnum]; ++ph)
+ if (ph->p_type == PT_LOAD)
+ {
+ seg->start = (void *) (l->l_addr + ph->p_vaddr);
+ seg->size = l->l_map_end - l->l_map_start;
+ if (seg > segments && seg[-1].start + seg[-1].size == seg->start)
+ /* Coalesce two adjacent segments into one munmap call. */
+ seg[-1].size += seg->size;
+ else
+ ++seg;
+ }
+
+ do
+ {
+ --seg;
+ __munmap (seg->start, seg->size);
+ }
+ while (seg > segments);
+}
+
+#endif /* dl-unmap-segments.h */
diff --git a/sysdeps/nacl/init-first.c b/sysdeps/nacl/init-first.c
new file mode 100644
index 0000000..798e9ca
--- /dev/null
+++ b/sysdeps/nacl/init-first.c
@@ -0,0 +1,27 @@
+/* Initialization code run first thing by the ELF startup code. NaCl version.
+ Copyright (C) 2014 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifdef SHARED
+
+# include <nacl-interfaces.h>
+
+# define VDSO_SETUP __nacl_initialize_interfaces
+
+#endif
+
+#include <csu/init-first.c>
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b6561026ab333cbc88dcf440da230e48c3e0a697
commit b6561026ab333cbc88dcf440da230e48c3e0a697
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Mar 14 12:41:52 2014 -0700
No longer using .eh_frame, so don't emit it from assembly code.
diff --git a/sysdeps/arm/nacl/sysdep.h b/sysdeps/arm/nacl/sysdep.h
index 71c3e13..2671897 100644
--- a/sysdeps/arm/nacl/sysdep.h
+++ b/sysdeps/arm/nacl/sysdep.h
@@ -1,5 +1,5 @@
/* Assembler macros for ARM/NaCl.
- Copyright (C) 2013 Free Software Foundation, Inc.
+ Copyright (C) 2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -42,10 +42,6 @@
#ifdef __ASSEMBLER__
-/* We use DWARF2 CFI, not EABI unwind info. */
-# undef CFI_SECTIONS
-# define CFI_SECTIONS .cfi_sections .eh_frame, .debug_frame
-
# undef eabi_fnstart
# define eabi_fnstart
# undef eabi_fnend
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d1718a99c06a763ee4896bfad798040011e6445c
commit d1718a99c06a763ee4896bfad798040011e6445c
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Mar 12 13:20:44 2014 -0700
Update for ARM setjmp changes in main tree.
diff --git a/sysdeps/arm/nacl/include/bits/setjmp.h b/sysdeps/arm/nacl/include/bits/setjmp.h
index 59c83cd..fab1022 100644
--- a/sysdeps/arm/nacl/include/bits/setjmp.h
+++ b/sysdeps/arm/nacl/include/bits/setjmp.h
@@ -1,5 +1,5 @@
/* Private jmp_buf-related definitions. NaCl/ARM version.
- Copyright (C) 2013 Free Software Foundation, Inc.
+ Copyright (C) 2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -30,9 +30,9 @@
The generic ARM definition includes r9 (v6), which is not
permitted under NaCl. We add r3 even though it's call-clobbered,
just to keep the size the same as the generic version. */
-#define JMP_BUF_REGLIST {r3, v1-v5, sl, fp, sp, lr}
+#define JMP_BUF_REGLIST {r3, v1-v5, sl, fp}
/* Index of __jmp_buf where the sp register resides. */
-#define __JMP_BUF_SP 8
+#define __JMP_BUF_SP 0
#endif /* include/bits/setjmp.h */
-----------------------------------------------------------------------
Summary of changes:
sysdeps/arm/nacl/include/bits/setjmp.h | 6 +-
sysdeps/arm/nacl/sysdep.h | 6 +-
sysdeps/nacl/dl-map-segments.h | 223 +++++++++++++++++++++++++++
sysdeps/nacl/dl-sysdep.c | 17 ++-
sysdeps/nacl/dl-unmap-segments.h | 57 +++++++
sysdeps/nacl/{bits/param.h => init-first.c} | 14 +-
6 files changed, 303 insertions(+), 20 deletions(-)
create mode 100644 sysdeps/nacl/dl-map-segments.h
create mode 100644 sysdeps/nacl/dl-unmap-segments.h
copy sysdeps/nacl/{bits/param.h => init-first.c} (73%)
hooks/post-receive
--
GNU C Library master sources