diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2017-05-23 00:59:16 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2017-06-07 11:11:40 +0530 |
| commit | 511c5a1087991108118c6e9c9546e83e992bf39c (patch) | |
| tree | b3b2d7c31e685fccdc4f94f54287b5bd2a2375a4 /sysdeps/sparc/sparc32/dl-machine.h | |
| parent | f82e9672ad89ea1ef40bbe1af71478e255e87c5e (diff) | |
| download | glibc-511c5a1087991108118c6e9c9546e83e992bf39c.tar.gz glibc-511c5a1087991108118c6e9c9546e83e992bf39c.tar.xz glibc-511c5a1087991108118c6e9c9546e83e992bf39c.zip | |
Make LD_HWCAP_MASK usable for static binaries
The LD_HWCAP_MASK environment variable was ignored in static binaries, which is inconsistent with the behaviour of dynamically linked binaries. This seems to have been because of the inability of ld_hwcap_mask being read early enough to influence anything but now that it is in tunables, the mask is usable in static binaries as well. This feature is important for aarch64, which relies on HWCAP_CPUID being masked out to disable multiarch. A sanity test on x86_64 shows that there are no failures. Likewise for aarch64. * elf/dl-hwcaps.h [HAVE_TUNABLES]: Always read hwcap_mask. * sysdeps/sparc/sparc32/dl-machine.h [HAVE_TUNABLES]: Likewise. * sysdeps/x86/cpu-features.c (init_cpu_features): Always set up hwcap and hwcap_mask.
Diffstat (limited to 'sysdeps/sparc/sparc32/dl-machine.h')
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index f9ae13300d..95f673270e 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -37,7 +37,7 @@ elf_machine_matches_host (const Elf32_Ehdr *ehdr) return 1; else if (ehdr->e_machine == EM_SPARC32PLUS) { -#ifdef SHARED +#if HAVE_TUNABLES || defined SHARED uint64_t hwcap_mask = GET_HWCAP_MASK(); return GLRO(dl_hwcap) & hwcap_mask & HWCAP_SPARC_V9; #else |