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

Handle unaligned relocations, and RELATIVE relocs with non-zero addends.

Browse Source 
This gets binaries linked against libstdc++ working (FSVO "working").
This commit is contained in:
scw 2003-04-21 11:54:46 +00:00
parent 16435cdb98
commit 0b8f02edad
1 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libexec/ld.elf_so/arch/sh5/mdreloc.c
View File

@ -1,7 +1,8 @@
/* $NetBSD: mdreloc.c,v 1.2 2003/03/26 14:46:32 scw Exp $ */ /* $NetBSD: mdreloc.c,v 1.3 2003/04/21 11:54:46 scw Exp $ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <string.h>
#include "debug.h" #include "debug.h"
#include "rtld.h" #include "rtld.h"
@ -46,6 +47,30 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
} }
} }
/*
* It is possible for the compiler to emit relocations for unaligned data.
* We handle this situation with these inlines.
*/
#define RELOC_ALIGNED_P(x) \
(((intptr_t)(x) & (sizeof(void *) - 1)) == 0)
static __inline Elf_Addr
load_ptr(void *where)
{
Elf_Addr res;
memcpy(&res, where, sizeof(res));
return (res);
}
static __inline void
store_ptr(void *where, Elf_Addr val)
{
memcpy(where, &val, sizeof(val));
}
int int
_rtld_relocate_nonplt_objects(const Obj_Entry *obj) _rtld_relocate_nonplt_objects(const Obj_Entry *obj)
{ {
@ -75,15 +100,35 @@ _rtld_relocate_nonplt_objects(const Obj_Entry *obj)
rela->r_addend); rela->r_addend);
if (def->st_other & STO_SH5_ISA32) if (def->st_other & STO_SH5_ISA32)
tmp |= 1; tmp |= 1;
if (*where != tmp) if (__predict_true(RELOC_ALIGNED_P(where))) {
*where = tmp; if (*where != tmp)
*where = tmp;
} else {
if (load_ptr(where) != tmp)
store_ptr(where, tmp);
}
rdbg(("32/GLOB_DAT %s in %s --> %p in %s", rdbg(("32/GLOB_DAT %s in %s --> %p in %s",
obj->strtab + obj->symtab[symnum].st_name, obj->strtab + obj->symtab[symnum].st_name,
obj->path, (void *)*where, defobj->path)); obj->path, (void *)(intptr_t)tmp, defobj->path));
break; break;
case R_TYPE(RELATIVE): case R_TYPE(RELATIVE):
*where += (Elf_Addr)obj->relocbase; if (__predict_true(RELOC_ALIGNED_P(where))) {
if (__predict_true(rela->r_addend) == 0)
*where += (Elf_Addr)obj->relocbase;
else
*where = (Elf_Addr)obj->relocbase +
rela->r_addend;
} else {
if (__predict_true(rela->r_addend) == 0) {
tmp = load_ptr(where);
tmp += (Elf_Addr)obj->relocbase;
} else {
tmp = (Elf_Addr)obj->relocbase +
rela->r_addend;
}
store_ptr(where, tmp);
}
rdbg(("RELATIVE in %s --> %p", obj->path, rdbg(("RELATIVE in %s --> %p", obj->path,
(void *)*where)); (void *)*where));
break; break;