diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2013-01-16 07:34:59 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2013-01-16 07:34:59 -0800 |
| commit | adc4a3ee6aa83aace8c2ea8c69113290b9af372c (patch) | |
| tree | 6cd54562a0313fd53a5327bfcd20b15302c6d359 | |
| parent | 634c5d8fb6419b1aa2ff95e704fa3f57f5bf1ccd (diff) | |
| download | glibc-hjl/size/master.tar.gz glibc-hjl/size/master.tar.xz glibc-hjl/size/master.zip | |
Remove R_X86_64_SIZE hjl/size/master
| -rw-r--r-- | ChangeLog.size | 5 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 13 |
2 files changed, 6 insertions, 12 deletions
diff --git a/ChangeLog.size b/ChangeLog.size index 8a5feb7f5d..de3846307c 100644 --- a/ChangeLog.size +++ b/ChangeLog.size @@ -4,6 +4,5 @@ * sysdeps/i386/dl-machine.h (elf_machine_rel): Handle R_386_SIZE32. (elf_machine_rela): Likewise. - * sysdeps/x86_64/dl-machine.h (R_X86_64_SIZE): New macro. - (elf_machine_rela): Handle R_X86_64_SIZE64, R_X86_64_SIZE - and R_X86_64_SIZE32. + * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Handle + R_X86_64_SIZE64 and R_X86_64_SIZE32. diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index e9a7cf4abf..4768c69544 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -190,13 +190,6 @@ _dl_start_user:\n\ /* The x86-64 never uses Elf64_Rel/Elf32_Rel relocations. */ #define ELF_MACHINE_NO_REL 1 -/* Size relocation. */ -#ifdef __ILP32__ -# define R_X86_64_SIZE R_X86_64_SIZE32 -#else -# define R_X86_64_SIZE R_X86_64_SIZE64 -#endif - /* We define an initialization function. This is called very early in _dl_sysdep_start. */ #define DL_PLATFORM_INIT dl_platform_init () @@ -300,9 +293,11 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, *(Elf64_Addr *) (uintptr_t) reloc_addr = (Elf64_Addr) sym->st_size + reloc->r_addend; break; -# endif - case R_X86_64_SIZE: + case R_X86_64_SIZE32: +# else + case R_X86_64_SIZE64: +# endif /* Set to symbol size plus addend. */ value = sym->st_size; # endif |