diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2013-01-15 13:33:08 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2013-01-15 13:33:08 -0800 |
| commit | e08c0cf31f60c93d8c4902f7a90fcecbb955e17d (patch) | |
| tree | 9dfadc8b58f0dde12eb6872d5f8d035980e9a4f9 | |
| parent | 66438c3fe12d88721f395d3601fa192e03b208ba (diff) | |
| download | glibc-e08c0cf31f60c93d8c4902f7a90fcecbb955e17d.tar glibc-e08c0cf31f60c93d8c4902f7a90fcecbb955e17d.tar.gz glibc-e08c0cf31f60c93d8c4902f7a90fcecbb955e17d.tar.bz2 glibc-e08c0cf31f60c93d8c4902f7a90fcecbb955e17d.zip | |
Implement x86 SIZE32/SIZE64 relocations
| -rw-r--r-- | ChangeLog.size | 9 | ||||
| -rw-r--r-- | elf/elf.h | 2 | ||||
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 9 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 25 |
4 files changed, 44 insertions, 1 deletions
diff --git a/ChangeLog.size b/ChangeLog.size new file mode 100644 index 0000000000..8a5feb7f5d --- /dev/null +++ b/ChangeLog.size @@ -0,0 +1,9 @@ +2013-01-15 H.J. Lu <hongjiu.lu@intel.com> + + * elf/elf.h (R_386_SIZE32): New relocation. + * 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. @@ -1229,7 +1229,7 @@ typedef struct #define R_386_TLS_DTPMOD32 35 /* ID of module containing symbol */ #define R_386_TLS_DTPOFF32 36 /* Offset in TLS block */ #define R_386_TLS_TPOFF32 37 /* Negated offset in static TLS block */ -/* 38? */ +#define R_386_SIZE32 38 /* 32-bit symbol size */ #define R_386_TLS_GOTDESC 39 /* GOT offset for TLS descriptor. */ #define R_386_TLS_DESC_CALL 40 /* Marker of call through TLS descriptor for diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 9e36687eff..a1e40d8eb0 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -348,6 +348,12 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, switch (r_type) { +# ifndef RTLD_BOOTSTRAP + case R_386_SIZE32: + /* Set to symbol size plus addend. */ + *reloc_addr += sym->st_size; + break; +# endif case R_386_GLOB_DAT: case R_386_JMP_SLOT: *reloc_addr = value; @@ -507,6 +513,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, switch (ELF32_R_TYPE (reloc->r_info)) { + case R_386_SIZE32: + /* Set to symbol size plus addend. */ + value = sym->st_size; case R_386_GLOB_DAT: case R_386_JMP_SLOT: case R_386_32: diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 660f1aa1e2..382caa4e94 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -190,6 +190,13 @@ _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 () @@ -286,6 +293,19 @@ 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; +# endif + + case R_X86_64_SIZE: + /* 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 +414,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; |