diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2015-07-26 03:08:17 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2015-07-26 03:08:17 +0000 |
| commit | d12026722c5beef719ae2bf363d84b33c2beae75 (patch) | |
| tree | d6e371911e739265772bf0c0b6528142871fb70f /libexec/ld.so | |
| parent | 3978754afd4470887e8583ad9c32d8df12985681 (diff) | |
Copy relocations can't be jump-slot relocations, so delete the test for that.
ok miod@
Diffstat (limited to 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/amd64/rtld_machine.c | 7 | ||||
| -rw-r--r-- | libexec/ld.so/i386/rtld_machine.c | 5 | ||||
| -rw-r--r-- | libexec/ld.so/sparc/rtld_machine.c | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/libexec/ld.so/amd64/rtld_machine.c b/libexec/ld.so/amd64/rtld_machine.c index 3ebbebc72eb..cfba9edcfb5 100644 --- a/libexec/ld.so/amd64/rtld_machine.c +++ b/libexec/ld.so/amd64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.22 2014/05/25 21:27:07 brad Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.23 2015/07/26 03:08:16 guenther Exp $ */ /* * Copyright (c) 2002,2004 Dale Rahn @@ -287,8 +287,7 @@ resolve_failed: Elf_Addr soff; soff = _dl_find_symbol(symn, &srcsym, - SYM_SEARCH_OTHER|SYM_WARNNOTFOUND| - ((type == R_TYPE(JUMP_SLOT)) ? SYM_PLT:SYM_NOTPLT), + SYM_SEARCH_OTHER|SYM_WARNNOTFOUND|SYM_NOTPLT, dstsym, object, NULL); if (srcsym == NULL) goto resolve_failed; @@ -465,7 +464,7 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) } - /* PLT is already RO on i386, no point in mprotecting it, just GOT */ + /* PLT is already RO on amd64, no point in mprotecting it, just GOT */ if (object->got_size != 0) _dl_mprotect((void*)object->got_start, object->got_size, PROT_READ); diff --git a/libexec/ld.so/i386/rtld_machine.c b/libexec/ld.so/i386/rtld_machine.c index 8e309795a23..9d7a4e89976 100644 --- a/libexec/ld.so/i386/rtld_machine.c +++ b/libexec/ld.so/i386/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.29 2013/06/13 04:13:47 brad Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.30 2015/07/26 03:08:16 guenther Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -281,8 +281,7 @@ resolve_failed: Elf_Addr soff; soff = _dl_find_symbol(symn, &srcsym, - SYM_SEARCH_OTHER|SYM_WARNNOTFOUND| - ((type == R_TYPE(JUMP_SLOT)) ? SYM_PLT:SYM_NOTPLT), + SYM_SEARCH_OTHER|SYM_WARNNOTFOUND|SYM_NOTPLT, sym, object, NULL); if (srcsym == NULL) goto resolve_failed; diff --git a/libexec/ld.so/sparc/rtld_machine.c b/libexec/ld.so/sparc/rtld_machine.c index e743d7c8381..d3806a9dad6 100644 --- a/libexec/ld.so/sparc/rtld_machine.c +++ b/libexec/ld.so/sparc/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.38 2014/04/16 10:52:59 guenther Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.39 2015/07/26 03:08:16 guenther Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -290,8 +290,7 @@ resolve_failed: Elf_Addr soff; soff = _dl_find_symbol(symn, &srcsym, - SYM_SEARCH_OTHER|SYM_WARNNOTFOUND| - ((type == R_TYPE(JMP_SLOT)) ? SYM_PLT : SYM_NOTPLT), + SYM_SEARCH_OTHER|SYM_WARNNOTFOUND|SYM_NOTPLT, dstsym, object, NULL); if (srcsym == NULL) goto resolve_failed; |