summaryrefslogtreecommitdiff
path: root/libexec/ld.so
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-11-24 05:50:09 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-11-24 05:50:09 +0000
commit6692f2e4710440c94065a95903e81ede90af57d7 (patch)
tree182bed00d90f253812905778b45fa9c64c8430ff /libexec/ld.so
parent6026463f4b42beea52dd7aab3c5c5843c135ac11 (diff)
Make the scope of the symbol caching variables added in 1.49 a bit larger so
that these don't get reset for every relocation being processed (oops). ok guenther@ deraadt@
Diffstat (limited to 'libexec/ld.so')
-rw-r--r--libexec/ld.so/powerpc/rtld_machine.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/ld.so/powerpc/rtld_machine.c b/libexec/ld.so/powerpc/rtld_machine.c
index 7562305d9e9..9aa5152f257 100644
--- a/libexec/ld.so/powerpc/rtld_machine.c
+++ b/libexec/ld.so/powerpc/rtld_machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtld_machine.c,v 1.52 2014/07/05 17:06:18 miod Exp $ */
+/* $OpenBSD: rtld_machine.c,v 1.53 2014/11/24 05:50:08 miod Exp $ */
/*
* Copyright (c) 1999 Dale Rahn
@@ -88,6 +88,8 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz)
Elf32_Addr *plttable;
Elf32_Addr *pltinfo;
Elf32_Addr *first_rela;
+ Elf32_Addr prev_value = 0, prev_ooff = 0;
+ const Elf32_Sym *prev_sym = NULL;
loff = object->obj_base;
numrela = object->Dyn.info[relasz] / sizeof(Elf32_Rela);
@@ -202,8 +204,6 @@ _dl_printf("object relocation size %x, numrela %x\n",
const Elf32_Sym *sym, *this;
const char *symn;
int type;
- Elf32_Addr prev_value = 0, prev_ooff = 0;
- const Elf32_Sym *prev_sym = NULL;
if (ELF32_R_SYM(relas->r_info) == 0xffffff)
continue;