Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add combreloc code here too.

This commit is contained in:
mycroft 2002-09-21 17:51:44 +00:00
parent 2841e1341c
commit c3a2d8b7ba
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libexec/ld.elf_so/arch/alpha/alpha_reloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: alpha_reloc.c,v 1.19 2002/09/14 23:21:13 thorpej Exp $ */
/* $NetBSD: alpha_reloc.c,v 1.20 2002/09/21 17:51:44 mycroft Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@ -195,6 +195,11 @@ _rtld_relocate_nonplt_objects(obj, self)
bool self;
{
const Elf_Rela *rela;
#define COMBRELOC
#ifdef COMBRELOC
unsigned long lastsym = -1;
#endif
Elf_Addr target;
if (self)
return 0;
@ -215,12 +220,21 @@ _rtld_relocate_nonplt_objects(obj, self)
case R_TYPE(REFQUAD):
case R_TYPE(GLOB_DAT):
def = _rtld_find_symdef(symnum, obj, &defobj, false);
if (def == NULL)
return -1;
#ifdef COMBRELOC
if (symnum != lastsym) {
#endif
def = _rtld_find_symdef(symnum, obj, &defobj,
false);
if (def == NULL)
return -1;
target = (Elf_Addr)(defobj->relocbase +
def->st_value);
#ifdef COMBRELOC
lastsym = symnum;
}
#endif
tmp = (Elf_Addr)(defobj->relocbase + def->st_value) +
rela->r_addend;
tmp = target + rela->r_addend;
if (__predict_true(RELOC_ALIGNED_P(where))) {
if (*where != tmp)
*where = tmp;