diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2011-11-21 15:33:48 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2011-11-23 09:19:28 -0800 |
| commit | f6d3197799e76ef22ddb1407a49ab280ee2ef639 (patch) | |
| tree | cd5fe7d1b73c228b4352acd21012c9408d1a71de | |
| parent | fae04b0637e7728dfbefc470a11e205ab60951e3 (diff) | |
| download | glibc-f6d3197799e76ef22ddb1407a49ab280ee2ef639.tar.gz | |
Add x32 support to dl-irel.h.
| -rw-r--r-- | ChangeLog.x32 | 5 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-irel.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog.x32 b/ChangeLog.x32 index d6adb26deb..b231a36150 100644 --- a/ChangeLog.x32 +++ b/ChangeLog.x32 @@ -1,5 +1,10 @@ 2011-11-21 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/x86_64/dl-irel.h: Replace Elf64_XXX with ElfW(XXX). + Replace ELF64_R_TYPE with ELF32_R_TYPE. + +2011-11-21 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/x86_64/dl-tls.h (dl_tls_index): Replace long with long long. diff --git a/sysdeps/x86_64/dl-irel.h b/sysdeps/x86_64/dl-irel.h index d2d5c0670e..ac90c94828 100644 --- a/sysdeps/x86_64/dl-irel.h +++ b/sysdeps/x86_64/dl-irel.h @@ -28,14 +28,14 @@ static inline void __attribute ((always_inline)) -elf_irela (const Elf64_Rela *reloc) +elf_irela (const ElfW(Rela) *reloc) { - Elf64_Addr *const reloc_addr = (void *) reloc->r_offset; - const unsigned long int r_type = ELF64_R_TYPE (reloc->r_info); + ElfW(Addr) *const reloc_addr = (void *) reloc->r_offset; + const unsigned long int r_type = ELF32_R_TYPE (reloc->r_info); if (__builtin_expect (r_type == R_X86_64_IRELATIVE, 1)) { - Elf64_Addr value = ((Elf64_Addr (*) (void)) reloc->r_addend) (); + ElfW(Addr) value = ((ElfW(Addr) (*) (void)) reloc->r_addend) (); *reloc_addr = value; } else |