diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-07-05 06:27:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-07-05 06:27:44 +0000 |
| commit | 656554001c3b532f42a7d0c733b91c785615eec4 (patch) | |
| tree | b6c4f067717e076a154a280d8beb669c3efc953f /ldso/include/dl-elf.h | |
| parent | 5e901f9e6bc1833d4e09335faa5967f505596194 (diff) | |
revert fdpic patch so we can merge it in bit by bit
Diffstat (limited to 'ldso/include/dl-elf.h')
| -rw-r--r-- | ldso/include/dl-elf.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index 9e364d680..de404aec1 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -94,12 +94,10 @@ extern void _dl_protect_relro (struct elf_resolve *l); #define DYNAMIC_SIZE (DT_NUM+OS_NUM+ARCH_NUM) -extern void _dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, - DL_LOADADDR_TYPE load_off); +extern void _dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, ElfW(Addr) load_off); static __always_inline -void __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, - DL_LOADADDR_TYPE load_off) +void __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, ElfW(Addr) load_off) { for (; dpnt->d_tag; dpnt++) { if (dpnt->d_tag < DT_NUM) { @@ -141,8 +139,7 @@ void __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void #define ADJUST_DYN_INFO(tag, load_off) \ do { \ if (dynamic_info[tag]) \ - dynamic_info[tag] = (unsigned long)DL_RELOC_ADDR (dynamic_info[tag], \ - load_off); \ + dynamic_info[tag] += load_off; \ } while(0) ADJUST_DYN_INFO(DT_HASH, load_off); ADJUST_DYN_INFO(DT_PLTGOT, load_off); |