diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-07-02 00:11:45 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-07-02 00:11:45 +0000 |
commit | 94ba134cf6431dad0aaece271a16761bc793d490 (patch) | |
tree | b2b77be695fb5add3d132101bf25f2be915f3139 /libc/elf/dl-load.c | |
parent | f42fd2771adb82cb5f34ba9e80a607975111da48 (diff) |
Merge changes between r23363 and r23421 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@23422 7b3dc134-2b1b-0410-93df-9e9f96275f8d
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; |