From ff08fc59e36e02074eba8ab39b0d9001363970f0 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 1 Jun 2017 22:32:03 +0530 Subject: 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. --- elf/dl-hwcaps.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 elf/dl-hwcaps.h (limited to 'elf/dl-hwcaps.h') diff --git a/elf/dl-hwcaps.h b/elf/dl-hwcaps.h new file mode 100644 index 0000000000..9ce33173f1 --- /dev/null +++ b/elf/dl-hwcaps.h @@ -0,0 +1,31 @@ +/* Hardware capability support for run-time dynamic loader. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +#ifdef SHARED +# if HAVE_TUNABLES +# define GET_HWCAP_MASK() \ + TUNABLE_GET (glibc, tune, hwcap_mask, uint64_t, NULL) +# else +# define GET_HWCAP_MASK() GLRO(dl_hwcap_mask) +# endif +#else +/* HWCAP_MASK is ignored in static binaries. */ +# define GET_HWCAP_MASK() (0) +#endif -- cgit v1.2.3