|
 |
5f7b84 |
commit 30ba0375464f34e4bf8129f3d3dc14d0c09add17
|
|
|
5f7b84 |
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
|
|
|
5f7b84 |
Date: Tue Jul 9 12:11:39 2019 +0100
|
|
|
5f7b84 |
|
|
|
5f7b84 |
aarch64: simplify the DT_AARCH64_VARIANT_PCS handling code
|
|
|
5f7b84 |
|
|
|
5f7b84 |
Remove unnecessary variant_pcs field: the dynamic tag can be checked
|
|
|
5f7b84 |
directly.
|
|
|
5f7b84 |
|
|
|
5f7b84 |
* sysdeps/aarch64/dl-machine.h (elf_machine_runtime_setup): Remove the
|
|
|
5f7b84 |
DT_AARCH64_VARIANT_PCS check.
|
|
|
5f7b84 |
(elf_machine_lazy_rel): Use l_info[DT_AARCH64 (VARIANT_PCS)].
|
|
|
5f7b84 |
* sysdeps/aarch64/linkmap.h (struct link_map_machine): Remove
|
|
|
5f7b84 |
variant_pcs.
|
|
|
5f7b84 |
|
|
|
5f7b84 |
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
|
|
|
5f7b84 |
index d4494852b32b8783..b39eae4acf4086ee 100644
|
|
|
5f7b84 |
--- a/sysdeps/aarch64/dl-machine.h
|
|
|
5f7b84 |
+++ b/sysdeps/aarch64/dl-machine.h
|
|
|
5f7b84 |
@@ -105,10 +105,6 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
|
|
|
5f7b84 |
}
|
|
|
5f7b84 |
}
|
|
|
5f7b84 |
|
|
|
5f7b84 |
- /* Check if STO_AARCH64_VARIANT_PCS needs to be handled. */
|
|
|
5f7b84 |
- if (l->l_info[DT_AARCH64 (VARIANT_PCS)])
|
|
|
5f7b84 |
- l->l_mach.variant_pcs = 1;
|
|
|
5f7b84 |
-
|
|
|
5f7b84 |
return lazy;
|
|
|
5f7b84 |
}
|
|
|
5f7b84 |
|
|
|
5f7b84 |
@@ -402,7 +398,7 @@ elf_machine_lazy_rel (struct link_map *map,
|
|
|
5f7b84 |
return;
|
|
|
5f7b84 |
}
|
|
|
5f7b84 |
|
|
|
5f7b84 |
- if (__glibc_unlikely (map->l_mach.variant_pcs))
|
|
|
5f7b84 |
+ if (__glibc_unlikely (map->l_info[DT_AARCH64 (VARIANT_PCS)] != NULL))
|
|
|
5f7b84 |
{
|
|
|
5f7b84 |
/* Check the symbol table for variant PCS symbols. */
|
|
|
5f7b84 |
const Elf_Symndx symndx = ELFW (R_SYM) (reloc->r_info);
|
|
|
5f7b84 |
diff --git a/sysdeps/aarch64/linkmap.h b/sysdeps/aarch64/linkmap.h
|
|
|
5f7b84 |
index dd8597470c3d2174..6852f343a1efd150 100644
|
|
|
5f7b84 |
--- a/sysdeps/aarch64/linkmap.h
|
|
|
5f7b84 |
+++ b/sysdeps/aarch64/linkmap.h
|
|
|
5f7b84 |
@@ -20,5 +20,4 @@ struct link_map_machine
|
|
|
5f7b84 |
{
|
|
|
5f7b84 |
ElfW(Addr) plt; /* Address of .plt */
|
|
|
5f7b84 |
void *tlsdesc_table; /* Address of TLS descriptor hash table. */
|
|
|
5f7b84 |
- int variant_pcs; /* If set, PLT calls may follow a variant PCS. */
|
|
|
5f7b84 |
};
|