e354a5
commit dce452dc5278f2985d21315721a6ba802537b862
e354a5
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
e354a5
Date:   Thu Aug 2 23:49:19 2018 +0530
e354a5
e354a5
    Rename the glibc.tune namespace to glibc.cpu
e354a5
    
e354a5
    The glibc.tune namespace is vaguely named since it is a 'tunable', so
e354a5
    give it a more specific name that describes what it refers to.  Rename
e354a5
    the tunable namespace to 'cpu' to more accurately reflect what it
e354a5
    encompasses.  Also rename glibc.tune.cpu to glibc.cpu.name since
e354a5
    glibc.cpu.cpu is weird.
e354a5
    
e354a5
            * NEWS: Mention the change.
e354a5
            * elf/dl-tunables.list: Rename tune namespace to cpu.
e354a5
            * sysdeps/powerpc/dl-tunables.list: Likewise.
e354a5
            * sysdeps/x86/dl-tunables.list: Likewise.
e354a5
            * sysdeps/aarch64/dl-tunables.list: Rename tune.cpu to
e354a5
            cpu.name.
e354a5
            * elf/dl-hwcaps.c (_dl_important_hwcaps): Adjust.
e354a5
            * elf/dl-hwcaps.h (GET_HWCAP_MASK): Likewise.
e354a5
            * manual/README.tunables: Likewise.
e354a5
            * manual/tunables.texi: Likewise.
e354a5
            * sysdeps/powerpc/cpu-features.c: Likewise.
e354a5
            * sysdeps/unix/sysv/linux/aarch64/cpu-features.c
e354a5
            (init_cpu_features): Likewise.
e354a5
            * sysdeps/x86/cpu-features.c: Likewise.
e354a5
            * sysdeps/x86/cpu-features.h: Likewise.
e354a5
            * sysdeps/x86/cpu-tunables.c: Likewise.
e354a5
            * sysdeps/x86_64/Makefile: Likewise.
e354a5
            * sysdeps/x86/dl-cet.c: Likewise.
e354a5
    
e354a5
    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
e354a5
e354a5
Conflicts:
e354a5
	manual/tunables.texi
e354a5
	  (Earlier backport of non-temporal memcpy threshold.)
e354a5
	sysdeps/x86/Makefile
e354a5
	  (Earlier CET backports.)
e354a5
e354a5
diff --git a/elf/dl-hwcaps.c b/elf/dl-hwcaps.c
e354a5
index 23482a88a1c9bca9..ecf00b457760e517 100644
e354a5
--- a/elf/dl-hwcaps.c
e354a5
+++ b/elf/dl-hwcaps.c
e354a5
@@ -140,7 +140,7 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
e354a5
 	 string and bit like you can ignore an OS-supplied HWCAP bit.  */
e354a5
       hwcap_mask |= (uint64_t) mask << _DL_FIRST_EXTRA;
e354a5
 #if HAVE_TUNABLES
e354a5
-      TUNABLE_SET (glibc, tune, hwcap_mask, uint64_t, hwcap_mask);
e354a5
+      TUNABLE_SET (glibc, cpu, hwcap_mask, uint64_t, hwcap_mask);
e354a5
 #else
e354a5
       GLRO(dl_hwcap_mask) = hwcap_mask;
e354a5
 #endif
e354a5
diff --git a/elf/dl-hwcaps.h b/elf/dl-hwcaps.h
e354a5
index 17f0da4c73772425..d69ee11dc27bb5e5 100644
e354a5
--- a/elf/dl-hwcaps.h
e354a5
+++ b/elf/dl-hwcaps.h
e354a5
@@ -19,7 +19,7 @@
e354a5
 #include <elf/dl-tunables.h>
e354a5
 
e354a5
 #if HAVE_TUNABLES
e354a5
-# define GET_HWCAP_MASK() TUNABLE_GET (glibc, tune, hwcap_mask, uint64_t, NULL)
e354a5
+# define GET_HWCAP_MASK() TUNABLE_GET (glibc, cpu, hwcap_mask, uint64_t, NULL)
e354a5
 #else
e354a5
 # ifdef SHARED
e354a5
 #   define GET_HWCAP_MASK() GLRO(dl_hwcap_mask)
e354a5
diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list
e354a5
index 1ff6fcb6f24f93a8..b7cc79f8bfe0a7c6 100644
e354a5
--- a/elf/dl-tunables.list
e354a5
+++ b/elf/dl-tunables.list
e354a5
@@ -91,7 +91,7 @@ glibc {
e354a5
       security_level: SXID_IGNORE
e354a5
     }
e354a5
   }
e354a5
-  tune {
e354a5
+  cpu {
e354a5
     hwcap_mask {
e354a5
       type: UINT_64
e354a5
       env_alias: LD_HWCAP_MASK
e354a5
diff --git a/manual/README.tunables b/manual/README.tunables
e354a5
index 3967679f432a6378..f87a31a65e0a3455 100644
e354a5
--- a/manual/README.tunables
e354a5
+++ b/manual/README.tunables
e354a5
@@ -105,11 +105,11 @@ where 'check' is the tunable name, 'int32_t' is the C type of the tunable and
e354a5
 To get and set tunables in a different namespace from that module, use the full
e354a5
 form of the macros as follows:
e354a5
 
e354a5
-  val = TUNABLE_GET_FULL (glibc, tune, hwcap_mask, uint64_t, NULL)
e354a5
+  val = TUNABLE_GET_FULL (glibc, cpu, hwcap_mask, uint64_t, NULL)
e354a5
 
e354a5
-  TUNABLE_SET_FULL (glibc, tune, hwcap_mask, uint64_t, val)
e354a5
+  TUNABLE_SET_FULL (glibc, cpu, hwcap_mask, uint64_t, val)
e354a5
 
e354a5
-where 'glibc' is the top namespace, 'tune' is the tunable namespace and the
e354a5
+where 'glibc' is the top namespace, 'cpu' is the tunable namespace and the
e354a5
 remaining arguments are the same as the short form macros.
e354a5
 
e354a5
 When TUNABLE_NAMESPACE is not defined in a module, TUNABLE_GET is equivalent to
e354a5
diff --git a/manual/tunables.texi b/manual/tunables.texi
e354a5
index 3e1e519dff153b09..ef10d2872cfc244e 100644
e354a5
--- a/manual/tunables.texi
e354a5
+++ b/manual/tunables.texi
e354a5
@@ -307,23 +307,23 @@ The default value of this tunable is @samp{3}.
e354a5
 @cindex non_temporal_threshold tunables
e354a5
 @cindex tunables, non_temporal_threshold
e354a5
 
e354a5
-@deftp {Tunable namespace} glibc.tune
e354a5
+@deftp {Tunable namespace} glibc.cpu
e354a5
 Behavior of @theglibc{} can be tuned to assume specific hardware capabilities
e354a5
-by setting the following tunables in the @code{tune} namespace:
e354a5
+by setting the following tunables in the @code{cpu} namespace:
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.hwcap_mask
e354a5
+@deftp Tunable glibc.cpu.hwcap_mask
e354a5
 This tunable supersedes the @env{LD_HWCAP_MASK} environment variable and is
e354a5
 identical in features.
e354a5
 
e354a5
 The @code{AT_HWCAP} key in the Auxiliary Vector specifies instruction set
e354a5
 extensions available in the processor at runtime for some architectures.  The
e354a5
-@code{glibc.tune.hwcap_mask} tunable allows the user to mask out those
e354a5
+@code{glibc.cpu.hwcap_mask} tunable allows the user to mask out those
e354a5
 capabilities at runtime, thus disabling use of those extensions.
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.hwcaps
e354a5
-The @code{glibc.tune.hwcaps=-xxx,yyy,-zzz...} tunable allows the user to
e354a5
+@deftp Tunable glibc.cpu.hwcaps
e354a5
+The @code{glibc.cpu.hwcaps=-xxx,yyy,-zzz...} tunable allows the user to
e354a5
 enable CPU/ARCH feature @code{yyy}, disable CPU/ARCH feature @code{xxx}
e354a5
 and @code{zzz} where the feature name is case-sensitive and has to match
e354a5
 the ones in @code{sysdeps/x86/cpu-features.h}.
e354a5
@@ -331,8 +331,8 @@ the ones in @code{sysdeps/x86/cpu-features.h}.
e354a5
 This tunable is specific to i386 and x86-64.
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.cached_memopt
e354a5
-The @code{glibc.tune.cached_memopt=[0|1]} tunable allows the user to
e354a5
+@deftp Tunable glibc.cpu.cached_memopt
e354a5
+The @code{glibc.cpu.cached_memopt=[0|1]} tunable allows the user to
e354a5
 enable optimizations recommended for cacheable memory.  If set to
e354a5
 @code{1}, @theglibc{} assumes that the process memory image consists
e354a5
 of cacheable (non-device) memory only.  The default, @code{0},
e354a5
@@ -341,8 +341,8 @@ indicates that the process may use device memory.
e354a5
 This tunable is specific to powerpc, powerpc64 and powerpc64le.
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.cpu
e354a5
-The @code{glibc.tune.cpu=xxx} tunable allows the user to tell @theglibc{} to
e354a5
+@deftp Tunable glibc.cpu.name
e354a5
+The @code{glibc.cpu.name=xxx} tunable allows the user to tell @theglibc{} to
e354a5
 assume that the CPU is @code{xxx} where xxx may have one of these values:
e354a5
 @code{generic}, @code{falkor}, @code{thunderxt88}, @code{thunderx2t99},
e354a5
 @code{thunderx2t99p1}.
e354a5
@@ -350,20 +350,20 @@ assume that the CPU is @code{xxx} where xxx may have one of these values:
e354a5
 This tunable is specific to aarch64.
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.x86_data_cache_size
e354a5
-The @code{glibc.tune.x86_data_cache_size} tunable allows the user to set
e354a5
+@deftp Tunable glibc.cpu.x86_data_cache_size
e354a5
+The @code{glibc.cpu.x86_data_cache_size} tunable allows the user to set
e354a5
 data cache size in bytes for use in memory and string routines.
e354a5
 
e354a5
 This tunable is specific to i386 and x86-64.
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.x86_shared_cache_size
e354a5
-The @code{glibc.tune.x86_shared_cache_size} tunable allows the user to
e354a5
+@deftp Tunable glibc.cpu.x86_shared_cache_size
e354a5
+The @code{glibc.cpu.x86_shared_cache_size} tunable allows the user to
e354a5
 set shared cache size in bytes for use in memory and string routines.
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.x86_non_temporal_threshold
e354a5
-The @code{glibc.tune.x86_non_temporal_threshold} tunable allows the user
e354a5
+@deftp Tunable glibc.cpu.x86_non_temporal_threshold
e354a5
+The @code{glibc.cpu.x86_non_temporal_threshold} tunable allows the user
e354a5
 to set threshold in bytes for non temporal store. Non temporal stores
e354a5
 give a hint to the hardware to move data directly to memory without
e354a5
 displacing other data from the cache. This tunable is used by some
e354a5
@@ -373,8 +373,8 @@ like memmove and memcpy.
e354a5
 This tunable is specific to i386 and x86-64.
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.x86_ibt
e354a5
-The @code{glibc.tune.x86_ibt} tunable allows the user to control how
e354a5
+@deftp Tunable glibc.cpu.x86_ibt
e354a5
+The @code{glibc.cpu.x86_ibt} tunable allows the user to control how
e354a5
 indirect branch tracking (IBT) should be enabled.  Accepted values are
e354a5
 @code{on}, @code{off}, and @code{permissive}.  @code{on} always turns
e354a5
 on IBT regardless of whether IBT is enabled in the executable and its
e354a5
@@ -386,8 +386,8 @@ IBT on non-CET executables and shared libraries.
e354a5
 This tunable is specific to i386 and x86-64.
e354a5
 @end deftp
e354a5
 
e354a5
-@deftp Tunable glibc.tune.x86_shstk
e354a5
-The @code{glibc.tune.x86_shstk} tunable allows the user to control how
e354a5
+@deftp Tunable glibc.cpu.x86_shstk
e354a5
+The @code{glibc.cpu.x86_shstk} tunable allows the user to control how
e354a5
 the shadow stack (SHSTK) should be enabled.  Accepted values are
e354a5
 @code{on}, @code{off}, and @code{permissive}.  @code{on} always turns on
e354a5
 SHSTK regardless of whether SHSTK is enabled in the executable and its
e354a5
diff --git a/sysdeps/aarch64/dl-tunables.list b/sysdeps/aarch64/dl-tunables.list
e354a5
index f6a88168cc5ec7e6..cfcf940ebd15a9aa 100644
e354a5
--- a/sysdeps/aarch64/dl-tunables.list
e354a5
+++ b/sysdeps/aarch64/dl-tunables.list
e354a5
@@ -17,8 +17,8 @@
e354a5
 # <http://www.gnu.org/licenses/>.
e354a5
 
e354a5
 glibc {
e354a5
-  tune {
e354a5
-    cpu {
e354a5
+  cpu {
e354a5
+    name {
e354a5
       type: STRING
e354a5
     }
e354a5
   }
e354a5
diff --git a/sysdeps/powerpc/cpu-features.c b/sysdeps/powerpc/cpu-features.c
e354a5
index 955d4778a69db607..ad809b9815eb68f0 100644
e354a5
--- a/sysdeps/powerpc/cpu-features.c
e354a5
+++ b/sysdeps/powerpc/cpu-features.c
e354a5
@@ -30,7 +30,7 @@ init_cpu_features (struct cpu_features *cpu_features)
e354a5
      tunables is enable, since for this case user can explicit disable
e354a5
      unaligned optimizations.  */
e354a5
 #if HAVE_TUNABLES
e354a5
-  int32_t cached_memfunc = TUNABLE_GET (glibc, tune, cached_memopt, int32_t,
e354a5
+  int32_t cached_memfunc = TUNABLE_GET (glibc, cpu, cached_memopt, int32_t,
e354a5
 					NULL);
e354a5
   cpu_features->use_cached_memopt = (cached_memfunc > 0);
e354a5
 #else
e354a5
diff --git a/sysdeps/powerpc/dl-tunables.list b/sysdeps/powerpc/dl-tunables.list
e354a5
index d26636a16bfcd6d9..b3372555f75f8e38 100644
e354a5
--- a/sysdeps/powerpc/dl-tunables.list
e354a5
+++ b/sysdeps/powerpc/dl-tunables.list
e354a5
@@ -17,7 +17,7 @@
e354a5
 # <http://www.gnu.org/licenses/>.
e354a5
 
e354a5
 glibc {
e354a5
-  tune {
e354a5
+  cpu {
e354a5
     cached_memopt {
e354a5
       type: INT_32
e354a5
       minval: 0
e354a5
diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
e354a5
index 39eba0186f55b5de..b4f348509eb1c6b3 100644
e354a5
--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
e354a5
+++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
e354a5
@@ -57,7 +57,7 @@ init_cpu_features (struct cpu_features *cpu_features)
e354a5
 
e354a5
 #if HAVE_TUNABLES
e354a5
   /* Get the tunable override.  */
e354a5
-  const char *mcpu = TUNABLE_GET (glibc, tune, cpu, const char *, NULL);
e354a5
+  const char *mcpu = TUNABLE_GET (glibc, cpu, name, const char *, NULL);
e354a5
   if (mcpu != NULL)
e354a5
     midr = get_midr_from_mcpu (mcpu);
e354a5
 #endif
e354a5
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
e354a5
index d5f821e0831997ac..a936134a577e42a5 100644
e354a5
--- a/sysdeps/x86/Makefile
e354a5
+++ b/sysdeps/x86/Makefile
e354a5
@@ -84,21 +84,21 @@ LDFLAGS-tst-cet-legacy-mod-6c.so = -Wl,--enable-new-dtags,-z,nodelete
e354a5
 ifneq (no,$(have-tunables))
e354a5
 $(objpfx)tst-cet-legacy-4a: $(libdl)
e354a5
 $(objpfx)tst-cet-legacy-4a.out: $(objpfx)tst-cet-legacy-mod-4.so
e354a5
-tst-cet-legacy-4a-ENV = GLIBC_TUNABLES=glibc.tune.x86_shstk=permissive
e354a5
+tst-cet-legacy-4a-ENV = GLIBC_TUNABLES=glibc.cpu.x86_shstk=permissive
e354a5
 $(objpfx)tst-cet-legacy-4b: $(libdl)
e354a5
 $(objpfx)tst-cet-legacy-4b.out: $(objpfx)tst-cet-legacy-mod-4.so
e354a5
-tst-cet-legacy-4b-ENV = GLIBC_TUNABLES=glibc.tune.x86_shstk=on
e354a5
+tst-cet-legacy-4b-ENV = GLIBC_TUNABLES=glibc.cpu.x86_shstk=on
e354a5
 $(objpfx)tst-cet-legacy-4c: $(libdl)
e354a5
 $(objpfx)tst-cet-legacy-4c.out: $(objpfx)tst-cet-legacy-mod-4.so
e354a5
-tst-cet-legacy-4c-ENV = GLIBC_TUNABLES=glibc.tune.x86_shstk=off
e354a5
+tst-cet-legacy-4c-ENV = GLIBC_TUNABLES=glibc.cpu.x86_shstk=off
e354a5
 $(objpfx)tst-cet-legacy-5b: $(libdl)
e354a5
 $(objpfx)tst-cet-legacy-5b.out: $(objpfx)tst-cet-legacy-mod-5a.so \
e354a5
 				$(objpfx)tst-cet-legacy-mod-5b.so
e354a5
-tst-cet-legacy-5b-ENV = GLIBC_TUNABLES=glibc.tune.x86_ibt=off:glibc.tune.x86_shstk=off
e354a5
+tst-cet-legacy-5b-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=off:glibc.cpu.x86_shstk=off
e354a5
 $(objpfx)tst-cet-legacy-6b: $(libdl)
e354a5
 $(objpfx)tst-cet-legacy-6b.out: $(objpfx)tst-cet-legacy-mod-6a.so \
e354a5
 				$(objpfx)tst-cet-legacy-mod-6b.so
e354a5
-tst-cet-legacy-6b-ENV = GLIBC_TUNABLES=glibc.tune.x86_ibt=off:glibc.tune.x86_shstk=off
e354a5
+tst-cet-legacy-6b-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=off:glibc.cpu.x86_shstk=off
e354a5
 endif
e354a5
 endif
e354a5
 
e354a5
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
e354a5
index 41f2d15fa5c8a756..3b268efbce627e6c 100644
e354a5
--- a/sysdeps/x86/cpu-features.c
e354a5
+++ b/sysdeps/x86/cpu-features.c
e354a5
@@ -22,7 +22,7 @@
e354a5
 #include <libc-pointer-arith.h>
e354a5
 
e354a5
 #if HAVE_TUNABLES
e354a5
-# define TUNABLE_NAMESPACE tune
e354a5
+# define TUNABLE_NAMESPACE cpu
e354a5
 # include <unistd.h>		/* Get STDOUT_FILENO for _dl_printf.  */
e354a5
 # include <elf/dl-tunables.h>
e354a5
 
e354a5
@@ -424,7 +424,7 @@ no_cpuid:
e354a5
 
e354a5
   /* Reuse dl_platform, dl_hwcap and dl_hwcap_mask for x86.  */
e354a5
 #if !HAVE_TUNABLES && defined SHARED
e354a5
-  /* The glibc.tune.hwcap_mask tunable is initialized already, so no need to do
e354a5
+  /* The glibc.cpu.hwcap_mask tunable is initialized already, so no need to do
e354a5
      this.  */
e354a5
   GLRO(dl_hwcap_mask) = HWCAP_IMPORTANT;
e354a5
 #endif
e354a5
@@ -499,7 +499,7 @@ no_cpuid:
e354a5
 	  /* Disable IBT and/or SHSTK if they are enabled by kernel, but
e354a5
 	     disabled by environment variable:
e354a5
 
e354a5
-	     GLIBC_TUNABLES=glibc.tune.hwcaps=-IBT,-SHSTK
e354a5
+	     GLIBC_TUNABLES=glibc.cpu.hwcaps=-IBT,-SHSTK
e354a5
 	   */
e354a5
 	  unsigned int cet_feature = 0;
e354a5
 	  if (!HAS_CPU_FEATURE (IBT))
e354a5
diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h
e354a5
index 347a4b118d007fd8..4c6d08c709eea204 100644
e354a5
--- a/sysdeps/x86/cpu-features.h
e354a5
+++ b/sysdeps/x86/cpu-features.h
e354a5
@@ -141,7 +141,7 @@ struct cpu_features
e354a5
   unsigned long int xsave_state_size;
e354a5
   /* The full state size for XSAVE when XSAVEC is disabled by
e354a5
 
e354a5
-     GLIBC_TUNABLES=glibc.tune.hwcaps=-XSAVEC_Usable
e354a5
+     GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC_Usable
e354a5
    */
e354a5
   unsigned int xsave_state_full_size;
e354a5
   unsigned int feature[FEATURE_INDEX_MAX];
e354a5
diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c
e354a5
index fad6726882fa7e2d..2e5d37753713e975 100644
e354a5
--- a/sysdeps/x86/cpu-tunables.c
e354a5
+++ b/sysdeps/x86/cpu-tunables.c
e354a5
@@ -17,7 +17,7 @@
e354a5
    <http://www.gnu.org/licenses/>.  */
e354a5
 
e354a5
 #if HAVE_TUNABLES
e354a5
-# define TUNABLE_NAMESPACE tune
e354a5
+# define TUNABLE_NAMESPACE cpu
e354a5
 # include <stdbool.h>
e354a5
 # include <stdint.h>
e354a5
 # include <unistd.h>		/* Get STDOUT_FILENO for _dl_printf.  */
e354a5
@@ -116,7 +116,7 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp)
e354a5
      the hardware which wasn't available when the selection was made.
e354a5
      The environment variable:
e354a5
 
e354a5
-     GLIBC_TUNABLES=glibc.tune.hwcaps=-xxx,yyy,-zzz,....
e354a5
+     GLIBC_TUNABLES=glibc.cpu.hwcaps=-xxx,yyy,-zzz,....
e354a5
 
e354a5
      can be used to enable CPU/ARCH feature yyy, disable CPU/ARCH feature
e354a5
      yyy and zzz, where the feature name is case-sensitive and has to
e354a5
diff --git a/sysdeps/x86/dl-cet.c b/sysdeps/x86/dl-cet.c
e354a5
index ebc0d577e414c807..d481bddc27e5d7cc 100644
e354a5
--- a/sysdeps/x86/dl-cet.c
e354a5
+++ b/sysdeps/x86/dl-cet.c
e354a5
@@ -72,7 +72,7 @@ dl_cet_check (struct link_map *m, const char *program)
e354a5
 	  /* Enable IBT and SHSTK only if they are enabled in executable.
e354a5
 	     NB: IBT and SHSTK may be disabled by environment variable:
e354a5
 
e354a5
-	     GLIBC_TUNABLES=glibc.tune.hwcaps=-IBT,-SHSTK
e354a5
+	     GLIBC_TUNABLES=glibc.cpu.hwcaps=-IBT,-SHSTK
e354a5
 	   */
e354a5
 	  enable_ibt &= (HAS_CPU_FEATURE (IBT)
e354a5
 			 && (enable_ibt_type == cet_always_on
e354a5
diff --git a/sysdeps/x86/dl-tunables.list b/sysdeps/x86/dl-tunables.list
e354a5
index 73886b1352316854..2a457d0eec9c3122 100644
e354a5
--- a/sysdeps/x86/dl-tunables.list
e354a5
+++ b/sysdeps/x86/dl-tunables.list
e354a5
@@ -17,7 +17,7 @@
e354a5
 # <http://www.gnu.org/licenses/>.
e354a5
 
e354a5
 glibc {
e354a5
-  tune {
e354a5
+  cpu {
e354a5
     hwcaps {
e354a5
       type: STRING
e354a5
     }
e354a5
diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
e354a5
index 9f1562f1b25a2df5..d51cf03ac92ebcc2 100644
e354a5
--- a/sysdeps/x86_64/Makefile
e354a5
+++ b/sysdeps/x86_64/Makefile
e354a5
@@ -57,7 +57,7 @@ modules-names += x86_64/tst-x86_64mod-1
e354a5
 LDFLAGS-tst-x86_64mod-1.so = -Wl,-soname,tst-x86_64mod-1.so
e354a5
 ifneq (no,$(have-tunables))
e354a5
 # Test the state size for XSAVE when XSAVEC is disabled.
e354a5
-tst-x86_64-1-ENV = GLIBC_TUNABLES=glibc.tune.hwcaps=-XSAVEC_Usable
e354a5
+tst-x86_64-1-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC_Usable
e354a5
 endif
e354a5
 
e354a5
 $(objpfx)tst-x86_64-1: $(objpfx)x86_64/tst-x86_64mod-1.so
e354a5
@@ -74,7 +74,7 @@ $(objpfx)tst-platform-1.out: $(objpfx)x86_64/tst-platformmod-2.so
e354a5
 # Turn off AVX512F_Usable and AVX2_Usable so that GLRO(dl_platform) is
e354a5
 # always set to x86_64.
e354a5
 tst-platform-1-ENV = LD_PRELOAD=$(objpfx)\$$PLATFORM/tst-platformmod-2.so \
e354a5
-	GLIBC_TUNABLES=glibc.tune.hwcaps=-AVX512F_Usable,-AVX2_Usable
e354a5
+	GLIBC_TUNABLES=glibc.cpu.hwcaps=-AVX512F_Usable,-AVX2_Usable
e354a5
 endif
e354a5
 
e354a5
 tests += tst-audit3 tst-audit4 tst-audit5 tst-audit6 tst-audit7 \