diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index d449485..b39eae4 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 dd85974..6852f34 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. */ };