diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2017-06-01 22:32:03 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2017-06-07 11:11:38 +0530 |
| commit | ff08fc59e36e02074eba8ab39b0d9001363970f0 (patch) | |
| tree | 1926c0dd4897a00b7541deb214bf6a1a480a8f8d /elf/dl-hwcaps.c | |
| parent | 6482e63403a3d13bf42f5029407b6151ad9f4ca5 (diff) | |
| download | glibc-ff08fc59e36e02074eba8ab39b0d9001363970f0.zip glibc-ff08fc59e36e02074eba8ab39b0d9001363970f0.tar.gz glibc-ff08fc59e36e02074eba8ab39b0d9001363970f0.tar.bz2 | |
tunables: Use glibc.tune.hwcap_mask tunable instead of _dl_hwcap_mask
Drop _dl_hwcap_mask when building with tunables. This completes the
transition of hwcap_mask reading from _dl_hwcap_mask to tunables.
* elf/dl-hwcaps.h: New file.
* elf/dl-hwcaps.c: Include it.
(_dl_important_hwcaps)[HAVE_TUNABLES]: Read and update
glibc.tune.hwcap_mask.
* elf/dl-cache.c: Include dl-hwcaps.h.
(_dl_load_cache_lookup)[HAVE_TUNABLES]: Read
glibc.tune.hwcap_mask.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* elf/dl-support.c (_dl_hwcap2)[HAVE_TUNABLES]: Drop
_dl_hwcap_mask.
* elf/rtld.c (rtld_global_ro)[HAVE_TUNABLES]: Drop
_dl_hwcap_mask.
(process_envvars)[HAVE_TUNABLES]: Likewise.
* sysdeps/generic/ldsodefs.h (rtld_global_ro)[HAVE_TUNABLES]:
Likewise.
* sysdeps/x86/cpu-features.c (init_cpu_features): Don't
initialize dl_hwcap_mask when tunables are enabled.
Diffstat (limited to 'elf/dl-hwcaps.c')
| -rw-r--r-- | elf/dl-hwcaps.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/elf/dl-hwcaps.c b/elf/dl-hwcaps.c index c437397..ac50fd2 100644 --- a/elf/dl-hwcaps.c +++ b/elf/dl-hwcaps.c @@ -24,6 +24,7 @@ #include <ldsodefs.h> #include <dl-procinfo.h> +#include <dl-hwcaps.h> #ifdef _DL_FIRST_PLATFORM # define _DL_FIRST_EXTRA (_DL_FIRST_PLATFORM + _DL_PLATFORMS_COUNT) @@ -37,8 +38,9 @@ internal_function _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, size_t *max_capstrlen) { + uint64_t hwcap_mask = GET_HWCAP_MASK(); /* Determine how many important bits are set. */ - uint64_t masked = GLRO(dl_hwcap) & GLRO(dl_hwcap_mask); + uint64_t masked = GLRO(dl_hwcap) & hwcap_mask; size_t cnt = platform != NULL; size_t n, m; size_t total; @@ -125,7 +127,12 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, LD_HWCAP_MASK environment variable (or default HWCAP_IMPORTANT). So there is no way to request ignoring an OS-supplied dsocap string and bit like you can ignore an OS-supplied HWCAP bit. */ - GLRO(dl_hwcap_mask) |= (uint64_t) mask << _DL_FIRST_EXTRA; + hwcap_mask |= (uint64_t) mask << _DL_FIRST_EXTRA; +#if HAVE_TUNABLES + TUNABLE_SET (glibc, tune, hwcap_mask, uint64_t, hwcap_mask); +#else + GLRO(dl_hwcap_mask) = hwcap_mask; +#endif size_t len; for (const char *p = dsocaps; p < dsocaps + dsocapslen; p += len + 1) { |