diff options
Diffstat (limited to 'libc/elf/dl-load.c')
| -rw-r--r-- | libc/elf/dl-load.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libc/elf/dl-load.c b/libc/elf/dl-load.c index 3db7d5b46..62e03d187 100644 --- a/libc/elf/dl-load.c +++ b/libc/elf/dl-load.c @@ -342,13 +342,7 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, if ((len = is_dst (start, name, "ORIGIN", is_path, INTUSE(__libc_enable_secure))) != 0) { -#ifndef SHARED - if (l == NULL) - repl = _dl_get_origin (); - else -#endif - repl = l->l_origin; - + repl = l->l_origin; check_for_trusted = (INTUSE(__libc_enable_secure) && l->l_type == lt_executable); } @@ -1495,7 +1489,7 @@ cannot allocate TLS data structures for initial thread"); /* The variable lies in the region protected by RELRO. */ if (__mprotect ((void *) p, s, PROT_READ|PROT_WRITE) < 0) { - errstring = N_("cannot change memory protection"); + errstring = N_("cannot change memory protections"); goto call_lose_errno; } __stack_prot |= PROT_READ|PROT_WRITE|PROT_EXEC; |