mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 14:50:05 +00:00
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.
This commit is contained in:
parent
32b8188ac8
commit
30ba037546
@ -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]
|
||||
|
@ -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);
|
||||
|
@ -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. */
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user