aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/x86_64
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2013-01-16 20:31:03 -0800
committerH.J. Lu <hjl.tools@gmail.com>2013-01-16 20:31:03 -0800
commit22676eafedd0df276d85ea7c7ef63907d689d6ad (patch)
tree58b907fa84d7432549332de8615907b2de76a665 /sysdeps/x86_64
parent59981e9b0df84aa91c52d21c54a7ed158a356aaa (diff)
downloadglibc-22676eafedd0df276d85ea7c7ef63907d689d6ad.tar
glibc-22676eafedd0df276d85ea7c7ef63907d689d6ad.tar.gz
glibc-22676eafedd0df276d85ea7c7ef63907d689d6ad.tar.bz2
glibc-22676eafedd0df276d85ea7c7ef63907d689d6ad.zip
Implement x86 SIZE32/SIZE64 relocations
Diffstat (limited to 'sysdeps/x86_64')
-rw-r--r--sysdeps/x86_64/dl-machine.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index 660f1aa1e2..4768c69544 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -286,6 +286,21 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
switch (r_type)
{
+# ifndef RTLD_BOOTSTRAP
+# ifdef __ILP32__
+ case R_X86_64_SIZE64:
+ /* Set to symbol size plus addend. */
+ *(Elf64_Addr *) (uintptr_t) reloc_addr
+ = (Elf64_Addr) sym->st_size + reloc->r_addend;
+ break;
+
+ case R_X86_64_SIZE32:
+# else
+ case R_X86_64_SIZE64:
+# endif
+ /* Set to symbol size plus addend. */
+ value = sym->st_size;
+# endif
case R_X86_64_GLOB_DAT:
case R_X86_64_JUMP_SLOT:
*reloc_addr = value + reloc->r_addend;
@@ -394,6 +409,11 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
relocation updates the whole 64-bit entry. */
*(Elf64_Addr *) reloc_addr = (Elf64_Addr) value + reloc->r_addend;
break;
+# ifndef __ILP32__
+ case R_X86_64_SIZE32:
+ /* Set to symbol size plus addend. */
+ value = sym->st_size;
+# endif
case R_X86_64_32:
value += reloc->r_addend;
*(unsigned int *) reloc_addr = value;