AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-27 05:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

i386: Port elf_machine_{load_address,dynamic} from x86-64

Browse Source 
This drops reliance on _GLOBAL_OFFSET_TABLE_[0] being the link-time
address of _DYNAMIC.

The code sequence length does not change.

Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
This commit is contained in:
Fangrui Song 2021-09-24 09:36:32 -07:00
parent 381b29616a
commit 91e92272ca
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,27 +34,20 @@ elf_machine_matches_host (const Elf32_Ehdr *ehdr)
} }
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
first element of the GOT, a special entry that is never relocated. */
static inline Elf32_Addr __attribute__ ((unused, const))
elf_machine_dynamic (void)
{
/* This produces a GOTOFF reloc that resolves to zero at link time, so in
fact just loads from the GOT register directly. By doing it without
an asm we can let the compiler choose any register. */
extern const Elf32_Addr _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
return _GLOBAL_OFFSET_TABLE_[0];
}
/* Return the run-time load address of the shared object. */ /* Return the run-time load address of the shared object. */
static inline Elf32_Addr __attribute__ ((unused)) static inline Elf32_Addr __attribute__ ((unused))
elf_machine_load_address (void) elf_machine_load_address (void)
{ {
/* Compute the difference between the runtime address of _DYNAMIC as seen extern const Elf32_Ehdr __ehdr_start attribute_hidden;
by a GOTOFF reference, and the link-time address found in the special return (Elf32_Addr) &__ehdr_start;
unrelocated first GOT entry. */ }
extern Elf32_Dyn bygotoff[] asm ("_DYNAMIC") attribute_hidden;
return (Elf32_Addr) &bygotoff - elf_machine_dynamic (); /* Return the link-time address of _DYNAMIC. */
static inline Elf32_Addr __attribute__ ((unused))
elf_machine_dynamic (void)
{
extern Elf32_Dyn _DYNAMIC[] attribute_hidden;
return (Elf32_Addr) _DYNAMIC - elf_machine_load_address ();
} }
/* Set up the loaded object described by L so its unrelocated PLT /* Set up the loaded object described by L so its unrelocated PLT