AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement x86 SIZE32/SIZE64 relocations

Browse Source
This commit is contained in:
H.J. Lu 2013-01-16 20:31:03 -08:00
parent 59981e9b0d
commit 22676eafed
4 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2013-01-16 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 (elf_machine_rela): Handle
R_X86_64_SIZE64 and R_X86_64_SIZE32.
2013-01-17 Joseph Myers <joseph@codesourcery.com> 2013-01-17 Joseph Myers <joseph@codesourcery.com>
* sysdeps/powerpc/bits/mathdef.h [_SOFT_FLOAT || __NO_FPRS__] * sysdeps/powerpc/bits/mathdef.h [_SOFT_FLOAT || __NO_FPRS__]

2
elf/elf.h
View File

@ -1229,7 +1229,7 @@ typedef struct
#define R_386_TLS_DTPMOD32 35 /* ID of module containing symbol */ #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_DTPOFF32 36 /* Offset in TLS block */
#define R_386_TLS_TPOFF32 37 /* Negated offset in static 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_GOTDESC 39 /* GOT offset for TLS descriptor. */
#define R_386_TLS_DESC_CALL 40 /* Marker of call through TLS #define R_386_TLS_DESC_CALL 40 /* Marker of call through TLS
descriptor for descriptor for

9
sysdeps/i386/dl-machine.h
View File

@ -348,6 +348,12 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
switch (r_type) 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_GLOB_DAT:
case R_386_JMP_SLOT: case R_386_JMP_SLOT:
*reloc_addr = value; *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)) 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_GLOB_DAT:
case R_386_JMP_SLOT: case R_386_JMP_SLOT:
case R_386_32: case R_386_32:

20
sysdeps/x86_64/dl-machine.h
View File

@ -286,6 +286,21 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
switch (r_type) 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_GLOB_DAT:
case R_X86_64_JUMP_SLOT: case R_X86_64_JUMP_SLOT:
*reloc_addr = value + reloc->r_addend; *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. */ relocation updates the whole 64-bit entry. */
*(Elf64_Addr *) reloc_addr = (Elf64_Addr) value + reloc->r_addend; *(Elf64_Addr *) reloc_addr = (Elf64_Addr) value + reloc->r_addend;
break; break;
# ifndef __ILP32__
case R_X86_64_SIZE32:
/* Set to symbol size plus addend. */
value = sym->st_size;
# endif
case R_X86_64_32: case R_X86_64_32:
value += reloc->r_addend; value += reloc->r_addend;
*(unsigned int *) reloc_addr = value; *(unsigned int *) reloc_addr = value;