diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2019-07-09 12:11:39 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2019-07-10 15:28:00 +0100 |
| commit | 30ba0375464f34e4bf8129f3d3dc14d0c09add17 (patch) | |
| tree | 6fdc691c353d6efc12fa44b9cc653645e563c973 | |
| parent | 32b8188ac84ea0c0280a34f65c1fd7faf731c289 (diff) | |
| download | glibc-30ba0375464f34e4bf8129f3d3dc14d0c09add17.tar.gz glibc-30ba0375464f34e4bf8129f3d3dc14d0c09add17.tar.xz glibc-30ba0375464f34e4bf8129f3d3dc14d0c09add17.zip | |
aarch64: simplify the DT_AARCH64_VARIANT_PCS handling code
Remove unnecessary variant_pcs field: the dynamic tag can be checked directly. * sysdeps/aarch64/dl-machine.h (elf_machine_runtime_setup): Remove the DT_AARCH64_VARIANT_PCS check. (elf_machine_lazy_rel): Use l_info[DT_AARCH64 (VARIANT_PCS)]. * sysdeps/aarch64/linkmap.h (struct link_map_machine): Remove variant_pcs.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/aarch64/dl-machine.h | 6 | ||||
| -rw-r--r-- | sysdeps/aarch64/linkmap.h | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index d3c5e29639..dd99d9883b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-07-10 Szabolcs Nagy <szabolcs.nagy@arm.com> + + * sysdeps/aarch64/dl-machine.h (elf_machine_runtime_setup): Remove the + DT_AARCH64_VARIANT_PCS check. + (elf_machine_lazy_rel): Use l_info[DT_AARCH64 (VARIANT_PCS)]. + * sysdeps/aarch64/linkmap.h (struct link_map_machine): Remove + variant_pcs. + 2019-07-10 Andreas Schwab <schwab@suse.de> [BZ #23352] diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index 4f27637b20..9b2e0ffdbf 100644 --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -105,10 +105,6 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) } } - /* Check if STO_AARCH64_VARIANT_PCS needs to be handled. */ - if (l->l_info[DT_AARCH64 (VARIANT_PCS)]) - l->l_mach.variant_pcs = 1; - return lazy; } @@ -402,7 +398,7 @@ elf_machine_lazy_rel (struct link_map *map, return; } - if (__glibc_unlikely (map->l_mach.variant_pcs)) + if (__glibc_unlikely (map->l_info[DT_AARCH64 (VARIANT_PCS)] != NULL)) { /* Check the symbol table for variant PCS symbols. */ const Elf_Symndx symndx = ELFW (R_SYM) (reloc->r_info); diff --git a/sysdeps/aarch64/linkmap.h b/sysdeps/aarch64/linkmap.h index 7f801b14db..ba74fe10e1 100644 --- a/sysdeps/aarch64/linkmap.h +++ b/sysdeps/aarch64/linkmap.h @@ -20,5 +20,4 @@ struct link_map_machine { ElfW(Addr) plt; /* Address of .plt */ void *tlsdesc_table; /* Address of TLS descriptor hash table. */ - int variant_pcs; /* If set, PLT calls may follow a variant PCS. */ }; |