diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-10-03 17:48:55 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-10-03 17:49:09 -0700 |
| commit | 02d2d8927d2fd3815a9f3c5c767aa71a8a33408e (patch) | |
| tree | 19af6bf30672b23680686d3a57ff2148381021e9 /sysdeps | |
| parent | 0c609d19e33f0ee70dbe2fba04d2ea75d3dcbd14 (diff) | |
| download | glibc-02d2d8927d2fd3815a9f3c5c767aa71a8a33408e.tar.gz glibc-02d2d8927d2fd3815a9f3c5c767aa71a8a33408e.tar.xz glibc-02d2d8927d2fd3815a9f3c5c767aa71a8a33408e.zip | |
Revert x86: Allow undefined _DYNAMIC in static executable
This code is used in non-PIE static executable and static PIE. It checks if _DYNAMIC is undefined before using it to compute load address. But not all targets can convert access _DYNAMIC via GOT, which needs dynamic relocation, to PC-relative at link-time. * sysdeps/i386/dl-machine.h (elf_machine_load_address): Don't allow undefined _DYNAMIC in PIE libc.a. * sysdeps/x86_64/dl-machine.h (elf_machine_load_address): Likewse.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 11 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 242c692c17..2e17eba5c0 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -54,15 +54,8 @@ elf_machine_load_address (void) /* Compute the difference between the runtime address of _DYNAMIC as seen by a GOTOFF reference, and the link-time address found in the special unrelocated first GOT entry. */ -#ifndef SHARED - extern Elf32_Dyn _DYNAMIC[] __attribute__((weak, visibility ("hidden"))); - if (!_DYNAMIC) - return 0; -#endif - /* The address of dynamic must be taken as non-weak to avoid dynamic - relocation. */ - extern Elf32_Dyn dynamic[] asm ("_DYNAMIC") attribute_hidden; - return (Elf32_Addr) &dynamic - elf_machine_dynamic (); + extern Elf32_Dyn bygotoff[] asm ("_DYNAMIC") attribute_hidden; + return (Elf32_Addr) &bygotoff - elf_machine_dynamic (); } /* Set up the loaded object described by L so its unrelocated PLT diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index a79e5ca2f9..6a04cbcdc9 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -55,15 +55,8 @@ elf_machine_load_address (void) /* Compute the difference between the runtime address of _DYNAMIC as seen by an IP-relative reference, and the link-time address found in the special unrelocated first GOT entry. */ -#ifndef SHARED - extern ElfW(Dyn) _DYNAMIC[] __attribute__((weak, visibility ("hidden"))); - if (!_DYNAMIC) - return 0; -#endif - /* The address of dynamic must be taken as non-weak to avoid dynamic - relocation. */ - extern ElfW(Dyn) dynamic[] asm ("_DYNAMIC") attribute_hidden; - return (ElfW(Addr)) &dynamic - elf_machine_dynamic (); + extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; + return (ElfW(Addr)) &_DYNAMIC - elf_machine_dynamic (); } /* Set up the loaded object described by L so its unrelocated PLT |