diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2007-03-07 18:50:03 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2007-03-07 18:50:03 +0000 |
| commit | 63c74067f6dde8598e89dde8ee18c1dc52ae6ebc (patch) | |
| tree | 528065cd704d65c5b5c4a3b96b89c623ef805469 /libexec/ld.so | |
| parent | a79c2c43999d2c5c5ca6f84d3f0a4f036d0e21b4 (diff) | |
Put the workaround back in because gcc fails to build otherwise. ok deraadt@
Diffstat (limited to 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/sh/rtld_machine.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libexec/ld.so/sh/rtld_machine.c b/libexec/ld.so/sh/rtld_machine.c index 7538fcf958d..9865e2af09e 100644 --- a/libexec/ld.so/sh/rtld_machine.c +++ b/libexec/ld.so/sh/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.6 2007/03/06 21:39:58 drahn Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.7 2007/03/07 18:50:02 drahn Exp $ */ /* * Copyright (c) 2004 Dale Rahn @@ -666,12 +666,20 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz) value += loff; } else { this = NULL; +#if 0 ooff = _dl_find_symbol_bysym(object, ELF_R_SYM(rels->r_info), &this, SYM_SEARCH_ALL|SYM_WARNNOTFOUND| ((type == R_TYPE(JMP_SLOT)) ? SYM_PLT : SYM_NOTPLT), sym, NULL); +#else + ooff = _dl_find_symbol_bysym(object, + ELF_R_SYM(rels->r_info), &this, + SYM_SEARCH_ALL|SYM_WARNNOTFOUND| + SYM_PLT, + sym, NULL); +#endif if (this == NULL) { resolve_failed: if (ELF_ST_BIND(sym->st_info) != |