Tree - rpms/glibc - CentOS Git server

rpms / glibc

Blame SOURCES/glibc-rh1817513-77.patch

Blob History Raw

		e354a5	`commit 107e6a3c2212ba7a3a4ec7cae8d82d73f7c95d0b`
		e354a5	`Author: H.J. Lu <hjl.tools@gmail.com>`
		e354a5	`Date: Mon Jun 29 16:36:08 2020 -0700`
		e354a5
		e354a5	`x86: Support usable check for all CPU features`
		e354a5
		e354a5	`Support usable check for all CPU features with the following changes:`
		e354a5
		e354a5	`1. Change struct cpu_features to`
		e354a5
		e354a5	`struct cpuid_features`
		e354a5	`{`
		e354a5	`struct cpuid_registers cpuid;`
		e354a5	`struct cpuid_registers usable;`
		e354a5	`};`
		e354a5
		e354a5	`struct cpu_features`
		e354a5	`{`
		e354a5	`struct cpu_features_basic basic;`
		e354a5	`struct cpuid_features features[COMMON_CPUID_INDEX_MAX];`
		e354a5	`unsigned int preferred[PREFERRED_FEATURE_INDEX_MAX];`
		e354a5	`...`
		e354a5	`};`
		e354a5
		e354a5	`so that there is a usable bit for each cpuid bit.`
		e354a5	`2. After the cpuid bits have been initialized, copy the known bits to the`
		e354a5	`usable bits. EAX/EBX from INDEX_1 and EAX from INDEX_7 aren't used for`
		e354a5	`CPU feature detection.`
		e354a5	`3. Clear the usable bits which require OS support.`
		e354a5	`4. If the feature is supported by OS, copy its cpuid bit to its usable`
		e354a5	`bit.`
		e354a5	`5. Replace HAS_CPU_FEATURE and CPU_FEATURES_CPU_P with CPU_FEATURE_USABLE`
		e354a5	`and CPU_FEATURE_USABLE_P to check if a feature is usable.`
		e354a5	`6. Add DEPR_FPU_CS_DS for INDEX_7_EBX_13.`
		e354a5	`7. Unset MPX feature since it has been deprecated.`
		e354a5
		e354a5	`The results are`
		e354a5
		e354a5	`1. If the feature is known and doesn't requre OS support, its usable bit`
		e354a5	`is copied from the cpuid bit.`
		e354a5	`2. Otherwise, its usable bit is copied from the cpuid bit only if the`
		e354a5	`feature is known to supported by OS.`
		e354a5	`3. CPU_FEATURE_USABLE/CPU_FEATURE_USABLE_P are used to check if the`
		e354a5	`feature can be used.`
		e354a5	`4. HAS_CPU_FEATURE/CPU_FEATURE_CPU_P are used to check if CPU supports`
		e354a5	`the feature.`
		e354a5
		e354a5	`diff --git a/sysdeps/i386/fpu/fclrexcpt.c b/sysdeps/i386/fpu/fclrexcpt.c`
		e354a5	`index 8463b102e7b79f07..9eff917e88235c64 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fclrexcpt.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fclrexcpt.c`
		e354a5	`@@ -41,7 +41,7 @@ __feclearexcept (int excepts)`
		e354a5	`__asm__ ("fldenv %0" : : "m" (*&temp));`
		e354a5
		e354a5	`/* If the CPU supports SSE, we clear the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int xnew_exc;`
		e354a5
		e354a5	`diff --git a/sysdeps/i386/fpu/fedisblxcpt.c b/sysdeps/i386/fpu/fedisblxcpt.c`
		e354a5	`index e2738e6d6c8304fe..3b5436018d08a269 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fedisblxcpt.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fedisblxcpt.c`
		e354a5	`@@ -38,7 +38,7 @@ fedisableexcept (int excepts)`
		e354a5	`__asm__ ("fldcw %0" : : "m" (*&new_exc));`
		e354a5
		e354a5	`/* If the CPU supports SSE we set the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int xnew_exc;`
		e354a5
		e354a5	`diff --git a/sysdeps/i386/fpu/feenablxcpt.c b/sysdeps/i386/fpu/feenablxcpt.c`
		e354a5	`index a4d986266636835b..88f46f6078e12e2c 100644`
		e354a5	`--- a/sysdeps/i386/fpu/feenablxcpt.c`
		e354a5	`+++ b/sysdeps/i386/fpu/feenablxcpt.c`
		e354a5	`@@ -38,7 +38,7 @@ feenableexcept (int excepts)`
		e354a5	`__asm__ ("fldcw %0" : : "m" (*&new_exc));`
		e354a5
		e354a5	`/* If the CPU supports SSE we set the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int xnew_exc;`
		e354a5
		e354a5	`diff --git a/sysdeps/i386/fpu/fegetenv.c b/sysdeps/i386/fpu/fegetenv.c`
		e354a5	`index 2a1a8507bac9bfa5..2a800fb6d6e856f3 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fegetenv.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fegetenv.c`
		e354a5	`@@ -31,7 +31,7 @@ __fegetenv (fenv_t *envp)`
		e354a5	`would block all exceptions. */`
		e354a5	`__asm__ ("fldenv %0" : : "m" (*envp));`
		e354a5
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`__asm__ ("stmxcsr %0" : "=m" (envp->__eip));`
		e354a5
		e354a5	`/* Success. */`
		e354a5	`diff --git a/sysdeps/i386/fpu/fegetmode.c b/sysdeps/i386/fpu/fegetmode.c`
		e354a5	`index 86de9f5548f4b0b4..b01ca64fc9187b10 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fegetmode.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fegetmode.c`
		e354a5	`@@ -26,7 +26,7 @@ int`
		e354a5	`fegetmode (femode_t *modep)`
		e354a5	`{`
		e354a5	`_FPU_GETCW (modep->__control_word);`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`__asm__ ("stmxcsr %0" : "=m" (modep->__mxcsr));`
		e354a5	`return 0;`
		e354a5	`}`
		e354a5	`diff --git a/sysdeps/i386/fpu/feholdexcpt.c b/sysdeps/i386/fpu/feholdexcpt.c`
		e354a5	`index 270554df31928cda..e2f3f97b9494f900 100644`
		e354a5	`--- a/sysdeps/i386/fpu/feholdexcpt.c`
		e354a5	`+++ b/sysdeps/i386/fpu/feholdexcpt.c`
		e354a5	`@@ -30,7 +30,7 @@ __feholdexcept (fenv_t *envp)`
		e354a5	`__asm__ volatile ("fnstenv %0; fnclex" : "=m" (*envp));`
		e354a5
		e354a5	`/* If the CPU supports SSE we set the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int xwork;`
		e354a5
		e354a5	`diff --git a/sysdeps/i386/fpu/fesetenv.c b/sysdeps/i386/fpu/fesetenv.c`
		e354a5	`index 6df6849da4007a45..5c8bf1f71a474aa9 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fesetenv.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fesetenv.c`
		e354a5	`@@ -79,7 +79,7 @@ __fesetenv (const fenv_t *envp)`
		e354a5
		e354a5	`__asm__ ("fldenv %0" : : "m" (temp));`
		e354a5
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int mxcsr;`
		e354a5	`__asm__ ("stmxcsr %0" : "=m" (mxcsr));`
		e354a5	`diff --git a/sysdeps/i386/fpu/fesetmode.c b/sysdeps/i386/fpu/fesetmode.c`
		e354a5	`index 9aad6ea99f810786..35881b6adf5b0aed 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fesetmode.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fesetmode.c`
		e354a5	`@@ -35,7 +35,7 @@ fesetmode (const femode_t *modep)`
		e354a5	`else`
		e354a5	`cw = modep->__control_word;`
		e354a5	`_FPU_SETCW (cw);`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int mxcsr;`
		e354a5	`__asm__ ("stmxcsr %0" : "=m" (mxcsr));`
		e354a5	`diff --git a/sysdeps/i386/fpu/fesetround.c b/sysdeps/i386/fpu/fesetround.c`
		e354a5	`index d260046c65d0aba0..5d38b6b8624bdaef 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fesetround.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fesetround.c`
		e354a5	`@@ -37,7 +37,7 @@ __fesetround (int round)`
		e354a5	`__asm__ ("fldcw %0" : : "m" (*&cw);;`
		e354a5
		e354a5	`/* If the CPU supports SSE we set the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int xcw;`
		e354a5
		e354a5	`diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c`
		e354a5	`index db3ff96dfa8336ec..1246b21e30740922 100644`
		e354a5	`--- a/sysdeps/i386/fpu/feupdateenv.c`
		e354a5	`+++ b/sysdeps/i386/fpu/feupdateenv.c`
		e354a5	`@@ -32,7 +32,7 @@ __feupdateenv (const fenv_t *envp)`
		e354a5	`__asm__ ("fnstsw %0" : "=m" (*&temp));`
		e354a5
		e354a5	`/* If the CPU supports SSE we test the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`__asm__ ("stmxcsr %0" : "=m" (*&xtemp));`
		e354a5
		e354a5	`temp = (temp \| xtemp) & FE_ALL_EXCEPT;`
		e354a5	`diff --git a/sysdeps/i386/fpu/fgetexcptflg.c b/sysdeps/i386/fpu/fgetexcptflg.c`
		e354a5	`index 39d1f7df3aa24b25..acb2ae15ea681c13 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fgetexcptflg.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fgetexcptflg.c`
		e354a5	`@@ -34,7 +34,7 @@ __fegetexceptflag (fexcept_t *flagp, int excepts)`
		e354a5	`*flagp = temp & excepts & FE_ALL_EXCEPT;`
		e354a5
		e354a5	`/* If the CPU supports SSE, we clear the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int sse_exc;`
		e354a5
		e354a5	`diff --git a/sysdeps/i386/fpu/fsetexcptflg.c b/sysdeps/i386/fpu/fsetexcptflg.c`
		e354a5	`index 21e70251cfbf8a73..caa15c0cf105a9bc 100644`
		e354a5	`--- a/sysdeps/i386/fpu/fsetexcptflg.c`
		e354a5	`+++ b/sysdeps/i386/fpu/fsetexcptflg.c`
		e354a5	`@@ -41,7 +41,7 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts)`
		e354a5	`__asm__ ("fldenv %0" : : "m" (*&temp));`
		e354a5
		e354a5	`/* If the CPU supports SSE, we set the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int xnew_exc;`
		e354a5
		e354a5	`diff --git a/sysdeps/i386/fpu/ftestexcept.c b/sysdeps/i386/fpu/ftestexcept.c`
		e354a5	`index c1b5e90356bae9da..06d6134e0d85eeef 100644`
		e354a5	`--- a/sysdeps/i386/fpu/ftestexcept.c`
		e354a5	`+++ b/sysdeps/i386/fpu/ftestexcept.c`
		e354a5	`@@ -32,7 +32,7 @@ fetestexcept (int excepts)`
		e354a5	`__asm__ ("fnstsw %0" : "=a" (temp));`
		e354a5
		e354a5	`/* If the CPU supports SSE we test the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`__asm__ ("stmxcsr %0" : "=m" (*&xtemp));`
		e354a5
		e354a5	`return (temp \| xtemp) & excepts & FE_ALL_EXCEPT;`
		e354a5	`diff --git a/sysdeps/i386/i686/fpu/multiarch/s_cosf.c b/sysdeps/i386/i686/fpu/multiarch/s_cosf.c`
		e354a5	`index a4556a478d16974a..c31592f238d67916 100644`
		e354a5	`--- a/sysdeps/i386/i686/fpu/multiarch/s_cosf.c`
		e354a5	`+++ b/sysdeps/i386/i686/fpu/multiarch/s_cosf.c`
		e354a5	`@@ -23,7 +23,7 @@ extern float __cosf_sse2 (float);`
		e354a5	`extern float __cosf_ia32 (float);`
		e354a5	`float __cosf (float);`
		e354a5
		e354a5	`-libm_ifunc (__cosf, HAS_CPU_FEATURE (SSE2) ? __cosf_sse2 : __cosf_ia32);`
		e354a5	`+libm_ifunc (__cosf, CPU_FEATURE_USABLE (SSE2) ? __cosf_sse2 : __cosf_ia32);`
		e354a5	`libm_alias_float (__cos, cos);`
		e354a5
		e354a5	`#define COSF __cosf_ia32`
		e354a5	`diff --git a/sysdeps/i386/i686/fpu/multiarch/s_sincosf.c b/sysdeps/i386/i686/fpu/multiarch/s_sincosf.c`
		e354a5	`index 5f21f5c0eda20fd1..116c541dba54dd16 100644`
		e354a5	`--- a/sysdeps/i386/i686/fpu/multiarch/s_sincosf.c`
		e354a5	`+++ b/sysdeps/i386/i686/fpu/multiarch/s_sincosf.c`
		e354a5	`@@ -24,7 +24,7 @@ extern void __sincosf_ia32 (float, float , float );`
		e354a5	`void __sincosf (float, float , float );`
		e354a5
		e354a5	`libm_ifunc (__sincosf,`
		e354a5	`- HAS_CPU_FEATURE (SSE2) ? __sincosf_sse2 : __sincosf_ia32);`
		e354a5	`+ CPU_FEATURE_USABLE (SSE2) ? __sincosf_sse2 : __sincosf_ia32);`
		e354a5	`libm_alias_float (__sincos, sincos);`
		e354a5
		e354a5	`#define SINCOSF __sincosf_ia32`
		e354a5	`diff --git a/sysdeps/i386/i686/fpu/multiarch/s_sinf.c b/sysdeps/i386/i686/fpu/multiarch/s_sinf.c`
		e354a5	`index 80a7ffaa1e36b492..63abd34c21a1c83f 100644`
		e354a5	`--- a/sysdeps/i386/i686/fpu/multiarch/s_sinf.c`
		e354a5	`+++ b/sysdeps/i386/i686/fpu/multiarch/s_sinf.c`
		e354a5	`@@ -23,7 +23,7 @@ extern float __sinf_sse2 (float);`
		e354a5	`extern float __sinf_ia32 (float);`
		e354a5	`float __sinf (float);`
		e354a5
		e354a5	`-libm_ifunc (__sinf, HAS_CPU_FEATURE (SSE2) ? __sinf_sse2 : __sinf_ia32);`
		e354a5	`+libm_ifunc (__sinf, CPU_FEATURE_USABLE (SSE2) ? __sinf_sse2 : __sinf_ia32);`
		e354a5	`libm_alias_float (__sin, sin);`
		e354a5	`#define SINF __sinf_ia32`
		e354a5	`#include <sysdeps/ieee754/flt-32/s_sinf.c>`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/ifunc-impl-list.c b/sysdeps/i386/i686/multiarch/ifunc-impl-list.c`
		e354a5	`index a926b04acdfbb889..06e7231d94e21c02 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/ifunc-impl-list.c`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/ifunc-impl-list.c`
		e354a5	`@@ -38,35 +38,35 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/bcopy.S. */`
		e354a5	`IFUNC_IMPL (i, name, bcopy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, bcopy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, bcopy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__bcopy_ssse3_rep)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, bcopy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, bcopy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__bcopy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, bcopy, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, bcopy, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__bcopy_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, bcopy, 1, __bcopy_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/bzero.S. */`
		e354a5	`IFUNC_IMPL (i, name, bzero,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, bzero, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, bzero, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__bzero_sse2_rep)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, bzero, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, bzero, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__bzero_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, bzero, 1, __bzero_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memchr.S. */`
		e354a5	`IFUNC_IMPL (i, name, memchr,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memchr_sse2_bsf)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memchr_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memchr, 1, __memchr_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memcmp.S. */`
		e354a5	`IFUNC_IMPL (i, name, memcmp,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcmp, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcmp, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__memcmp_sse4_2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcmp, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcmp, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_ia32))`
		e354a5
		e354a5	`@@ -74,13 +74,13 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memmove_chk.S. */`
		e354a5	`IFUNC_IMPL (i, name, __memmove_chk,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memmove_chk_ssse3_rep)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memmove_chk_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memmove_chk_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk, 1,`
		e354a5	`__memmove_chk_ia32))`
		e354a5	`@@ -88,19 +88,19 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memmove.S. */`
		e354a5	`IFUNC_IMPL (i, name, memmove,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memmove, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memmove, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memmove_ssse3_rep)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memmove, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memmove, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memmove_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memmove, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memmove, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memmove_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memrchr.S. */`
		e354a5	`IFUNC_IMPL (i, name, memrchr,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memrchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memrchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memrchr_sse2_bsf)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memrchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memrchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memrchr_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_ia32))`
		e354a5
		e354a5	`@@ -108,10 +108,10 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memset_chk.S. */`
		e354a5	`IFUNC_IMPL (i, name, __memset_chk,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memset_chk_sse2_rep)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memset_chk_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk, 1,`
		e354a5	`__memset_chk_ia32))`
		e354a5	`@@ -119,102 +119,102 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memset.S. */`
		e354a5	`IFUNC_IMPL (i, name, memset,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memset, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memset, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memset_sse2_rep)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memset, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memset, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memset_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memset, 1, __memset_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/rawmemchr.S. */`
		e354a5	`IFUNC_IMPL (i, name, rawmemchr,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, rawmemchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, rawmemchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__rawmemchr_sse2_bsf)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, rawmemchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, rawmemchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__rawmemchr_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, rawmemchr, 1, __rawmemchr_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/stpncpy.S. */`
		e354a5	`IFUNC_IMPL (i, name, stpncpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, stpncpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, stpncpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__stpncpy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, stpncpy, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, stpncpy, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__stpncpy_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, stpncpy, 1, __stpncpy_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/stpcpy.S. */`
		e354a5	`IFUNC_IMPL (i, name, stpcpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, stpcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, stpcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__stpcpy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, stpcpy, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, stpcpy, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__stpcpy_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, stpcpy, 1, __stpcpy_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strcasecmp.S. */`
		e354a5	`IFUNC_IMPL (i, name, strcasecmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strcasecmp_sse4_2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcasecmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp, 1, __strcasecmp_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strcasecmp_l.S. */`
		e354a5	`IFUNC_IMPL (i, name, strcasecmp_l,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp_l,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strcasecmp_l_sse4_2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp_l,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcasecmp_l_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp_l, 1,`
		e354a5	`__strcasecmp_l_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strcat.S. */`
		e354a5	`IFUNC_IMPL (i, name, strcat,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcat, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcat, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcat_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcat, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcat, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strcat_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcat, 1, __strcat_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strchr.S. */`
		e354a5	`IFUNC_IMPL (i, name, strchr,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strchr_sse2_bsf)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strchr_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strcmp.S. */`
		e354a5	`IFUNC_IMPL (i, name, strcmp,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcmp, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcmp, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strcmp_sse4_2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcmp, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcmp, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strcpy.S. */`
		e354a5	`IFUNC_IMPL (i, name, strcpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcpy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcpy, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcpy, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strcpy_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strcspn.S. */`
		e354a5	`IFUNC_IMPL (i, name, strcspn,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcspn, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcspn, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strcspn_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcspn, 1, __strcspn_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strncase.S. */`
		e354a5	`IFUNC_IMPL (i, name, strncasecmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strncasecmp_sse4_2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncasecmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp, 1,`
		e354a5	`__strncasecmp_ia32))`
		e354a5	`@@ -222,91 +222,91 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strncase_l.S. */`
		e354a5	`IFUNC_IMPL (i, name, strncasecmp_l,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp_l,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strncasecmp_l_sse4_2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp_l,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncasecmp_l_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,`
		e354a5	`__strncasecmp_l_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strncat.S. */`
		e354a5	`IFUNC_IMPL (i, name, strncat,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncat, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncat, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncat_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncat, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncat, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strncat_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncat, 1, __strncat_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strncpy.S. */`
		e354a5	`IFUNC_IMPL (i, name, strncpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncpy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncpy, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncpy, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strncpy_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncpy, 1, __strncpy_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strnlen.S. */`
		e354a5	`IFUNC_IMPL (i, name, strnlen,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strnlen, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strnlen, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strnlen_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strpbrk.S. */`
		e354a5	`IFUNC_IMPL (i, name, strpbrk,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strpbrk, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strpbrk, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strpbrk_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strpbrk, 1, __strpbrk_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strrchr.S. */`
		e354a5	`IFUNC_IMPL (i, name, strrchr,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strrchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strrchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strrchr_sse2_bsf)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strrchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strrchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strrchr_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strspn.S. */`
		e354a5	`IFUNC_IMPL (i, name, strspn,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strspn, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strspn, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strspn_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strspn, 1, __strspn_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/wcschr.S. */`
		e354a5	`IFUNC_IMPL (i, name, wcschr,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wcschr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wcschr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__wcschr_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcschr, 1, __wcschr_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/wcscmp.S. */`
		e354a5	`IFUNC_IMPL (i, name, wcscmp,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wcscmp, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wcscmp, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__wcscmp_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcscmp, 1, __wcscmp_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/wcscpy.S. */`
		e354a5	`IFUNC_IMPL (i, name, wcscpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wcscpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wcscpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__wcscpy_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcscpy, 1, __wcscpy_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/wcslen.S. */`
		e354a5	`IFUNC_IMPL (i, name, wcslen,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wcslen, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wcslen, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__wcslen_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcslen, 1, __wcslen_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/wcsrchr.S. */`
		e354a5	`IFUNC_IMPL (i, name, wcsrchr,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wcsrchr, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wcsrchr, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__wcsrchr_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcsrchr, 1, __wcsrchr_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/wmemcmp.S. */`
		e354a5	`IFUNC_IMPL (i, name, wmemcmp,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wmemcmp, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wmemcmp, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__wmemcmp_sse4_2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wmemcmp, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wmemcmp, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__wmemcmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wmemcmp, 1, __wmemcmp_ia32))`
		e354a5
		e354a5	`@@ -314,64 +314,64 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memcpy_chk.S. */`
		e354a5	`IFUNC_IMPL (i, name, __memcpy_chk,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcpy_chk_ssse3_rep)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcpy_chk_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memcpy_chk_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk, 1,`
		e354a5	`__memcpy_chk_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/memcpy.S. */`
		e354a5	`IFUNC_IMPL (i, name, memcpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcpy_ssse3_rep)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcpy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcpy, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcpy, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__memcpy_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/mempcpy_chk.S. */`
		e354a5	`IFUNC_IMPL (i, name, __mempcpy_chk,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__mempcpy_chk_ssse3_rep)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__mempcpy_chk_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__mempcpy_chk_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk, 1,`
		e354a5	`__mempcpy_chk_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/mempcpy.S. */`
		e354a5	`IFUNC_IMPL (i, name, mempcpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, mempcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, mempcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__mempcpy_ssse3_rep)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, mempcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, mempcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__mempcpy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, mempcpy, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, mempcpy, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__mempcpy_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, mempcpy, 1, __mempcpy_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strlen.S. */`
		e354a5	`IFUNC_IMPL (i, name, strlen,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strlen, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strlen, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strlen_sse2_bsf)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strlen, HAS_CPU_FEATURE (SSE2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strlen, CPU_FEATURE_USABLE (SSE2),`
		e354a5	`__strlen_sse2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_ia32))`
		e354a5
		e354a5	`/* Support sysdeps/i386/i686/multiarch/strncmp.S. */`
		e354a5	`IFUNC_IMPL (i, name, strncmp,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncmp, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncmp, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strncmp_sse4_2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncmp, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncmp, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncmp, 1, __strncmp_ia32))`
		e354a5	`#endif`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/ifunc-memmove.h b/sysdeps/i386/i686/multiarch/ifunc-memmove.h`
		e354a5	`index f0e97561784a82d5..cd4333f84b114552 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/ifunc-memmove.h`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/ifunc-memmove.h`
		e354a5	`@@ -33,7 +33,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (sse2_unaligned);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`{`
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Fast_Rep_String))`
		e354a5	`return OPTIMIZE (ssse3_rep);`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/ifunc-memset.h b/sysdeps/i386/i686/multiarch/ifunc-memset.h`
		e354a5	`index e96609439aef30d1..6cf96ebcd480dba4 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/ifunc-memset.h`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/ifunc-memset.h`
		e354a5	`@@ -28,7 +28,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE2))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE2))`
		e354a5	`{`
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Fast_Rep_String))`
		e354a5	`return OPTIMIZE (sse2_rep);`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h b/sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h`
		e354a5	`index f5e7f1b846c28454..de30f004db53f227 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h`
		e354a5	`@@ -28,7 +28,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE2))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE2))`
		e354a5	`{`
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Slow_BSF))`
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h b/sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h`
		e354a5	`index a33fe44f504bd178..299d73e3144698d7 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h`
		e354a5	`@@ -29,11 +29,11 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE2)`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE2)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, Fast_Rep_String))`
		e354a5	`return OPTIMIZE (sse2);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (ia32);`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/ifunc-sse2.h b/sysdeps/i386/i686/multiarch/ifunc-sse2.h`
		e354a5	`index 706c0329c9a76573..e1ba025299037bfb 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/ifunc-sse2.h`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/ifunc-sse2.h`
		e354a5	`@@ -27,7 +27,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE2))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE2))`
		e354a5	`return OPTIMIZE (sse2);`
		e354a5
		e354a5	`return OPTIMIZE (ia32);`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/ifunc-sse4_2.h b/sysdeps/i386/i686/multiarch/ifunc-sse4_2.h`
		e354a5	`index de7fa2f185ad9a59..641cec2ced510524 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/ifunc-sse4_2.h`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/ifunc-sse4_2.h`
		e354a5	`@@ -27,7 +27,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_2))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_2))`
		e354a5	`return OPTIMIZE (sse42);`
		e354a5
		e354a5	`return OPTIMIZE (ia32);`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h b/sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h`
		e354a5	`index bd772a9298ab7d6b..6b2b461e47e94b66 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h`
		e354a5	`@@ -29,10 +29,10 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_2))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_2))`
		e354a5	`return OPTIMIZE (sse4_2);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (ia32);`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/s_fma.c b/sysdeps/i386/i686/multiarch/s_fma.c`
		e354a5	`index 7f39f5fdc972fcc7..0cf6e41b03043911 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/s_fma.c`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/s_fma.c`
		e354a5	`@@ -27,7 +27,7 @@ extern double __fma_ia32 (double x, double y, double z) attribute_hidden;`
		e354a5	`extern double __fma_fma (double x, double y, double z) attribute_hidden;`
		e354a5
		e354a5	`libm_ifunc (__fma,`
		e354a5	`- HAS_ARCH_FEATURE (FMA_Usable) ? __fma_fma : __fma_ia32);`
		e354a5	`+ CPU_FEATURE_USABLE (FMA) ? __fma_fma : __fma_ia32);`
		e354a5	`libm_alias_double (__fma, fma)`
		e354a5
		e354a5	`#define __fma __fma_ia32`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/s_fmaf.c b/sysdeps/i386/i686/multiarch/s_fmaf.c`
		e354a5	`index 1ebb6e975ee86f54..638cd5b10ba57592 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/s_fmaf.c`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/s_fmaf.c`
		e354a5	`@@ -27,7 +27,7 @@ extern float __fmaf_ia32 (float x, float y, float z) attribute_hidden;`
		e354a5	`extern float __fmaf_fma (float x, float y, float z) attribute_hidden;`
		e354a5
		e354a5	`libm_ifunc (__fmaf,`
		e354a5	`- HAS_ARCH_FEATURE (FMA_Usable) ? __fmaf_fma : __fmaf_ia32);`
		e354a5	`+ CPU_FEATURE_USABLE (FMA) ? __fmaf_fma : __fmaf_ia32);`
		e354a5	`libm_alias_float (__fma, fma)`
		e354a5
		e354a5	`#define __fmaf __fmaf_ia32`
		e354a5	`diff --git a/sysdeps/i386/i686/multiarch/wcscpy.c b/sysdeps/i386/i686/multiarch/wcscpy.c`
		e354a5	`index be89ab81b066d463..ea149b0d3af357f2 100644`
		e354a5	`--- a/sysdeps/i386/i686/multiarch/wcscpy.c`
		e354a5	`+++ b/sysdeps/i386/i686/multiarch/wcscpy.c`
		e354a5	`@@ -34,7 +34,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (ia32);`
		e354a5	`diff --git a/sysdeps/i386/setfpucw.c b/sysdeps/i386/setfpucw.c`
		e354a5	`index 931302bcd03d221b..3fa2651d46a70ab6 100644`
		e354a5	`--- a/sysdeps/i386/setfpucw.c`
		e354a5	`+++ b/sysdeps/i386/setfpucw.c`
		e354a5	`@@ -39,7 +39,7 @@ __setfpucw (fpu_control_t set)`
		e354a5	`__asm__ ("fldcw %0" : : "m" (*&cw);;`
		e354a5
		e354a5	`/* If the CPU supports SSE, we set the MXCSR as well. */`
		e354a5	`- if (HAS_CPU_FEATURE (SSE))`
		e354a5	`+ if (CPU_FEATURE_USABLE (SSE))`
		e354a5	`{`
		e354a5	`unsigned int xnew_exc;`
		e354a5
		e354a5	`diff --git a/sysdeps/unix/sysv/linux/x86/elision-conf.c b/sysdeps/unix/sysv/linux/x86/elision-conf.c`
		e354a5	`index 22af294426596add..bdfc514a238f92a8 100644`
		e354a5	`--- a/sysdeps/unix/sysv/linux/x86/elision-conf.c`
		e354a5	`+++ b/sysdeps/unix/sysv/linux/x86/elision-conf.c`
		e354a5	`@@ -64,7 +64,7 @@ do_set_elision_enable (int32_t elision_enable)`
		e354a5	`if __libc_enable_secure isn't enabled since elision_enable will be set`
		e354a5	`according to the default, which is disabled. */`
		e354a5	`if (elision_enable == 1)`
		e354a5	`- __pthread_force_elision = HAS_CPU_FEATURE (RTM) ? 1 : 0;`
		e354a5	`+ __pthread_force_elision = CPU_FEATURE_USABLE (RTM) ? 1 : 0;`
		e354a5	`}`
		e354a5
		e354a5	`/* The pthread->elision_enable tunable is 0 or 1 indicating that elision`
		e354a5	`diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c`
		e354a5	`index f4edbc0103beb435..fdfe2684759d968c 100644`
		e354a5	`--- a/sysdeps/x86/cacheinfo.c`
		e354a5	`+++ b/sysdeps/x86/cacheinfo.c`
		e354a5	`@@ -583,7 +583,7 @@ get_common_cache_info (long int shared_ptr, unsigned int threads_ptr,`
		e354a5
		e354a5	`/* A value of 0 for the HTT bit indicates there is only a single`
		e354a5	`logical processor. */`
		e354a5	`- if (HAS_CPU_FEATURE (HTT))`
		e354a5	`+ if (CPU_FEATURE_USABLE (HTT))`
		e354a5	`{`
		e354a5	`/* Figure out the number of logical threads that share the`
		e354a5	`highest cache level. */`
		e354a5	`@@ -732,7 +732,7 @@ intel_bug_no_cache_info:`
		e354a5	`/* Assume that all logical threads share the highest cache`
		e354a5	`level. */`
		e354a5	`threads`
		e354a5	`- = ((cpu_features->cpuid[COMMON_CPUID_INDEX_1].ebx`
		e354a5	`+ = ((cpu_features->features[COMMON_CPUID_INDEX_1].cpuid.ebx`
		e354a5	`>> 16) & 0xff);`
		e354a5	`}`
		e354a5
		e354a5	`@@ -887,14 +887,14 @@ init_cacheinfo (void)`
		e354a5	`unsigned int minimum_rep_movsb_threshold;`
		e354a5	`/* NB: The default REP MOVSB threshold is 2048 * (VEC_SIZE / 16). */`
		e354a5	`unsigned int rep_movsb_threshold;`
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable)`
		e354a5	`- && !CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_AVX512))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F)`
		e354a5	`+ && !CPU_FEATURE_PREFERRED_P (cpu_features, Prefer_No_AVX512))`
		e354a5	`{`
		e354a5	`rep_movsb_threshold = 2048 * (64 / 16);`
		e354a5	`minimum_rep_movsb_threshold = 64 * 8;`
		e354a5	`}`
		e354a5	`- else if (CPU_FEATURES_ARCH_P (cpu_features,`
		e354a5	`- AVX_Fast_Unaligned_Load))`
		e354a5	`+ else if (CPU_FEATURE_PREFERRED_P (cpu_features,`
		e354a5	`+ AVX_Fast_Unaligned_Load))`
		e354a5	`{`
		e354a5	`rep_movsb_threshold = 2048 * (32 / 16);`
		e354a5	`minimum_rep_movsb_threshold = 32 * 8;`
		e354a5	`diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c`
		e354a5	`index ad470f79ef7769fc..f13a1df4555c7000 100644`
		e354a5	`--- a/sysdeps/x86/cpu-features.c`
		e354a5	`+++ b/sysdeps/x86/cpu-features.c`
		e354a5	`@@ -42,73 +42,109 @@ extern void TUNABLE_CALLBACK (set_x86_shstk) (tunable_val_t *)`
		e354a5	`#endif`
		e354a5
		e354a5	`static void`
		e354a5	`-get_extended_indices (struct cpu_features *cpu_features)`
		e354a5	`+update_usable (struct cpu_features *cpu_features)`
		e354a5	`{`
		e354a5	`- unsigned int eax, ebx, ecx, edx;`
		e354a5	`- __cpuid (0x80000000, eax, ebx, ecx, edx);`
		e354a5	`- if (eax >= 0x80000001)`
		e354a5	`- __cpuid (0x80000001,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].eax,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].ebx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].ecx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].edx);`
		e354a5	`- if (eax >= 0x80000007)`
		e354a5	`- __cpuid (0x80000007,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000007].eax,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000007].ebx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000007].ecx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000007].edx);`
		e354a5	`- if (eax >= 0x80000008)`
		e354a5	`- __cpuid (0x80000008,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000008].eax,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000008].ebx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000008].ecx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_80000008].edx);`
		e354a5	`-}`
		e354a5	`-`
		e354a5	`-static void`
		e354a5	`-get_common_indices (struct cpu_features *cpu_features,`
		e354a5	`- unsigned int family, unsigned int model,`
		e354a5	`- unsigned int extended_model, unsigned int stepping)`
		e354a5	`-{`
		e354a5	`- if (family)`
		e354a5	`- {`
		e354a5	`- unsigned int eax;`
		e354a5	`- __cpuid (1, eax, cpu_features->cpuid[COMMON_CPUID_INDEX_1].ebx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_1].ecx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_1].edx);`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_1].eax = eax;`
		e354a5	`- *family = (eax >> 8) & 0x0f;`
		e354a5	`- *model = (eax >> 4) & 0x0f;`
		e354a5	`- *extended_model = (eax >> 12) & 0xf0;`
		e354a5	`- *stepping = eax & 0x0f;`
		e354a5	`- if (*family == 0x0f)`
		e354a5	`- {`
		e354a5	`- *family += (eax >> 20) & 0xff;`
		e354a5	`- model += extended_model;`
		e354a5	`- }`
		e354a5	`- }`
		e354a5	`-`
		e354a5	`- if (cpu_features->basic.max_cpuid >= 7)`
		e354a5	`- {`
		e354a5	`- __cpuid_count (7, 0,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_7].eax,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_7].ebx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_7].ecx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_7].edx);`
		e354a5	`- __cpuid_count (7, 1,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_7_ECX_1].eax,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_7_ECX_1].ebx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_7_ECX_1].ecx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_7_ECX_1].edx);`
		e354a5	`- }`
		e354a5	`-`
		e354a5	`- if (cpu_features->basic.max_cpuid >= 0xd)`
		e354a5	`- __cpuid_count (0xd, 1,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_D_ECX_1].eax,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_D_ECX_1].ebx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_D_ECX_1].ecx,`
		e354a5	`- cpu_features->cpuid[COMMON_CPUID_INDEX_D_ECX_1].edx);`
		e354a5	`+ /* Before COMMON_CPUID_INDEX_80000001, copy the cpuid array elements to`
		e354a5	`+ the usable array. */`
		e354a5	`+ unsigned int i;`
		e354a5	`+ for (i = 0; i < COMMON_CPUID_INDEX_80000001; i++)`
		e354a5	`+ cpu_features->features[i].usable = cpu_features->features[i].cpuid;`
		e354a5	`+`
		e354a5	`+ /* Before COMMON_CPUID_INDEX_80000001, clear the unknown usable bits`
		e354a5	`+ and the always zero bits. */`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_1_ECX_16);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_1_ECX_31);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_1_EDX_10);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_1_EDX_20);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_1_EDX_30);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EBX_6);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EBX_22);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_ECX_13);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_ECX_15);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_ECX_16);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_ECX_23);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_ECX_24);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_ECX_26);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_0);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_1);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_5);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_6);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_7);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_9);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_11);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_12);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_13);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_17);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_19);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_21);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, INDEX_7_EDX_23);`
		e354a5	`+`
		e354a5	`+ /* EAX/EBX from COMMON_CPUID_INDEX_1 and EAX from COMMON_CPUID_INDEX_7`
		e354a5	`+ aren't used for CPU feature detection. */`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_1].usable.eax = 0;`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_1].usable.ebx = 0;`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7].usable.eax = 0;`
		e354a5	`+`
		e354a5	`+ /* Starting from COMMON_CPUID_INDEX_80000001, copy the cpuid bits to`
		e354a5	`+ usable bits. */`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, LAHF64_SAHF64);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, SVM);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, LZCNT);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, SSE4A);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, PREFETCHW);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, XOP);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, LWP);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, FMA4);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, TBM);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, SYSCALL_SYSRET);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, NX);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, PAGE1GB);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, RDTSCP);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, LM);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, XSAVEOPT);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, XSAVEC);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, XGETBV_ECX_1);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, XSAVES);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, XFD);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, INVARIANT_TSC);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, WBNOINVD);`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_BF16);`
		e354a5	`+`
		e354a5	`+ /* MPX has been deprecated. */`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, MPX);`
		e354a5	`+`
		e354a5	`+ /* Clear the usable bits which require OS support. */`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, FMA);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, F16C);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX2);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512F);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512DQ);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_IFMA);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512PF);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512ER);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512CD);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512BW);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512VL);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_VBMI);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, PKU);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_VBMI2);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, VAES);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, VPCLMULQDQ);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_VNNI);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_BITALG);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_VPOPCNTDQ);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_4VNNIW);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_4FMAPS);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_VP2INTERSECT);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AMX_BF16);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AMX_TILE);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AMX_INT8);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, XOP);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, FMA4);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, XSAVEC);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, XFD);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX512_BF16);`
		e354a5
		e354a5	`/* Can we call xgetbv? */`
		e354a5	`if (CPU_FEATURES_CPU_P (cpu_features, OSXSAVE))`
		e354a5	`@@ -123,40 +159,28 @@ get_common_indices (struct cpu_features *cpu_features,`
		e354a5	`/* Determine if AVX is usable. */`
		e354a5	`if (CPU_FEATURES_CPU_P (cpu_features, AVX))`
		e354a5	`{`
		e354a5	`- cpu_features->usable[index_arch_AVX_Usable]`
		e354a5	`- \|= bit_arch_AVX_Usable;`
		e354a5	`+ CPU_FEATURE_SET (cpu_features, AVX);`
		e354a5	`/* The following features depend on AVX being usable. */`
		e354a5	`/* Determine if AVX2 is usable. */`
		e354a5	`if (CPU_FEATURES_CPU_P (cpu_features, AVX2))`
		e354a5	`- {`
		e354a5	`- cpu_features->usable[index_arch_AVX2_Usable]`
		e354a5	`- \|= bit_arch_AVX2_Usable;`
		e354a5	`-`
		e354a5	`- /* Unaligned load with 256-bit AVX registers are faster on`
		e354a5	`- Intel/AMD processors with AVX2. */`
		e354a5	`- cpu_features->preferred[index_arch_AVX_Fast_Unaligned_Load]`
		e354a5	`- \|= bit_arch_AVX_Fast_Unaligned_Load;`
		e354a5	`- }`
		e354a5	`+ {`
		e354a5	`+ CPU_FEATURE_SET (cpu_features, AVX2);`
		e354a5	`+`
		e354a5	`+ /* Unaligned load with 256-bit AVX registers are faster`
		e354a5	`+ on Intel/AMD processors with AVX2. */`
		e354a5	`+ cpu_features->preferred[index_arch_AVX_Fast_Unaligned_Load]`
		e354a5	`+ \|= bit_arch_AVX_Fast_Unaligned_Load;`
		e354a5	`+ }`
		e354a5	`/* Determine if FMA is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, FMA))`
		e354a5	`- cpu_features->usable[index_arch_FMA_Usable]`
		e354a5	`- \|= bit_arch_FMA_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, FMA);`
		e354a5	`/* Determine if VAES is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, VAES))`
		e354a5	`- cpu_features->usable[index_arch_VAES_Usable]`
		e354a5	`- \|= bit_arch_VAES_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, VAES);`
		e354a5	`/* Determine if VPCLMULQDQ is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, VPCLMULQDQ))`
		e354a5	`- cpu_features->usable[index_arch_VPCLMULQDQ_Usable]`
		e354a5	`- \|= bit_arch_VPCLMULQDQ_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, VPCLMULQDQ);`
		e354a5	`/* Determine if XOP is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, XOP))`
		e354a5	`- cpu_features->usable[index_arch_XOP_Usable]`
		e354a5	`- \|= bit_arch_XOP_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, XOP);`
		e354a5	`/* Determine if F16C is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, F16C))`
		e354a5	`- cpu_features->usable[index_arch_F16C_Usable]`
		e354a5	`- \|= bit_arch_F16C_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, F16C);`
		e354a5	`}`
		e354a5
		e354a5	`/* Check if OPMASK state, upper 256-bit of ZMM0-ZMM15 and`
		e354a5	`@@ -168,73 +192,41 @@ get_common_indices (struct cpu_features *cpu_features,`
		e354a5	`/* Determine if AVX512F is usable. */`
		e354a5	`if (CPU_FEATURES_CPU_P (cpu_features, AVX512F))`
		e354a5	`{`
		e354a5	`- cpu_features->usable[index_arch_AVX512F_Usable]`
		e354a5	`- \|= bit_arch_AVX512F_Usable;`
		e354a5	`+ CPU_FEATURE_SET (cpu_features, AVX512F);`
		e354a5	`/* Determine if AVX512CD is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512CD))`
		e354a5	`- cpu_features->usable[index_arch_AVX512CD_Usable]`
		e354a5	`- \|= bit_arch_AVX512CD_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512CD);`
		e354a5	`/* Determine if AVX512ER is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512ER))`
		e354a5	`- cpu_features->usable[index_arch_AVX512ER_Usable]`
		e354a5	`- \|= bit_arch_AVX512ER_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512ER);`
		e354a5	`/* Determine if AVX512PF is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512PF))`
		e354a5	`- cpu_features->usable[index_arch_AVX512PF_Usable]`
		e354a5	`- \|= bit_arch_AVX512PF_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512PF);`
		e354a5	`/* Determine if AVX512VL is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512VL))`
		e354a5	`- cpu_features->usable[index_arch_AVX512VL_Usable]`
		e354a5	`- \|= bit_arch_AVX512VL_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512VL);`
		e354a5	`/* Determine if AVX512DQ is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512DQ))`
		e354a5	`- cpu_features->usable[index_arch_AVX512DQ_Usable]`
		e354a5	`- \|= bit_arch_AVX512DQ_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512DQ);`
		e354a5	`/* Determine if AVX512BW is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512BW))`
		e354a5	`- cpu_features->usable[index_arch_AVX512BW_Usable]`
		e354a5	`- \|= bit_arch_AVX512BW_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512BW);`
		e354a5	`/* Determine if AVX512_4FMAPS is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_4FMAPS))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_4FMAPS_Usable]`
		e354a5	`- \|= bit_arch_AVX512_4FMAPS_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_4FMAPS);`
		e354a5	`/* Determine if AVX512_4VNNIW is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_4VNNIW))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_4VNNIW_Usable]`
		e354a5	`- \|= bit_arch_AVX512_4VNNIW_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_4VNNIW);`
		e354a5	`/* Determine if AVX512_BITALG is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_BITALG))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_BITALG_Usable]`
		e354a5	`- \|= bit_arch_AVX512_BITALG_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_BITALG);`
		e354a5	`/* Determine if AVX512_IFMA is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_IFMA))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_IFMA_Usable]`
		e354a5	`- \|= bit_arch_AVX512_IFMA_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_IFMA);`
		e354a5	`/* Determine if AVX512_VBMI is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_VBMI))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_VBMI_Usable]`
		e354a5	`- \|= bit_arch_AVX512_VBMI_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_VBMI);`
		e354a5	`/* Determine if AVX512_VBMI2 is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_VBMI2))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_VBMI2_Usable]`
		e354a5	`- \|= bit_arch_AVX512_VBMI2_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_VBMI2);`
		e354a5	`/* Determine if is AVX512_VNNI usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_VNNI))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_VNNI_Usable]`
		e354a5	`- \|= bit_arch_AVX512_VNNI_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_VNNI);`
		e354a5	`/* Determine if AVX512_VPOPCNTDQ is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_VPOPCNTDQ))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_VPOPCNTDQ_Usable]`
		e354a5	`- \|= bit_arch_AVX512_VPOPCNTDQ_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features,`
		e354a5	`+ AVX512_VPOPCNTDQ);`
		e354a5	`/* Determine if AVX512_VP2INTERSECT is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features,`
		e354a5	`- AVX512_VP2INTERSECT))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_VP2INTERSECT_Usable]`
		e354a5	`- \|= bit_arch_AVX512_VP2INTERSECT_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features,`
		e354a5	`+ AVX512_VP2INTERSECT);`
		e354a5	`/* Determine if AVX512_BF16 is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512_BF16))`
		e354a5	`- cpu_features->usable[index_arch_AVX512_BF16_Usable]`
		e354a5	`- \|= bit_arch_AVX512_BF16_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AVX512_BF16);`
		e354a5	`}`
		e354a5	`}`
		e354a5	`}`
		e354a5	`@@ -244,19 +236,17 @@ get_common_indices (struct cpu_features *cpu_features,`
		e354a5	`== (bit_XTILECFG_state \| bit_XTILEDATA_state))`
		e354a5	`{`
		e354a5	`/* Determine if AMX_BF16 is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AMX_BF16))`
		e354a5	`- cpu_features->usable[index_arch_AMX_BF16_Usable]`
		e354a5	`- \|= bit_arch_AMX_BF16_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AMX_BF16);`
		e354a5	`/* Determine if AMX_TILE is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AMX_TILE))`
		e354a5	`- cpu_features->usable[index_arch_AMX_TILE_Usable]`
		e354a5	`- \|= bit_arch_AMX_TILE_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AMX_TILE);`
		e354a5	`/* Determine if AMX_INT8 is usable. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AMX_INT8))`
		e354a5	`- cpu_features->usable[index_arch_AMX_INT8_Usable]`
		e354a5	`- \|= bit_arch_AMX_INT8_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, AMX_INT8);`
		e354a5	`}`
		e354a5
		e354a5	`+`
		e354a5	`+ /* XFD is usable only when OSXSAVE is enabled. */`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, XFD);`
		e354a5	`+`
		e354a5	`/* For _dl_runtime_resolve, set xsave_state_size to xsave area`
		e354a5	`size + integer register save size and align it to 64 bytes. */`
		e354a5	`if (cpu_features->basic.max_cpuid >= 0xd)`
		e354a5	`@@ -318,8 +308,7 @@ get_common_indices (struct cpu_features *cpu_features,`
		e354a5	`{`
		e354a5	`cpu_features->xsave_state_size`
		e354a5	`= ALIGN_UP (size + STATE_SAVE_OFFSET, 64);`
		e354a5	`- cpu_features->usable[index_arch_XSAVEC_Usable]`
		e354a5	`- \|= bit_arch_XSAVEC_Usable;`
		e354a5	`+ CPU_FEATURE_SET (cpu_features, XSAVEC);`
		e354a5	`}`
		e354a5	`}`
		e354a5	`}`
		e354a5	`@@ -328,8 +317,79 @@ get_common_indices (struct cpu_features *cpu_features,`
		e354a5
		e354a5	`/* Determine if PKU is usable. */`
		e354a5	`if (CPU_FEATURES_CPU_P (cpu_features, OSPKE))`
		e354a5	`- cpu_features->usable[index_arch_PKU_Usable]`
		e354a5	`- \|= bit_arch_PKU_Usable;`
		e354a5	`+ CPU_FEATURE_SET (cpu_features, PKU);`
		e354a5	`+}`
		e354a5	`+`
		e354a5	`+static void`
		e354a5	`+get_extended_indices (struct cpu_features *cpu_features)`
		e354a5	`+{`
		e354a5	`+ unsigned int eax, ebx, ecx, edx;`
		e354a5	`+ __cpuid (0x80000000, eax, ebx, ecx, edx);`
		e354a5	`+ if (eax >= 0x80000001)`
		e354a5	`+ __cpuid (0x80000001,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000001].cpuid.eax,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000001].cpuid.ebx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000001].cpuid.ecx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000001].cpuid.edx);`
		e354a5	`+ if (eax >= 0x80000007)`
		e354a5	`+ __cpuid (0x80000007,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000007].cpuid.eax,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000007].cpuid.ebx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000007].cpuid.ecx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000007].cpuid.edx);`
		e354a5	`+ if (eax >= 0x80000008)`
		e354a5	`+ __cpuid (0x80000008,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000008].cpuid.eax,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000008].cpuid.ebx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000008].cpuid.ecx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_80000008].cpuid.edx);`
		e354a5	`+}`
		e354a5	`+`
		e354a5	`+static void`
		e354a5	`+get_common_indices (struct cpu_features *cpu_features,`
		e354a5	`+ unsigned int family, unsigned int model,`
		e354a5	`+ unsigned int extended_model, unsigned int stepping)`
		e354a5	`+{`
		e354a5	`+ if (family)`
		e354a5	`+ {`
		e354a5	`+ unsigned int eax;`
		e354a5	`+ __cpuid (1, eax,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_1].cpuid.ebx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_1].cpuid.ecx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_1].cpuid.edx);`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_1].cpuid.eax = eax;`
		e354a5	`+ *family = (eax >> 8) & 0x0f;`
		e354a5	`+ *model = (eax >> 4) & 0x0f;`
		e354a5	`+ *extended_model = (eax >> 12) & 0xf0;`
		e354a5	`+ *stepping = eax & 0x0f;`
		e354a5	`+ if (*family == 0x0f)`
		e354a5	`+ {`
		e354a5	`+ *family += (eax >> 20) & 0xff;`
		e354a5	`+ model += extended_model;`
		e354a5	`+ }`
		e354a5	`+ }`
		e354a5	`+`
		e354a5	`+ if (cpu_features->basic.max_cpuid >= 7)`
		e354a5	`+ {`
		e354a5	`+ __cpuid_count (7, 0,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7].cpuid.eax,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7].cpuid.ebx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7].cpuid.ecx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7].cpuid.edx);`
		e354a5	`+ __cpuid_count (7, 1,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7_ECX_1].cpuid.eax,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7_ECX_1].cpuid.ebx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7_ECX_1].cpuid.ecx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_7_ECX_1].cpuid.edx);`
		e354a5	`+ }`
		e354a5	`+`
		e354a5	`+ if (cpu_features->basic.max_cpuid >= 0xd)`
		e354a5	`+ __cpuid_count (0xd, 1,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_D_ECX_1].cpuid.eax,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_D_ECX_1].cpuid.ebx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_D_ECX_1].cpuid.ecx,`
		e354a5	`+ cpu_features->features[COMMON_CPUID_INDEX_D_ECX_1].cpuid.edx);`
		e354a5	`+`
		e354a5	`}`
		e354a5
		e354a5	`_Static_assert (((index_arch_Fast_Unaligned_Load`
		e354a5	`@@ -353,8 +413,6 @@ init_cpu_features (struct cpu_features *cpu_features)`
		e354a5	`unsigned int stepping = 0;`
		e354a5	`enum cpu_features_kind kind;`
		e354a5
		e354a5	`- cpu_features->usable_p = cpu_features->usable;`
		e354a5	`-`
		e354a5	`#if !HAS_CPUID`
		e354a5	`if (__get_cpuid_max (0, 0) == 0)`
		e354a5	`{`
		e354a5	`@@ -377,6 +435,8 @@ init_cpu_features (struct cpu_features *cpu_features)`
		e354a5
		e354a5	`get_extended_indices (cpu_features);`
		e354a5
		e354a5	`+ update_usable (cpu_features);`
		e354a5	`+`
		e354a5	`if (family == 0x06)`
		e354a5	`{`
		e354a5	`model += extended_model;`
		e354a5	`@@ -473,7 +533,7 @@ init_cpu_features (struct cpu_features *cpu_features)`
		e354a5	`with stepping >= 4) to avoid TSX on kernels that weren't`
		e354a5	`updated with the latest microcode package (which disables`
		e354a5	`broken feature by default). */`
		e354a5	`- cpu_features->cpuid[index_cpu_RTM].reg_RTM &= ~bit_cpu_RTM;`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, RTM);`
		e354a5	`break;`
		e354a5	`}`
		e354a5	`}`
		e354a5	`@@ -501,15 +561,15 @@ init_cpu_features (struct cpu_features *cpu_features)`
		e354a5
		e354a5	`get_extended_indices (cpu_features);`
		e354a5
		e354a5	`- ecx = cpu_features->cpuid[COMMON_CPUID_INDEX_1].ecx;`
		e354a5	`+ update_usable (cpu_features);`
		e354a5
		e354a5	`- if (HAS_ARCH_FEATURE (AVX_Usable))`
		e354a5	`+ ecx = cpu_features->features[COMMON_CPUID_INDEX_1].cpuid.ecx;`
		e354a5	`+`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX))`
		e354a5	`{`
		e354a5	`/* Since the FMA4 bit is in COMMON_CPUID_INDEX_80000001 and`
		e354a5	`FMA4 requires AVX, determine if FMA4 is usable here. */`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, FMA4))`
		e354a5	`- cpu_features->usable[index_arch_FMA4_Usable]`
		e354a5	`- \|= bit_arch_FMA4_Usable;`
		e354a5	`+ CPU_FEATURE_SET_USABLE (cpu_features, FMA4);`
		e354a5	`}`
		e354a5
		e354a5	`if (family == 0x15)`
		e354a5	`@@ -540,13 +600,15 @@ init_cpu_features (struct cpu_features *cpu_features)`
		e354a5
		e354a5	`get_extended_indices (cpu_features);`
		e354a5
		e354a5	`+ update_usable (cpu_features);`
		e354a5	`+`
		e354a5	`model += extended_model;`
		e354a5	`if (family == 0x6)`
		e354a5	`{`
		e354a5	`if (model == 0xf \|\| model == 0x19)`
		e354a5	`{`
		e354a5	`- cpu_features->usable[index_arch_AVX_Usable]`
		e354a5	`- &= ~(bit_arch_AVX_Usable \| bit_arch_AVX2_Usable);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX2);`
		e354a5
		e354a5	`cpu_features->preferred[index_arch_Slow_SSE4_2]`
		e354a5	`\|= bit_arch_Slow_SSE4_2;`
		e354a5	`@@ -559,8 +621,8 @@ init_cpu_features (struct cpu_features *cpu_features)`
		e354a5	`{`
		e354a5	`if (model == 0x1b)`
		e354a5	`{`
		e354a5	`- cpu_features->usable[index_arch_AVX_Usable]`
		e354a5	`- &= ~(bit_arch_AVX_Usable \| bit_arch_AVX2_Usable);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX2);`
		e354a5
		e354a5	`cpu_features->preferred[index_arch_Slow_SSE4_2]`
		e354a5	`\|= bit_arch_Slow_SSE4_2;`
		e354a5	`@@ -570,8 +632,8 @@ init_cpu_features (struct cpu_features *cpu_features)`
		e354a5	`}`
		e354a5	`else if (model == 0x3b)`
		e354a5	`{`
		e354a5	`- cpu_features->usable[index_arch_AVX_Usable]`
		e354a5	`- &= ~(bit_arch_AVX_Usable \| bit_arch_AVX2_Usable);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX);`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, AVX2);`
		e354a5
		e354a5	`cpu_features->preferred[index_arch_AVX_Fast_Unaligned_Load]`
		e354a5	`&= ~bit_arch_AVX_Fast_Unaligned_Load;`
		e354a5	`@@ -582,6 +644,7 @@ init_cpu_features (struct cpu_features *cpu_features)`
		e354a5	`{`
		e354a5	`kind = arch_kind_other;`
		e354a5	`get_common_indices (cpu_features, NULL, NULL, NULL, NULL);`
		e354a5	`+ update_usable (cpu_features);`
		e354a5	`}`
		e354a5
		e354a5	`/* Support i586 if CX8 is available. */`
		e354a5	`@@ -628,31 +691,30 @@ no_cpuid:`
		e354a5	`{`
		e354a5	`const char *platform = NULL;`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, AVX512CD))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512CD))`
		e354a5	`{`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512ER))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512ER))`
		e354a5	`{`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512PF))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512PF))`
		e354a5	`platform = "xeon_phi";`
		e354a5	`}`
		e354a5	`else`
		e354a5	`{`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, AVX512BW)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, AVX512DQ)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, AVX512VL))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512BW)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX512DQ)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX512VL))`
		e354a5	`GLRO(dl_hwcap) \|= HWCAP_X86_AVX512_1;`
		e354a5	`}`
		e354a5	`}`
		e354a5
		e354a5	`if (platform == NULL`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, BMI1)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, BMI2)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, LZCNT)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, MOVBE)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, POPCNT))`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, FMA)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, BMI1)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, BMI2)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, LZCNT)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, MOVBE)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, POPCNT))`
		e354a5	`platform = "haswell";`
		e354a5
		e354a5	`if (platform != NULL)`
		e354a5	`@@ -660,7 +722,7 @@ no_cpuid:`
		e354a5	`}`
		e354a5	`#else`
		e354a5	`GLRO(dl_hwcap) = 0;`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE2))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE2))`
		e354a5	`GLRO(dl_hwcap) \|= HWCAP_X86_SSE2;`
		e354a5
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, I686))`
		e354a5	`@@ -695,9 +757,9 @@ no_cpuid:`
		e354a5	`GLIBC_TUNABLES=glibc.cpu.hwcaps=-IBT,-SHSTK`
		e354a5	`*/`
		e354a5	`unsigned int cet_feature = 0;`
		e354a5	`- if (!HAS_CPU_FEATURE (IBT))`
		e354a5	`+ if (!CPU_FEATURE_USABLE (IBT))`
		e354a5	`cet_feature \|= GNU_PROPERTY_X86_FEATURE_1_IBT;`
		e354a5	`- if (!HAS_CPU_FEATURE (SHSTK))`
		e354a5	`+ if (!CPU_FEATURE_USABLE (SHSTK))`
		e354a5	`cet_feature \|= GNU_PROPERTY_X86_FEATURE_1_SHSTK;`
		e354a5
		e354a5	`if (cet_feature)`
		e354a5	`diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h`
		e354a5	`index 0f19c64352c4d7f1..21708c028a12dbb2 100644`
		e354a5	`--- a/sysdeps/x86/cpu-features.h`
		e354a5	`+++ b/sysdeps/x86/cpu-features.h`
		e354a5	`@@ -18,15 +18,6 @@`
		e354a5	`#ifndef cpu_features_h`
		e354a5	`#define cpu_features_h`
		e354a5
		e354a5	`-enum`
		e354a5	`-{`
		e354a5	`- /* The integer bit array index for the first set of usable feature`
		e354a5	`- bits. */`
		e354a5	`- USABLE_FEATURE_INDEX_1 = 0,`
		e354a5	`- /* The current maximum size of the feature integer bit array. */`
		e354a5	`- USABLE_FEATURE_INDEX_MAX`
		e354a5	`-};`
		e354a5	`-`
		e354a5	`enum`
		e354a5	`{`
		e354a5	`/* The integer bit array index for the first set of preferred feature`
		e354a5	`@@ -57,6 +48,12 @@ struct cpuid_registers`
		e354a5	`unsigned int edx;`
		e354a5	`};`
		e354a5
		e354a5	`+struct cpuid_features`
		e354a5	`+{`
		e354a5	`+ struct cpuid_registers cpuid;`
		e354a5	`+ struct cpuid_registers usable;`
		e354a5	`+};`
		e354a5	`+`
		e354a5	`enum cpu_features_kind`
		e354a5	`{`
		e354a5	`arch_kind_unknown = 0,`
		e354a5	`@@ -78,9 +75,7 @@ struct cpu_features_basic`
		e354a5	`struct cpu_features`
		e354a5	`{`
		e354a5	`struct cpu_features_basic basic;`
		e354a5	`- unsigned int *usable_p;`
		e354a5	`- struct cpuid_registers cpuid[COMMON_CPUID_INDEX_MAX];`
		e354a5	`- unsigned int usable[USABLE_FEATURE_INDEX_MAX];`
		e354a5	`+ struct cpuid_features features[COMMON_CPUID_INDEX_MAX];`
		e354a5	`unsigned int preferred[PREFERRED_FEATURE_INDEX_MAX];`
		e354a5	`/* The state size for XSAVEC or XSAVE. The type must be unsigned long`
		e354a5	`int so that we use`
		e354a5	`@@ -91,7 +86,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.cpu.hwcaps=-XSAVEC_Usable`
		e354a5	`+ GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC`
		e354a5	`*/`
		e354a5	`unsigned int xsave_state_full_size;`
		e354a5	`/* Data cache size for use in memory and string routines, typically`
		e354a5	`@@ -114,117 +109,40 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`__attribute__ ((const));`
		e354a5
		e354a5	`/* Only used directly in cpu-features.c. */`
		e354a5	`-# define CPU_FEATURES_CPU_P(ptr, name) \`
		e354a5	`- ((ptr->cpuid[index_cpu_##name].reg_##name & (bit_cpu_##name)) != 0)`
		e354a5	`-# define CPU_FEATURES_ARCH_P(ptr, name) \`
		e354a5	`- ((ptr->feature_##name[index_arch_##name] & (bit_arch_##name)) != 0)`
		e354a5	`+#define CPU_FEATURE_CHECK_P(ptr, name, check) \`
		e354a5	`+ ((ptr->features[index_cpu_##name].check.reg_##name \`
		e354a5	`+ & bit_cpu_##name) != 0)`
		e354a5	`+#define CPU_FEATURE_SET(ptr, name) \`
		e354a5	`+ ptr->features[index_cpu_##name].usable.reg_##name \|= bit_cpu_##name;`
		e354a5	`+#define CPU_FEATURE_UNSET(ptr, name) \`
		e354a5	`+ ptr->features[index_cpu_##name].usable.reg_##name &= ~bit_cpu_##name;`
		e354a5	`+#define CPU_FEATURE_SET_USABLE(ptr, name) \`
		e354a5	`+ ptr->features[index_cpu_##name].usable.reg_##name \`
		e354a5	`+ \|= ptr->features[index_cpu_##name].cpuid.reg_##name & bit_cpu_##name;`
		e354a5	`+#define CPU_FEATURE_PREFERRED_P(ptr, name) \`
		e354a5	`+ ((ptr->preferred[index_arch_##name] & bit_arch_##name) != 0)`
		e354a5	`+#define CPU_FEATURE_CPU_P(ptr, name) \`
		e354a5	`+ CPU_FEATURE_CHECK_P (ptr, name, cpuid)`
		e354a5	`+#define CPU_FEATURE_USABLE_P(ptr, name) \`
		e354a5	`+ CPU_FEATURE_CHECK_P (ptr, name, usable)`
		e354a5
		e354a5	`/* HAS_CPU_FEATURE evaluates to true if CPU supports the feature. */`
		e354a5	`#define HAS_CPU_FEATURE(name) \`
		e354a5	`- CPU_FEATURES_CPU_P (__get_cpu_features (), name)`
		e354a5	`-/* HAS_ARCH_FEATURE evaluates to true if we may use the feature at`
		e354a5	`- runtime. */`
		e354a5	`-# define HAS_ARCH_FEATURE(name) \`
		e354a5	`- CPU_FEATURES_ARCH_P (__get_cpu_features (), name)`
		e354a5	`+ CPU_FEATURE_CPU_P (__get_cpu_features (), name)`
		e354a5	`/* CPU_FEATURE_USABLE evaluates to true if the feature is usable. */`
		e354a5	`#define CPU_FEATURE_USABLE(name) \`
		e354a5	`- HAS_ARCH_FEATURE (name##_Usable)`
		e354a5	`-`
		e354a5	`-/* Architecture features. */`
		e354a5	`-`
		e354a5	`-/* USABLE_FEATURE_INDEX_1. */`
		e354a5	`-#define bit_arch_AVX_Usable (1u << 0)`
		e354a5	`-#define bit_arch_AVX2_Usable (1u << 1)`
		e354a5	`-#define bit_arch_AVX512F_Usable (1u << 2)`
		e354a5	`-#define bit_arch_AVX512CD_Usable (1u << 3)`
		e354a5	`-#define bit_arch_AVX512ER_Usable (1u << 4)`
		e354a5	`-#define bit_arch_AVX512PF_Usable (1u << 5)`
		e354a5	`-#define bit_arch_AVX512VL_Usable (1u << 6)`
		e354a5	`-#define bit_arch_AVX512DQ_Usable (1u << 7)`
		e354a5	`-#define bit_arch_AVX512BW_Usable (1u << 8)`
		e354a5	`-#define bit_arch_AVX512_4FMAPS_Usable (1u << 9)`
		e354a5	`-#define bit_arch_AVX512_4VNNIW_Usable (1u << 10)`
		e354a5	`-#define bit_arch_AVX512_BITALG_Usable (1u << 11)`
		e354a5	`-#define bit_arch_AVX512_IFMA_Usable (1u << 12)`
		e354a5	`-#define bit_arch_AVX512_VBMI_Usable (1u << 13)`
		e354a5	`-#define bit_arch_AVX512_VBMI2_Usable (1u << 14)`
		e354a5	`-#define bit_arch_AVX512_VNNI_Usable (1u << 15)`
		e354a5	`-#define bit_arch_AVX512_VPOPCNTDQ_Usable (1u << 16)`
		e354a5	`-#define bit_arch_FMA_Usable (1u << 17)`
		e354a5	`-#define bit_arch_FMA4_Usable (1u << 18)`
		e354a5	`-#define bit_arch_VAES_Usable (1u << 19)`
		e354a5	`-#define bit_arch_VPCLMULQDQ_Usable (1u << 20)`
		e354a5	`-#define bit_arch_XOP_Usable (1u << 21)`
		e354a5	`-#define bit_arch_XSAVEC_Usable (1u << 22)`
		e354a5	`-#define bit_arch_F16C_Usable (1u << 23)`
		e354a5	`-#define bit_arch_AVX512_VP2INTERSECT_Usable (1u << 24)`
		e354a5	`-#define bit_arch_AVX512_BF16_Usable (1u << 25)`
		e354a5	`-#define bit_arch_PKU_Usable (1u << 26)`
		e354a5	`-#define bit_arch_AMX_BF16_Usable (1u << 27)`
		e354a5	`-#define bit_arch_AMX_TILE_Usable (1u << 28)`
		e354a5	`-#define bit_arch_AMX_INT8_Usable (1u << 29)`
		e354a5	`-`
		e354a5	`-#define index_arch_AVX_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX2_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512F_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512CD_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512ER_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512PF_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512VL_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512BW_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512DQ_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_4FMAPS_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_4VNNIW_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_BITALG_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_IFMA_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_VBMI_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_VBMI2_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_VNNI_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_VPOPCNTDQ_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_FMA_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_FMA4_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_VAES_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_VPCLMULQDQ_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_XOP_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_XSAVEC_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_F16C_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_VP2INTERSECT_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AVX512_BF16_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_PKU_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AMX_BF16_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AMX_TILE_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-#define index_arch_AMX_INT8_Usable USABLE_FEATURE_INDEX_1`
		e354a5	`-`
		e354a5	`-#define feature_AVX_Usable usable`
		e354a5	`-#define feature_AVX2_Usable usable`
		e354a5	`-#define feature_AVX512F_Usable usable`
		e354a5	`-#define feature_AVX512CD_Usable usable`
		e354a5	`-#define feature_AVX512ER_Usable usable`
		e354a5	`-#define feature_AVX512PF_Usable usable`
		e354a5	`-#define feature_AVX512VL_Usable usable`
		e354a5	`-#define feature_AVX512BW_Usable usable`
		e354a5	`-#define feature_AVX512DQ_Usable usable`
		e354a5	`-#define feature_AVX512_4FMAPS_Usable usable`
		e354a5	`-#define feature_AVX512_4VNNIW_Usable usable`
		e354a5	`-#define feature_AVX512_BITALG_Usable usable`
		e354a5	`-#define feature_AVX512_IFMA_Usable usable`
		e354a5	`-#define feature_AVX512_VBMI_Usable usable`
		e354a5	`-#define feature_AVX512_VBMI2_Usable usable`
		e354a5	`-#define feature_AVX512_VNNI_Usable usable`
		e354a5	`-#define feature_AVX512_VPOPCNTDQ_Usable usable`
		e354a5	`-#define feature_FMA_Usable usable`
		e354a5	`-#define feature_FMA4_Usable usable`
		e354a5	`-#define feature_VAES_Usable usable`
		e354a5	`-#define feature_VPCLMULQDQ_Usable usable`
		e354a5	`-#define feature_XOP_Usable usable`
		e354a5	`-#define feature_XSAVEC_Usable usable`
		e354a5	`-#define feature_F16C_Usable usable`
		e354a5	`-#define feature_AVX512_VP2INTERSECT_Usable usable`
		e354a5	`-#define feature_AVX512_BF16_Usable usable`
		e354a5	`-#define feature_PKU_Usable usable`
		e354a5	`-#define feature_AMX_BF16_Usable usable`
		e354a5	`-#define feature_AMX_TILE_Usable usable`
		e354a5	`-#define feature_AMX_INT8_Usable usable`
		e354a5	`+ CPU_FEATURE_USABLE_P (__get_cpu_features (), name)`
		e354a5	`+/* CPU_FEATURE_PREFER evaluates to true if we prefer the feature at`
		e354a5	`+ runtime. */`
		e354a5	`+#define CPU_FEATURE_PREFERRED(name) \`
		e354a5	`+ CPU_FEATURE_PREFERRED_P(__get_cpu_features (), name)`
		e354a5	`+`
		e354a5	`+#define CPU_FEATURES_CPU_P(ptr, name) \`
		e354a5	`+ CPU_FEATURE_CPU_P (ptr, name)`
		e354a5	`+#define CPU_FEATURES_ARCH_P(ptr, name) \`
		e354a5	`+ CPU_FEATURE_PREFERRED_P (ptr, name)`
		e354a5	`+#define HAS_ARCH_FEATURE(name) \`
		e354a5	`+ CPU_FEATURE_PREFERRED (name)`
		e354a5
		e354a5	`/* CPU features. */`
		e354a5
		e354a5	`@@ -247,6 +165,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_CMPXCHG16B (1u << 13)`
		e354a5	`#define bit_cpu_XTPRUPDCTRL (1u << 14)`
		e354a5	`#define bit_cpu_PDCM (1u << 15)`
		e354a5	`+#define bit_cpu_INDEX_1_ECX_16 (1u << 16)`
		e354a5	`#define bit_cpu_PCID (1u << 17)`
		e354a5	`#define bit_cpu_DCA (1u << 18)`
		e354a5	`#define bit_cpu_SSE4_1 (1u << 19)`
		e354a5	`@@ -261,6 +180,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_AVX (1u << 28)`
		e354a5	`#define bit_cpu_F16C (1u << 29)`
		e354a5	`#define bit_cpu_RDRAND (1u << 30)`
		e354a5	`+#define bit_cpu_INDEX_1_ECX_31 (1u << 31)`
		e354a5
		e354a5	`/* EDX. */`
		e354a5	`#define bit_cpu_FPU (1u << 0)`
		e354a5	`@@ -273,6 +193,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_MCE (1u << 7)`
		e354a5	`#define bit_cpu_CX8 (1u << 8)`
		e354a5	`#define bit_cpu_APIC (1u << 9)`
		e354a5	`+#define bit_cpu_INDEX_1_EDX_10 (1u << 10)`
		e354a5	`#define bit_cpu_SEP (1u << 11)`
		e354a5	`#define bit_cpu_MTRR (1u << 12)`
		e354a5	`#define bit_cpu_PGE (1u << 13)`
		e354a5	`@@ -282,6 +203,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_PSE_36 (1u << 17)`
		e354a5	`#define bit_cpu_PSN (1u << 18)`
		e354a5	`#define bit_cpu_CLFSH (1u << 19)`
		e354a5	`+#define bit_cpu_INDEX_1_EDX_20 (1u << 20)`
		e354a5	`#define bit_cpu_DS (1u << 21)`
		e354a5	`#define bit_cpu_ACPI (1u << 22)`
		e354a5	`#define bit_cpu_MMX (1u << 23)`
		e354a5	`@@ -291,6 +213,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_SS (1u << 27)`
		e354a5	`#define bit_cpu_HTT (1u << 28)`
		e354a5	`#define bit_cpu_TM (1u << 29)`
		e354a5	`+#define bit_cpu_INDEX_1_EDX_30 (1u << 30)`
		e354a5	`#define bit_cpu_PBE (1u << 31)`
		e354a5
		e354a5	`/* COMMON_CPUID_INDEX_7. */`
		e354a5	`@@ -302,12 +225,14 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_BMI1 (1u << 3)`
		e354a5	`#define bit_cpu_HLE (1u << 4)`
		e354a5	`#define bit_cpu_AVX2 (1u << 5)`
		e354a5	`+#define bit_cpu_INDEX_7_EBX_6 (1u << 6)`
		e354a5	`#define bit_cpu_SMEP (1u << 7)`
		e354a5	`#define bit_cpu_BMI2 (1u << 8)`
		e354a5	`#define bit_cpu_ERMS (1u << 9)`
		e354a5	`#define bit_cpu_INVPCID (1u << 10)`
		e354a5	`#define bit_cpu_RTM (1u << 11)`
		e354a5	`#define bit_cpu_PQM (1u << 12)`
		e354a5	`+#define bit_cpu_DEPR_FPU_CS_DS (1u << 13)`
		e354a5	`#define bit_cpu_MPX (1u << 14)`
		e354a5	`#define bit_cpu_PQE (1u << 15)`
		e354a5	`#define bit_cpu_AVX512F (1u << 16)`
		e354a5	`@@ -316,6 +241,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_ADX (1u << 19)`
		e354a5	`#define bit_cpu_SMAP (1u << 20)`
		e354a5	`#define bit_cpu_AVX512_IFMA (1u << 21)`
		e354a5	`+#define bit_cpu_INDEX_7_EBX_22 (1u << 22)`
		e354a5	`#define bit_cpu_CLFLUSHOPT (1u << 23)`
		e354a5	`#define bit_cpu_CLWB (1u << 24)`
		e354a5	`#define bit_cpu_TRACE (1u << 25)`
		e354a5	`@@ -340,9 +266,17 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_VPCLMULQDQ (1u << 10)`
		e354a5	`#define bit_cpu_AVX512_VNNI (1u << 11)`
		e354a5	`#define bit_cpu_AVX512_BITALG (1u << 12)`
		e354a5	`+#define bit_cpu_INDEX_7_ECX_13 (1u << 13)`
		e354a5	`#define bit_cpu_AVX512_VPOPCNTDQ (1u << 14)`
		e354a5	`+#define bit_cpu_INDEX_7_ECX_15 (1u << 15)`
		e354a5	`+#define bit_cpu_INDEX_7_ECX_16 (1u << 16)`
		e354a5	`+/* Note: Bits 17-21: The value of MAWAU used by the BNDLDX and BNDSTX`
		e354a5	`+ instructions in 64-bit mode. */`
		e354a5	`#define bit_cpu_RDPID (1u << 22)`
		e354a5	`+#define bit_cpu_INDEX_7_ECX_23 (1u << 23)`
		e354a5	`+#define bit_cpu_INDEX_7_ECX_24 (1u << 24)`
		e354a5	`#define bit_cpu_CLDEMOTE (1u << 25)`
		e354a5	`+#define bit_cpu_INDEX_7_ECX_26 (1u << 26)`
		e354a5	`#define bit_cpu_MOVDIRI (1u << 27)`
		e354a5	`#define bit_cpu_MOVDIR64B (1u << 28)`
		e354a5	`#define bit_cpu_ENQCMD (1u << 29)`
		e354a5	`@@ -350,17 +284,30 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define bit_cpu_PKS (1u << 31)`
		e354a5
		e354a5	`/* EDX. */`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_0 (1u << 0)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_1 (1u << 1)`
		e354a5	`#define bit_cpu_AVX512_4VNNIW (1u << 2)`
		e354a5	`#define bit_cpu_AVX512_4FMAPS (1u << 3)`
		e354a5	`#define bit_cpu_FSRM (1u << 4)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_5 (1u << 5)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_6 (1u << 6)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_7 (1u << 7)`
		e354a5	`#define bit_cpu_AVX512_VP2INTERSECT (1u << 8)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_9 (1u << 9)`
		e354a5	`#define bit_cpu_MD_CLEAR (1u << 10)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_11 (1u << 11)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_12 (1u << 12)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_13 (1u << 13)`
		e354a5	`#define bit_cpu_SERIALIZE (1u << 14)`
		e354a5	`#define bit_cpu_HYBRID (1u << 15)`
		e354a5	`#define bit_cpu_TSXLDTRK (1u << 16)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_17 (1u << 17)`
		e354a5	`#define bit_cpu_PCONFIG (1u << 18)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_19 (1u << 19)`
		e354a5	`#define bit_cpu_IBT (1u << 20)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_21 (1u << 21)`
		e354a5	`#define bit_cpu_AMX_BF16 (1u << 22)`
		e354a5	`+#define bit_cpu_INDEX_7_EDX_23 (1u << 23)`
		e354a5	`#define bit_cpu_AMX_TILE (1u << 24)`
		e354a5	`#define bit_cpu_AMX_INT8 (1u << 25)`
		e354a5	`#define bit_cpu_IBRS_IBPB (1u << 26)`
		e354a5	`@@ -433,6 +380,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_CMPXCHG16B COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_XTPRUPDCTRL COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_PDCM COMMON_CPUID_INDEX_1`
		e354a5	`+#define index_cpu_INDEX_1_ECX_16 COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_PCID COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_DCA COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_SSE4_1 COMMON_CPUID_INDEX_1`
		e354a5	`@@ -447,6 +395,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_AVX COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_F16C COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_RDRAND COMMON_CPUID_INDEX_1`
		e354a5	`+#define index_cpu_INDEX_1_ECX_31 COMMON_CPUID_INDEX_1`
		e354a5
		e354a5	`/* ECX. */`
		e354a5	`#define index_cpu_FPU COMMON_CPUID_INDEX_1`
		e354a5	`@@ -459,6 +408,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_MCE COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_CX8 COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_APIC COMMON_CPUID_INDEX_1`
		e354a5	`+#define index_cpu_INDEX_1_EDX_10 COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_SEP COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_MTRR COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_PGE COMMON_CPUID_INDEX_1`
		e354a5	`@@ -468,6 +418,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_PSE_36 COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_PSN COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_CLFSH COMMON_CPUID_INDEX_1`
		e354a5	`+#define index_cpu_INDEX_1_EDX_20 COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_DS COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_ACPI COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_MMX COMMON_CPUID_INDEX_1`
		e354a5	`@@ -477,6 +428,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_SS COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_HTT COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_TM COMMON_CPUID_INDEX_1`
		e354a5	`+#define index_cpu_INDEX_1_EDX_30 COMMON_CPUID_INDEX_1`
		e354a5	`#define index_cpu_PBE COMMON_CPUID_INDEX_1`
		e354a5
		e354a5	`/* COMMON_CPUID_INDEX_7. */`
		e354a5	`@@ -488,12 +440,14 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_BMI1 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_HLE COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX2 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EBX_6 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_SMEP COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_BMI2 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_ERMS COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_INVPCID COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_RTM COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_PQM COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_DEPR_FPU_CS_DS COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_MPX COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_PQE COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX512F COMMON_CPUID_INDEX_7`
		e354a5	`@@ -502,6 +456,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_ADX COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_SMAP COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX512_IFMA COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EBX_22 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_CLFLUSHOPT COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_CLWB COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_TRACE COMMON_CPUID_INDEX_7`
		e354a5	`@@ -526,9 +481,15 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_VPCLMULQDQ COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX512_VNNI COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX512_BITALG COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_ECX_13 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX512_VPOPCNTDQ COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_ECX_15 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_ECX_16 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_RDPID COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_ECX_23 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_ECX_24 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_CLDEMOTE COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_ECX_26 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_MOVDIRI COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_MOVDIR64B COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_ENQCMD COMMON_CPUID_INDEX_7`
		e354a5	`@@ -536,17 +497,30 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_cpu_PKS COMMON_CPUID_INDEX_7`
		e354a5
		e354a5	`/* EDX. */`
		e354a5	`+#define index_cpu_INDEX_7_EDX_0 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_1 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX512_4VNNIW COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX512_4FMAPS COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_FSRM COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_5 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_6 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_7 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AVX512_VP2INTERSECT COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_9 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_MD_CLEAR COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_11 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_12 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_13 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_SERIALIZE COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_HYBRID COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_TSXLDTRK COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_17 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_PCONFIG COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_19 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_IBT COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_21 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AMX_BF16 COMMON_CPUID_INDEX_7`
		e354a5	`+#define index_cpu_INDEX_7_EDX_23 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AMX_TILE COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_AMX_INT8 COMMON_CPUID_INDEX_7`
		e354a5	`#define index_cpu_IBRS_IBPB COMMON_CPUID_INDEX_7`
		e354a5	`@@ -619,6 +593,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_CMPXCHG16B ecx`
		e354a5	`#define reg_XTPRUPDCTRL ecx`
		e354a5	`#define reg_PDCM ecx`
		e354a5	`+#define reg_INDEX_1_ECX_16 ecx`
		e354a5	`#define reg_PCID ecx`
		e354a5	`#define reg_DCA ecx`
		e354a5	`#define reg_SSE4_1 ecx`
		e354a5	`@@ -633,6 +608,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_AVX ecx`
		e354a5	`#define reg_F16C ecx`
		e354a5	`#define reg_RDRAND ecx`
		e354a5	`+#define reg_INDEX_1_ECX_31 ecx`
		e354a5
		e354a5	`/* EDX. */`
		e354a5	`#define reg_FPU edx`
		e354a5	`@@ -645,6 +621,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_MCE edx`
		e354a5	`#define reg_CX8 edx`
		e354a5	`#define reg_APIC edx`
		e354a5	`+#define reg_INDEX_1_EDX_10 edx`
		e354a5	`#define reg_SEP edx`
		e354a5	`#define reg_MTRR edx`
		e354a5	`#define reg_PGE edx`
		e354a5	`@@ -654,6 +631,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_PSE_36 edx`
		e354a5	`#define reg_PSN edx`
		e354a5	`#define reg_CLFSH edx`
		e354a5	`+#define reg_INDEX_1_EDX_20 edx`
		e354a5	`#define reg_DS edx`
		e354a5	`#define reg_ACPI edx`
		e354a5	`#define reg_MMX edx`
		e354a5	`@@ -663,6 +641,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_SS edx`
		e354a5	`#define reg_HTT edx`
		e354a5	`#define reg_TM edx`
		e354a5	`+#define reg_INDEX_1_EDX_30 edx`
		e354a5	`#define reg_PBE edx`
		e354a5
		e354a5	`/* COMMON_CPUID_INDEX_7. */`
		e354a5	`@@ -675,11 +654,13 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_HLE ebx`
		e354a5	`#define reg_BMI2 ebx`
		e354a5	`#define reg_AVX2 ebx`
		e354a5	`+#define reg_INDEX_7_EBX_6 ebx`
		e354a5	`#define reg_SMEP ebx`
		e354a5	`#define reg_ERMS ebx`
		e354a5	`#define reg_INVPCID ebx`
		e354a5	`#define reg_RTM ebx`
		e354a5	`#define reg_PQM ebx`
		e354a5	`+#define reg_DEPR_FPU_CS_DS ebx`
		e354a5	`#define reg_MPX ebx`
		e354a5	`#define reg_PQE ebx`
		e354a5	`#define reg_AVX512F ebx`
		e354a5	`@@ -688,6 +669,7 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_ADX ebx`
		e354a5	`#define reg_SMAP ebx`
		e354a5	`#define reg_AVX512_IFMA ebx`
		e354a5	`+#define reg_INDEX_7_EBX_22 ebx`
		e354a5	`#define reg_CLFLUSHOPT ebx`
		e354a5	`#define reg_CLWB ebx`
		e354a5	`#define reg_TRACE ebx`
		e354a5	`@@ -712,9 +694,15 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_VPCLMULQDQ ecx`
		e354a5	`#define reg_AVX512_VNNI ecx`
		e354a5	`#define reg_AVX512_BITALG ecx`
		e354a5	`+#define reg_INDEX_7_ECX_13 ecx`
		e354a5	`#define reg_AVX512_VPOPCNTDQ ecx`
		e354a5	`+#define reg_INDEX_7_ECX_15 ecx`
		e354a5	`+#define reg_INDEX_7_ECX_16 ecx`
		e354a5	`#define reg_RDPID ecx`
		e354a5	`+#define reg_INDEX_7_ECX_23 ecx`
		e354a5	`+#define reg_INDEX_7_ECX_24 ecx`
		e354a5	`#define reg_CLDEMOTE ecx`
		e354a5	`+#define reg_INDEX_7_ECX_26 ecx`
		e354a5	`#define reg_MOVDIRI ecx`
		e354a5	`#define reg_MOVDIR64B ecx`
		e354a5	`#define reg_ENQCMD ecx`
		e354a5	`@@ -722,17 +710,30 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define reg_PKS ecx`
		e354a5
		e354a5	`/* EDX. */`
		e354a5	`+#define reg_INDEX_7_EDX_0 edx`
		e354a5	`+#define reg_INDEX_7_EDX_1 edx`
		e354a5	`#define reg_AVX512_4VNNIW edx`
		e354a5	`#define reg_AVX512_4FMAPS edx`
		e354a5	`#define reg_FSRM edx`
		e354a5	`+#define reg_INDEX_7_EDX_5 edx`
		e354a5	`+#define reg_INDEX_7_EDX_6 edx`
		e354a5	`+#define reg_INDEX_7_EDX_7 edx`
		e354a5	`#define reg_AVX512_VP2INTERSECT edx`
		e354a5	`+#define reg_INDEX_7_EDX_9 edx`
		e354a5	`#define reg_MD_CLEAR edx`
		e354a5	`+#define reg_INDEX_7_EDX_11 edx`
		e354a5	`+#define reg_INDEX_7_EDX_12 edx`
		e354a5	`+#define reg_INDEX_7_EDX_13 edx`
		e354a5	`#define reg_SERIALIZE edx`
		e354a5	`#define reg_HYBRID edx`
		e354a5	`#define reg_TSXLDTRK edx`
		e354a5	`+#define reg_INDEX_7_EDX_17 edx`
		e354a5	`#define reg_PCONFIG edx`
		e354a5	`+#define reg_INDEX_7_EDX_19 edx`
		e354a5	`#define reg_IBT edx`
		e354a5	`+#define reg_INDEX_7_EDX_21 edx`
		e354a5	`#define reg_AMX_BF16 edx`
		e354a5	`+#define reg_INDEX_7_EDX_23 edx`
		e354a5	`#define reg_AMX_TILE edx`
		e354a5	`#define reg_AMX_INT8 edx`
		e354a5	`#define reg_IBRS_IBPB edx`
		e354a5	`@@ -821,23 +822,6 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`#define index_arch_MathVec_Prefer_No_AVX512 PREFERRED_FEATURE_INDEX_1`
		e354a5	`#define index_arch_Prefer_FSRM PREFERRED_FEATURE_INDEX_1`
		e354a5
		e354a5	`-#define feature_Fast_Rep_String preferred`
		e354a5	`-#define feature_Fast_Copy_Backward preferred`
		e354a5	`-#define feature_Slow_BSF preferred`
		e354a5	`-#define feature_Fast_Unaligned_Load preferred`
		e354a5	`-#define feature_Prefer_PMINUB_for_stringop preferred`
		e354a5	`-#define feature_Fast_Unaligned_Copy preferred`
		e354a5	`-#define feature_I586 preferred`
		e354a5	`-#define feature_I686 preferred`
		e354a5	`-#define feature_Slow_SSE4_2 preferred`
		e354a5	`-#define feature_AVX_Fast_Unaligned_Load preferred`
		e354a5	`-#define feature_Prefer_MAP_32BIT_EXEC preferred`
		e354a5	`-#define feature_Prefer_No_VZEROUPPER preferred`
		e354a5	`-#define feature_Prefer_ERMS preferred`
		e354a5	`-#define feature_Prefer_No_AVX512 preferred`
		e354a5	`-#define feature_MathVec_Prefer_No_AVX512 preferred`
		e354a5	`-#define feature_Prefer_FSRM preferred`
		e354a5	`-`
		e354a5	`/* XCR0 Feature flags. */`
		e354a5	`#define bit_XMM_state (1u << 1)`
		e354a5	`#define bit_YMM_state (1u << 2)`
		e354a5	`@@ -851,8 +835,6 @@ extern const struct cpu_features *__get_cpu_features (void)`
		e354a5	`/* Unused for x86. */`
		e354a5	`# define INIT_ARCH()`
		e354a5	`# define __get_cpu_features() (&GLRO(dl_x86_cpu_features))`
		e354a5	`-# define x86_get_cpuid_registers(i) \`
		e354a5	`- (&(GLRO(dl_x86_cpu_features).cpuid[i]))`
		e354a5	`# endif`
		e354a5
		e354a5	`#ifdef __x86_64__`
		e354a5	`diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c`
		e354a5	`index 012ae48933055eaa..0728023007a0f423 100644`
		e354a5	`--- a/sysdeps/x86/cpu-tunables.c`
		e354a5	`+++ b/sysdeps/x86/cpu-tunables.c`
		e354a5	`@@ -43,66 +43,45 @@ extern __typeof (memcmp) DEFAULT_MEMCMP;`
		e354a5	`_Static_assert (sizeof (#name) - 1 == len, #name " != " #len); \`
		e354a5	`if (!DEFAULT_MEMCMP (f, #name, len)) \`
		e354a5	`{ \`
		e354a5	`- cpu_features->cpuid[index_cpu_##name].reg_##name \`
		e354a5	`- &= ~bit_cpu_##name; \`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, name) \`
		e354a5	`break; \`
		e354a5	`}`
		e354a5
		e354a5	`-/* Disable an ARCH feature NAME. We don't enable an ARCH feature which`
		e354a5	`- isn't available. */`
		e354a5	`-# define CHECK_GLIBC_IFUNC_ARCH_OFF(f, cpu_features, name, len) \`
		e354a5	`+/* Disable a preferred feature NAME. We don't enable a preferred feature`
		e354a5	`+ which isn't available. */`
		e354a5	`+# define CHECK_GLIBC_IFUNC_PREFERRED_OFF(f, cpu_features, name, len) \`
		e354a5	`_Static_assert (sizeof (#name) - 1 == len, #name " != " #len); \`
		e354a5	`if (!DEFAULT_MEMCMP (f, #name, len)) \`
		e354a5	`{ \`
		e354a5	`- cpu_features->feature_##name[index_arch_##name] \`
		e354a5	`+ cpu_features->preferred[index_arch_##name] \`
		e354a5	`&= ~bit_arch_##name; \`
		e354a5	`break; \`
		e354a5	`}`
		e354a5
		e354a5	`-/* Enable/disable an ARCH feature NAME. */`
		e354a5	`-# define CHECK_GLIBC_IFUNC_ARCH_BOTH(f, cpu_features, name, disable, \`
		e354a5	`- len) \`
		e354a5	`+/* Enable/disable a preferred feature NAME. */`
		e354a5	`+# define CHECK_GLIBC_IFUNC_PREFERRED_BOTH(f, cpu_features, name, \`
		e354a5	`+ disable, len) \`
		e354a5	`_Static_assert (sizeof (#name) - 1 == len, #name " != " #len); \`
		e354a5	`if (!DEFAULT_MEMCMP (f, #name, len)) \`
		e354a5	`{ \`
		e354a5	`if (disable) \`
		e354a5	`- cpu_features->feature_##name[index_arch_##name] \`
		e354a5	`- &= ~bit_arch_##name; \`
		e354a5	`+ cpu_features->preferred[index_arch_##name] &= ~bit_arch_##name; \`
		e354a5	`else \`
		e354a5	`- cpu_features->feature_##name[index_arch_##name] \`
		e354a5	`- \|= bit_arch_##name; \`
		e354a5	`+ cpu_features->preferred[index_arch_##name] \|= bit_arch_##name; \`
		e354a5	`break; \`
		e354a5	`}`
		e354a5
		e354a5	`-/* Enable/disable an ARCH feature NAME. Enable an ARCH feature only`
		e354a5	`- if the ARCH feature NEED is also enabled. */`
		e354a5	`-# define CHECK_GLIBC_IFUNC_ARCH_NEED_ARCH_BOTH(f, cpu_features, name, \`
		e354a5	`+/* Enable/disable a preferred feature NAME. Enable a preferred feature`
		e354a5	`+ only if the feature NEED is usable. */`
		e354a5	`+# define CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH(f, cpu_features, name, \`
		e354a5	`need, disable, len) \`
		e354a5	`_Static_assert (sizeof (#name) - 1 == len, #name " != " #len); \`
		e354a5	`if (!DEFAULT_MEMCMP (f, #name, len)) \`
		e354a5	`{ \`
		e354a5	`if (disable) \`
		e354a5	`- cpu_features->feature_##name[index_arch_##name] \`
		e354a5	`- &= ~bit_arch_##name; \`
		e354a5	`- else if (CPU_FEATURES_ARCH_P (cpu_features, need)) \`
		e354a5	`- cpu_features->feature_##name[index_arch_##name] \`
		e354a5	`- \|= bit_arch_##name; \`
		e354a5	`- break; \`
		e354a5	`- }`
		e354a5	`-`
		e354a5	`-/* Enable/disable an ARCH feature NAME. Enable an ARCH feature only`
		e354a5	`- if the CPU feature NEED is also enabled. */`
		e354a5	`-# define CHECK_GLIBC_IFUNC_ARCH_NEED_CPU_BOTH(f, cpu_features, name, \`
		e354a5	`- need, disable, len) \`
		e354a5	`- _Static_assert (sizeof (#name) - 1 == len, #name " != " #len); \`
		e354a5	`- if (!DEFAULT_MEMCMP (f, #name, len)) \`
		e354a5	`- { \`
		e354a5	`- if (disable) \`
		e354a5	`- cpu_features->feature_##name[index_arch_##name] \`
		e354a5	`- &= ~bit_arch_##name; \`
		e354a5	`- else if (CPU_FEATURES_CPU_P (cpu_features, need)) \`
		e354a5	`- cpu_features->feature_##name[index_arch_##name] \`
		e354a5	`- \|= bit_arch_##name; \`
		e354a5	`+ cpu_features->preferred[index_arch_##name] &= ~bit_arch_##name; \`
		e354a5	`+ else if (CPU_FEATURE_USABLE_P (cpu_features, need)) \`
		e354a5	`+ cpu_features->preferred[index_arch_##name] \|= bit_arch_##name; \`
		e354a5	`break; \`
		e354a5	`}`
		e354a5
		e354a5	`@@ -178,8 +157,8 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp)`
		e354a5	`CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, ERMS, 4);`
		e354a5	`CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, FMA4, 4);`
		e354a5	`CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SSE2, 4);`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features, I586, 4);`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features, I686, 4);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_OFF (n, cpu_features, I586, 4);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_OFF (n, cpu_features, I686, 4);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 5:`
		e354a5	`@@ -197,6 +176,13 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp)`
		e354a5	`CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, POPCNT, 6);`
		e354a5	`CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SSE4_1, 6);`
		e354a5	`CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SSE4_2, 6);`
		e354a5	`+ if (!DEFAULT_MEMCMP (n, "XSAVEC", 6))`
		e354a5	`+ {`
		e354a5	`+ /* Update xsave_state_size to XSAVE state size. */`
		e354a5	`+ cpu_features->xsave_state_size`
		e354a5	`+ = cpu_features->xsave_state_full_size;`
		e354a5	`+ CPU_FEATURE_UNSET (cpu_features, XSAVEC);`
		e354a5	`+ }`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 7:`
		e354a5	`@@ -216,115 +202,85 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp)`
		e354a5	`CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, AVX512PF, 8);`
		e354a5	`CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, AVX512VL, 8);`
		e354a5	`}`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_BOTH (n, cpu_features, Slow_BSF,`
		e354a5	`- disable, 8);`
		e354a5	`- break;`
		e354a5	`- case 10:`
		e354a5	`- if (disable)`
		e354a5	`- {`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features, AVX_Usable,`
		e354a5	`- 10);`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features, FMA_Usable,`
		e354a5	`- 10);`
		e354a5	`- }`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features, Slow_BSF,`
		e354a5	`+ disable, 8);`
		e354a5	`break;`
		e354a5	`case 11:`
		e354a5	`- if (disable)`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features, AVX2_Usable,`
		e354a5	`- 11);`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features, FMA4_Usable,`
		e354a5	`- 11);`
		e354a5	`- }`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_BOTH (n, cpu_features, Prefer_ERMS,`
		e354a5	`- disable, 11);`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_NEED_CPU_BOTH (n, cpu_features,`
		e354a5	`- Slow_SSE4_2, SSE4_2,`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features,`
		e354a5	`+ Prefer_ERMS,`
		e354a5	`disable, 11);`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_BOTH (n, cpu_features, Prefer_FSRM,`
		e354a5	`- disable, 11);`
		e354a5	`- break;`
		e354a5	`- case 13:`
		e354a5	`- if (disable)`
		e354a5	`- {`
		e354a5	`- /* Update xsave_state_size to XSAVE state size. */`
		e354a5	`- cpu_features->xsave_state_size`
		e354a5	`- = cpu_features->xsave_state_full_size;`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features,`
		e354a5	`- XSAVEC_Usable, 13);`
		e354a5	`- }`
		e354a5	`- break;`
		e354a5	`- case 14:`
		e354a5	`- if (disable)`
		e354a5	`- {`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features,`
		e354a5	`- AVX512F_Usable, 14);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features,`
		e354a5	`+ Prefer_FSRM,`
		e354a5	`+ disable, 11);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH (n, cpu_features,`
		e354a5	`+ Slow_SSE4_2,`
		e354a5	`+ SSE4_2,`
		e354a5	`+ disable, 11);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 15:`
		e354a5	`- if (disable)`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_OFF (n, cpu_features,`
		e354a5	`- AVX512DQ_Usable, 15);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features,`
		e354a5	`+ Fast_Rep_String,`
		e354a5	`+ disable, 15);`
		e354a5	`}`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_BOTH (n, cpu_features, Fast_Rep_String,`
		e354a5	`- disable, 15);`
		e354a5	`break;`
		e354a5	`case 16:`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_NEED_ARCH_BOTH`
		e354a5	`- (n, cpu_features, Prefer_No_AVX512, AVX512F_Usable,`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH`
		e354a5	`+ (n, cpu_features, Prefer_No_AVX512, AVX512F,`
		e354a5	`disable, 16);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 18:`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_BOTH (n, cpu_features,`
		e354a5	`- Fast_Copy_Backward, disable,`
		e354a5	`- 18);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features,`
		e354a5	`+ Fast_Copy_Backward,`
		e354a5	`+ disable, 18);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 19:`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_BOTH (n, cpu_features,`
		e354a5	`- Fast_Unaligned_Load, disable,`
		e354a5	`- 19);`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_BOTH (n, cpu_features,`
		e354a5	`- Fast_Unaligned_Copy, disable,`
		e354a5	`- 19);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features,`
		e354a5	`+ Fast_Unaligned_Load,`
		e354a5	`+ disable, 19);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features,`
		e354a5	`+ Fast_Unaligned_Copy,`
		e354a5	`+ disable, 19);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 20:`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_NEED_ARCH_BOTH`
		e354a5	`- (n, cpu_features, Prefer_No_VZEROUPPER, AVX_Usable,`
		e354a5	`- disable, 20);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH`
		e354a5	`+ (n, cpu_features, Prefer_No_VZEROUPPER, AVX, disable,`
		e354a5	`+ 20);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 21:`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_BOTH (n, cpu_features,`
		e354a5	`- Prefer_MAP_32BIT_EXEC, disable,`
		e354a5	`- 21);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features,`
		e354a5	`+ Prefer_MAP_32BIT_EXEC,`
		e354a5	`+ disable, 21);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 23:`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_NEED_ARCH_BOTH`
		e354a5	`- (n, cpu_features, AVX_Fast_Unaligned_Load, AVX_Usable,`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH`
		e354a5	`+ (n, cpu_features, AVX_Fast_Unaligned_Load, AVX,`
		e354a5	`disable, 23);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 24:`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_NEED_ARCH_BOTH`
		e354a5	`- (n, cpu_features, MathVec_Prefer_No_AVX512,`
		e354a5	`- AVX512F_Usable, disable, 24);`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH`
		e354a5	`+ (n, cpu_features, MathVec_Prefer_No_AVX512, AVX512F,`
		e354a5	`+ disable, 24);`
		e354a5	`}`
		e354a5	`break;`
		e354a5	`case 26:`
		e354a5	`{`
		e354a5	`- CHECK_GLIBC_IFUNC_ARCH_NEED_CPU_BOTH`
		e354a5	`+ CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH`
		e354a5	`(n, cpu_features, Prefer_PMINUB_for_stringop, SSE2,`
		e354a5	`disable, 26);`
		e354a5	`}`
		e354a5	`diff --git a/sysdeps/x86/dl-cet.c b/sysdeps/x86/dl-cet.c`
		e354a5	`index d481bddc27e5d7cc..11ff0618fae7230f 100644`
		e354a5	`--- a/sysdeps/x86/dl-cet.c`
		e354a5	`+++ b/sysdeps/x86/dl-cet.c`
		e354a5	`@@ -74,10 +74,10 @@ dl_cet_check (struct link_map m, const char program)`
		e354a5
		e354a5	`GLIBC_TUNABLES=glibc.cpu.hwcaps=-IBT,-SHSTK`
		e354a5	`*/`
		e354a5	`- enable_ibt &= (HAS_CPU_FEATURE (IBT)`
		e354a5	`+ enable_ibt &= (CPU_FEATURE_USABLE (IBT)`
		e354a5	`&& (enable_ibt_type == cet_always_on`
		e354a5	`\|\| (m->l_cet & lc_ibt) != 0));`
		e354a5	`- enable_shstk &= (HAS_CPU_FEATURE (SHSTK)`
		e354a5	`+ enable_shstk &= (CPU_FEATURE_USABLE (SHSTK)`
		e354a5	`&& (enable_shstk_type == cet_always_on`
		e354a5	`\|\| (m->l_cet & lc_shstk) != 0));`
		e354a5	`}`
		e354a5	`diff --git a/sysdeps/x86/tst-get-cpu-features.c b/sysdeps/x86/tst-get-cpu-features.c`
		e354a5	`index c56f309ba0736c0d..85ec9d5a091e2c88 100644`
		e354a5	`--- a/sysdeps/x86/tst-get-cpu-features.c`
		e354a5	`+++ b/sysdeps/x86/tst-get-cpu-features.c`
		e354a5	`@@ -137,6 +137,7 @@ do_test (void)`
		e354a5	`CHECK_CPU_FEATURE (INVPCID);`
		e354a5	`CHECK_CPU_FEATURE (RTM);`
		e354a5	`CHECK_CPU_FEATURE (PQM);`
		e354a5	`+ CHECK_CPU_FEATURE (DEPR_FPU_CS_DS);`
		e354a5	`CHECK_CPU_FEATURE (MPX);`
		e354a5	`CHECK_CPU_FEATURE (PQE);`
		e354a5	`CHECK_CPU_FEATURE (AVX512F);`
		e354a5	`@@ -218,35 +219,156 @@ do_test (void)`
		e354a5	`CHECK_CPU_FEATURE (AVX512_BF16);`
		e354a5
		e354a5	`printf ("Usable CPU features:\n");`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SSE3);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PCLMULQDQ);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (DTES64);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MONITOR);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (DS_CPL);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (VMX);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SMX);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (EST);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (TM2);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SSSE3);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CNXT_ID);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SDBG);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (FMA);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CMPXCHG16B);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (XTPRUPDCTRL);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PDCM);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PCID);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (DCA);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SSE4_1);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SSE4_2);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (X2APIC);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MOVBE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (POPCNT);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (TSC_DEADLINE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (AES);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (XSAVE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (OSXSAVE);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (F16C);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (RDRAND);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (FPU);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (VME);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (DE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PSE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (TSC);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MSR);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PAE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MCE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CX8);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (APIC);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SEP);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MTRR);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PGE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MCA);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CMOV);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PAT);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PSE_36);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PSN);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CLFSH);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (DS);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (ACPI);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MMX);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (FXSR);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SSE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SSE2);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SS);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (HTT);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (TM);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PBE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (FSGSBASE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (TSC_ADJUST);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SGX);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (BMI1);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (HLE);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX2);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SMEP);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (BMI2);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (ERMS);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (INVPCID);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (RTM);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PQM);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (DEPR_FPU_CS_DS);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MPX);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PQE);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512F);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512DQ);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (RDSEED);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (ADX);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SMAP);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_IFMA);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CLFLUSHOPT);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CLWB);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (TRACE);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512PF);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512ER);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512CD);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SHA);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512BW);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512VL);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PREFETCHWT1);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_VBMI);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (UMIP);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (PKU);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (OSPKE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (WAITPKG);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_VBMI2);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SHSTK);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (GFNI);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (VAES);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (VPCLMULQDQ);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_VNNI);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_BITALG);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_VPOPCNTDQ);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (RDPID);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CLDEMOTE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MOVDIRI);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MOVDIR64B);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (ENQCMD);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SGX_LC);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PKS);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_4VNNIW);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_4FMAPS);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (FSRM);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_VP2INTERSECT);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (MD_CLEAR);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SERIALIZE);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (HYBRID);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (TSXLDTRK);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PCONFIG);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (IBT);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AMX_BF16);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AMX_TILE);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AMX_INT8);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (IBRS_IBPB);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (STIBP);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (L1D_FLUSH);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (ARCH_CAPABILITIES);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (CORE_CAPABILITIES);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SSBD);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (LAHF64_SAHF64);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SVM);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (LZCNT);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SSE4A);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PREFETCHW);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (XOP);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (LWP);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (FMA4);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (TBM);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (SYSCALL_SYSRET);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (NX);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (PAGE1GB);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (RDTSCP);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (LM);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (XSAVEOPT);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (XSAVEC);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (XGETBV_ECX_1);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (XSAVES);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (XFD);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (INVARIANT_TSC);`
		e354a5	`+ CHECK_CPU_FEATURE_USABLE (WBNOINVD);`
		e354a5	`CHECK_CPU_FEATURE_USABLE (AVX512_BF16);`
		e354a5
		e354a5	`return 0;`
		e354a5	`diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile`
		e354a5	`index e3bb45d78811d70f..42b97c5cc73892cc 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.cpu.hwcaps=-XSAVEC_Usable`
		e354a5	`+tst-x86_64-1-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC`
		e354a5	`endif`
		e354a5
		e354a5	`$(objpfx)tst-x86_64-1: $(objpfx)x86_64/tst-x86_64mod-1.so`
		e354a5	`@@ -71,10 +71,10 @@ CFLAGS-tst-platformmod-2.c = -mno-avx`
		e354a5	`LDFLAGS-tst-platformmod-2.so = -Wl,-soname,tst-platformmod-2.so`
		e354a5	`$(objpfx)tst-platform-1: $(objpfx)tst-platformmod-1.so`
		e354a5	`$(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	`+# Turn off AVX512F and AVX2 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.cpu.hwcaps=-AVX512F_Usable,-AVX2_Usable`
		e354a5	`+ GLIBC_TUNABLES=glibc.cpu.hwcaps=-AVX512F,-AVX2`
		e354a5	`endif`
		e354a5
		e354a5	`tests += tst-audit3 tst-audit4 tst-audit5 tst-audit6 tst-audit7 \`
		e354a5	`diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h`
		e354a5	`index 23afb3c05dbe17d6..d58298d787ef352c 100644`
		e354a5	`--- a/sysdeps/x86_64/dl-machine.h`
		e354a5	`+++ b/sysdeps/x86_64/dl-machine.h`
		e354a5	`@@ -99,9 +99,9 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)`
		e354a5	`end in this function. */`
		e354a5	`if (__glibc_unlikely (profile))`
		e354a5	`{`
		e354a5	`- if (HAS_ARCH_FEATURE (AVX512F_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE (AVX512F))`
		e354a5	`(ElfW(Addr) ) (got + 2) = (ElfW(Addr)) &_dl_runtime_profile_avx512;`
		e354a5	`- else if (HAS_ARCH_FEATURE (AVX_Usable))`
		e354a5	`+ else if (CPU_FEATURE_USABLE (AVX))`
		e354a5	`(ElfW(Addr) ) (got + 2) = (ElfW(Addr)) &_dl_runtime_profile_avx;`
		e354a5	`else`
		e354a5	`(ElfW(Addr) ) (got + 2) = (ElfW(Addr)) &_dl_runtime_profile_sse;`
		e354a5	`@@ -119,7 +119,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)`
		e354a5	`the resolved address. */`
		e354a5	`if (GLRO(dl_x86_cpu_features).xsave_state_size != 0)`
		e354a5	`(ElfW(Addr) ) (got + 2)`
		e354a5	`- = (HAS_ARCH_FEATURE (XSAVEC_Usable)`
		e354a5	`+ = (CPU_FEATURE_USABLE (XSAVEC)`
		e354a5	`? (ElfW(Addr)) &_dl_runtime_resolve_xsavec`
		e354a5	`: (ElfW(Addr)) &_dl_runtime_resolve_xsave);`
		e354a5	`else`
		e354a5	`diff --git a/sysdeps/x86_64/fpu/math-tests-arch.h b/sysdeps/x86_64/fpu/math-tests-arch.h`
		e354a5	`index a5df133292ce39b0..61955d70863321fd 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/math-tests-arch.h`
		e354a5	`+++ b/sysdeps/x86_64/fpu/math-tests-arch.h`
		e354a5	`@@ -24,7 +24,7 @@`
		e354a5	`# define CHECK_ARCH_EXT \`
		e354a5	`do \`
		e354a5	`{ \`
		e354a5	`- if (!HAS_ARCH_FEATURE (AVX_Usable)) return; \`
		e354a5	`+ if (!CPU_FEATURE_USABLE (AVX)) return; \`
		e354a5	`} \`
		e354a5	`while (0)`
		e354a5
		e354a5	`@@ -34,7 +34,7 @@`
		e354a5	`# define CHECK_ARCH_EXT \`
		e354a5	`do \`
		e354a5	`{ \`
		e354a5	`- if (!HAS_ARCH_FEATURE (AVX2_Usable)) return; \`
		e354a5	`+ if (!CPU_FEATURE_USABLE (AVX2)) return; \`
		e354a5	`} \`
		e354a5	`while (0)`
		e354a5
		e354a5	`@@ -44,7 +44,7 @@`
		e354a5	`# define CHECK_ARCH_EXT \`
		e354a5	`do \`
		e354a5	`{ \`
		e354a5	`- if (!HAS_ARCH_FEATURE (AVX512F_Usable)) return; \`
		e354a5	`+ if (!CPU_FEATURE_USABLE (AVX512F)) return; \`
		e354a5	`} \`
		e354a5	`while (0)`
		e354a5
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h b/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h`
		e354a5	`index a5f9375afc683663..399ed90362f476b7 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h`
		e354a5	`@@ -29,14 +29,14 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, FMA)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2))`
		e354a5	`return OPTIMIZE (fma);`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, FMA4_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, FMA4))`
		e354a5	`return OPTIMIZE (fma4);`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX))`
		e354a5	`return OPTIMIZE (avx);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-fma.h b/sysdeps/x86_64/fpu/multiarch/ifunc-fma.h`
		e354a5	`index 63a8cd221fb34e28..c6717d65dfd160e7 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/ifunc-fma.h`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/ifunc-fma.h`
		e354a5	`@@ -26,8 +26,8 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, FMA)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2))`
		e354a5	`return OPTIMIZE (fma);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h`
		e354a5	`index a2526a2ee0e55e18..76c677198dac5cb0 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h`
		e354a5	`@@ -28,11 +28,11 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, FMA)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2))`
		e354a5	`return OPTIMIZE (fma);`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, FMA4_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, FMA))`
		e354a5	`return OPTIMIZE (fma4);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-avx2.h b/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-avx2.h`
		e354a5	`index bd2d32e4186c11e3..d84d82a3a22f0e86 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-avx2.h`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-avx2.h`
		e354a5	`@@ -31,8 +31,8 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, FMA)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2))`
		e354a5	`return OPTIMIZE (avx2);`
		e354a5
		e354a5	`return OPTIMIZE (sse_wrapper);`
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-avx512.h b/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-avx512.h`
		e354a5	`index 174e462cfbcfa0a5..a2d9972e5a02b87c 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-avx512.h`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-avx512.h`
		e354a5	`@@ -34,10 +34,10 @@ IFUNC_SELECTOR (void)`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, MathVec_Prefer_No_AVX512))`
		e354a5	`{`
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX512DQ_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512DQ))`
		e354a5	`return OPTIMIZE (skx);`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F))`
		e354a5	`return OPTIMIZE (knl);`
		e354a5	`}`
		e354a5
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-sse4_1.h b/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-sse4_1.h`
		e354a5	`index c1e70ebfc1b424e6..64d03f6cb1caa9b7 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-sse4_1.h`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/ifunc-mathvec-sse4_1.h`
		e354a5	`@@ -31,7 +31,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_1))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_1))`
		e354a5	`return OPTIMIZE (sse4);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h b/sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h`
		e354a5	`index a8710ba80226f13f..81bca1c9ecde9fb7 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h`
		e354a5	`@@ -26,7 +26,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_1))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_1))`
		e354a5	`return OPTIMIZE (sse41);`
		e354a5
		e354a5	`return OPTIMIZE (c);`
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/s_fma.c b/sysdeps/x86_64/fpu/multiarch/s_fma.c`
		e354a5	`index 875c76d3727e6d3c..9ea8d368d08220a9 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/s_fma.c`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/s_fma.c`
		e354a5	`@@ -41,8 +41,8 @@ __fma_fma4 (double x, double y, double z)`
		e354a5	`}`
		e354a5
		e354a5
		e354a5	`-libm_ifunc (__fma, HAS_ARCH_FEATURE (FMA_Usable)`
		e354a5	`- ? __fma_fma3 : (HAS_ARCH_FEATURE (FMA4_Usable)`
		e354a5	`+libm_ifunc (__fma, CPU_FEATURE_USABLE (FMA)`
		e354a5	`+ ? __fma_fma3 : (CPU_FEATURE_USABLE (FMA4)`
		e354a5	`? __fma_fma4 : __fma_sse2));`
		e354a5	`libm_alias_double (__fma, fma)`
		e354a5
		e354a5	`diff --git a/sysdeps/x86_64/fpu/multiarch/s_fmaf.c b/sysdeps/x86_64/fpu/multiarch/s_fmaf.c`
		e354a5	`index 5f4c2ec0be15c2dc..33e64ef8d1a03269 100644`
		e354a5	`--- a/sysdeps/x86_64/fpu/multiarch/s_fmaf.c`
		e354a5	`+++ b/sysdeps/x86_64/fpu/multiarch/s_fmaf.c`
		e354a5	`@@ -40,8 +40,8 @@ __fmaf_fma4 (float x, float y, float z)`
		e354a5	`}`
		e354a5
		e354a5
		e354a5	`-libm_ifunc (__fmaf, HAS_ARCH_FEATURE (FMA_Usable)`
		e354a5	`- ? __fmaf_fma3 : (HAS_ARCH_FEATURE (FMA4_Usable)`
		e354a5	`+libm_ifunc (__fmaf, CPU_FEATURE_USABLE (FMA)`
		e354a5	`+ ? __fmaf_fma3 : (CPU_FEATURE_USABLE (FMA4)`
		e354a5	`? __fmaf_fma4 : __fmaf_sse2));`
		e354a5	`libm_alias_float (__fma, fma)`
		e354a5
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-avx2.h b/sysdeps/x86_64/multiarch/ifunc-avx2.h`
		e354a5	`index 9cab837642b7af21..5c88640a2d901ec6 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-avx2.h`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-avx2.h`
		e354a5	`@@ -28,7 +28,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (avx2);`
		e354a5
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c`
		e354a5	`index 8b55bb6954000cc2..fe13505ca1ac7ef0 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c`
		e354a5	`@@ -41,19 +41,19 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/memchr.c. */`
		e354a5	`IFUNC_IMPL (i, name, memchr,`
		e354a5	`IFUNC_IMPL_ADD (array, i, memchr,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__memchr_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memchr, 1, __memchr_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/memcmp.c. */`
		e354a5	`IFUNC_IMPL (i, name, memcmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcmp,`
		e354a5	`- (HAS_ARCH_FEATURE (AVX2_Usable)`
		e354a5	`- && HAS_CPU_FEATURE (MOVBE)),`
		e354a5	`+ (CPU_FEATURE_USABLE (AVX2)`
		e354a5	`+ && CPU_FEATURE_USABLE (MOVBE)),`
		e354a5	`__memcmp_avx2_movbe)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcmp, HAS_CPU_FEATURE (SSE4_1),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcmp, CPU_FEATURE_USABLE (SSE4_1),`
		e354a5	`__memcmp_sse4_1)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcmp, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcmp, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_sse2))`
		e354a5
		e354a5	`@@ -61,25 +61,25 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/memmove_chk.c. */`
		e354a5	`IFUNC_IMPL (i, name, __memmove_chk,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memmove_chk_avx512_no_vzeroupper)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memmove_chk_avx512_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memmove_chk_avx512_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__memmove_chk_avx_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__memmove_chk_avx_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memmove_chk_ssse3_back)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memmove_chk_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memmove_chk, 1,`
		e354a5	`__memmove_chk_sse2_unaligned)`
		e354a5	`@@ -92,23 +92,23 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/memmove.c. */`
		e354a5	`IFUNC_IMPL (i, name, memmove,`
		e354a5	`IFUNC_IMPL_ADD (array, i, memmove,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__memmove_avx_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memmove,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__memmove_avx_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memmove,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memmove_avx512_no_vzeroupper)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memmove,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memmove_avx512_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memmove,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memmove_avx512_unaligned_erms)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memmove, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memmove, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memmove_ssse3_back)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memmove, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memmove, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memmove_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memmove, 1,`
		e354a5	`@@ -119,7 +119,7 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/memrchr.c. */`
		e354a5	`IFUNC_IMPL (i, name, memrchr,`
		e354a5	`IFUNC_IMPL_ADD (array, i, memrchr,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__memrchr_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_sse2))`
		e354a5
		e354a5	`@@ -133,19 +133,19 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk, 1,`
		e354a5	`__memset_chk_sse2_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__memset_chk_avx2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__memset_chk_avx2_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memset_chk_avx512_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memset_chk_avx512_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memset_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memset_chk_avx512_no_vzeroupper)`
		e354a5	`)`
		e354a5	`#endif`
		e354a5	`@@ -158,48 +158,48 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`__memset_sse2_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memset, 1, __memset_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memset,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__memset_avx2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memset,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__memset_avx2_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memset,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memset_avx512_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memset,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memset_avx512_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memset,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memset_avx512_no_vzeroupper)`
		e354a5	`)`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/rawmemchr.c. */`
		e354a5	`IFUNC_IMPL (i, name, rawmemchr,`
		e354a5	`IFUNC_IMPL_ADD (array, i, rawmemchr,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__rawmemchr_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, rawmemchr, 1, __rawmemchr_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strlen.c. */`
		e354a5	`IFUNC_IMPL (i, name, strlen,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strlen,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strlen_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strnlen.c. */`
		e354a5	`IFUNC_IMPL (i, name, strnlen,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strnlen,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strnlen_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/stpncpy.c. */`
		e354a5	`IFUNC_IMPL (i, name, stpncpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, stpncpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, stpncpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__stpncpy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, stpncpy, HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, stpncpy, CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__stpncpy_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, stpncpy, 1,`
		e354a5	`__stpncpy_sse2_unaligned)`
		e354a5	`@@ -207,9 +207,9 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/stpcpy.c. */`
		e354a5	`IFUNC_IMPL (i, name, stpcpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, stpcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, stpcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__stpcpy_ssse3)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, stpcpy, HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, stpcpy, CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__stpcpy_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, stpcpy, 1, __stpcpy_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, stpcpy, 1, __stpcpy_sse2))`
		e354a5	`@@ -217,35 +217,35 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/strcasecmp_l.c. */`
		e354a5	`IFUNC_IMPL (i, name, strcasecmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__strcasecmp_avx)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strcasecmp_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcasecmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp, 1, __strcasecmp_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strcasecmp_l.c. */`
		e354a5	`IFUNC_IMPL (i, name, strcasecmp_l,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp_l,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__strcasecmp_l_avx)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp_l,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strcasecmp_l_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp_l,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcasecmp_l_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcasecmp_l, 1,`
		e354a5	`__strcasecmp_l_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strcat.c. */`
		e354a5	`IFUNC_IMPL (i, name, strcat,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcat, HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcat, CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strcat_avx2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcat, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcat, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcat_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcat, 1, __strcat_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcat, 1, __strcat_sse2))`
		e354a5	`@@ -253,7 +253,7 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/strchr.c. */`
		e354a5	`IFUNC_IMPL (i, name, strchr,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strchr,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strchr_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_sse2_no_bsf)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_sse2))`
		e354a5	`@@ -261,54 +261,54 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/strchrnul.c. */`
		e354a5	`IFUNC_IMPL (i, name, strchrnul,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strchrnul,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strchrnul_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strchrnul, 1, __strchrnul_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strrchr.c. */`
		e354a5	`IFUNC_IMPL (i, name, strrchr,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strrchr,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strrchr_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strcmp.c. */`
		e354a5	`IFUNC_IMPL (i, name, strcmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcmp,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strcmp_avx2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcmp, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcmp, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strcmp_sse42)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcmp, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcmp, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strcpy.c. */`
		e354a5	`IFUNC_IMPL (i, name, strcpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcpy, HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcpy, CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strcpy_avx2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strcpy_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strcspn.c. */`
		e354a5	`IFUNC_IMPL (i, name, strcspn,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strcspn, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strcspn, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strcspn_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strcspn, 1, __strcspn_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strncase_l.c. */`
		e354a5	`IFUNC_IMPL (i, name, strncasecmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__strncasecmp_avx)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strncasecmp_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncasecmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp, 1,`
		e354a5	`__strncasecmp_sse2))`
		e354a5	`@@ -316,22 +316,22 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/strncase_l.c. */`
		e354a5	`IFUNC_IMPL (i, name, strncasecmp_l,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp_l,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__strncasecmp_l_avx)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp_l,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strncasecmp_l_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp_l,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncasecmp_l_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,`
		e354a5	`__strncasecmp_l_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strncat.c. */`
		e354a5	`IFUNC_IMPL (i, name, strncat,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncat, HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncat, CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strncat_avx2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncat, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncat, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncat_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncat, 1,`
		e354a5	`__strncat_sse2_unaligned)`
		e354a5	`@@ -339,9 +339,9 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strncpy.c. */`
		e354a5	`IFUNC_IMPL (i, name, strncpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncpy, HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncpy, CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strncpy_avx2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncpy_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncpy, 1,`
		e354a5	`__strncpy_sse2_unaligned)`
		e354a5	`@@ -349,14 +349,14 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strpbrk.c. */`
		e354a5	`IFUNC_IMPL (i, name, strpbrk,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strpbrk, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strpbrk, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strpbrk_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strpbrk, 1, __strpbrk_sse2))`
		e354a5
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/strspn.c. */`
		e354a5	`IFUNC_IMPL (i, name, strspn,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strspn, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strspn, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strspn_sse42)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strspn, 1, __strspn_sse2))`
		e354a5
		e354a5	`@@ -368,70 +368,70 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/wcschr.c. */`
		e354a5	`IFUNC_IMPL (i, name, wcschr,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcschr,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wcschr_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcschr, 1, __wcschr_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/wcsrchr.c. */`
		e354a5	`IFUNC_IMPL (i, name, wcsrchr,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcsrchr,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wcsrchr_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcsrchr, 1, __wcsrchr_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/wcscmp.c. */`
		e354a5	`IFUNC_IMPL (i, name, wcscmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcscmp,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wcscmp_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcscmp, 1, __wcscmp_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/wcsncmp.c. */`
		e354a5	`IFUNC_IMPL (i, name, wcsncmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcsncmp,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wcsncmp_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcsncmp, 1, __wcsncmp_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/wcscpy.c. */`
		e354a5	`IFUNC_IMPL (i, name, wcscpy,`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wcscpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wcscpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__wcscpy_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcscpy, 1, __wcscpy_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/wcslen.c. */`
		e354a5	`IFUNC_IMPL (i, name, wcslen,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcslen,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wcslen_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcslen, 1, __wcslen_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/wcsnlen.c. */`
		e354a5	`IFUNC_IMPL (i, name, wcsnlen,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcsnlen,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wcsnlen_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcsnlen,`
		e354a5	`- HAS_CPU_FEATURE (SSE4_1),`
		e354a5	`+ CPU_FEATURE_USABLE (SSE4_1),`
		e354a5	`__wcsnlen_sse4_1)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wcsnlen, 1, __wcsnlen_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/wmemchr.c. */`
		e354a5	`IFUNC_IMPL (i, name, wmemchr,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wmemchr,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wmemchr_avx2)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wmemchr, 1, __wmemchr_sse2))`
		e354a5
		e354a5	`/* Support sysdeps/x86_64/multiarch/wmemcmp.c. */`
		e354a5	`IFUNC_IMPL (i, name, wmemcmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wmemcmp,`
		e354a5	`- (HAS_ARCH_FEATURE (AVX2_Usable)`
		e354a5	`- && HAS_CPU_FEATURE (MOVBE)),`
		e354a5	`+ (CPU_FEATURE_USABLE (AVX2)`
		e354a5	`+ && CPU_FEATURE_USABLE (MOVBE)),`
		e354a5	`__wmemcmp_avx2_movbe)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wmemcmp, HAS_CPU_FEATURE (SSE4_1),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wmemcmp, CPU_FEATURE_USABLE (SSE4_1),`
		e354a5	`__wmemcmp_sse4_1)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, wmemcmp, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, wmemcmp, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__wmemcmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wmemcmp, 1, __wmemcmp_sse2))`
		e354a5
		e354a5	`@@ -440,35 +440,35 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`IFUNC_IMPL_ADD (array, i, wmemset, 1,`
		e354a5	`__wmemset_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wmemset,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wmemset_avx2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, wmemset,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__wmemset_avx512_unaligned))`
		e354a5
		e354a5	`#ifdef SHARED`
		e354a5	`/* Support sysdeps/x86_64/multiarch/memcpy_chk.c. */`
		e354a5	`IFUNC_IMPL (i, name, __memcpy_chk,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memcpy_chk_avx512_no_vzeroupper)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memcpy_chk_avx512_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memcpy_chk_avx512_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__memcpy_chk_avx_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__memcpy_chk_avx_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcpy_chk_ssse3_back)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcpy_chk_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __memcpy_chk, 1,`
		e354a5	`__memcpy_chk_sse2_unaligned)`
		e354a5	`@@ -481,23 +481,23 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/memcpy.c. */`
		e354a5	`IFUNC_IMPL (i, name, memcpy,`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__memcpy_avx_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__memcpy_avx_unaligned_erms)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcpy_ssse3_back)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, memcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, memcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__memcpy_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memcpy_avx512_no_vzeroupper)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memcpy_avx512_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__memcpy_avx512_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, memcpy, 1,`
		e354a5	`@@ -508,25 +508,25 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/mempcpy_chk.c. */`
		e354a5	`IFUNC_IMPL (i, name, __mempcpy_chk,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__mempcpy_chk_avx512_no_vzeroupper)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__mempcpy_chk_avx512_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__mempcpy_chk_avx512_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__mempcpy_chk_avx_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__mempcpy_chk_avx_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__mempcpy_chk_ssse3_back)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk,`
		e354a5	`- HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__mempcpy_chk_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __mempcpy_chk, 1,`
		e354a5	`__mempcpy_chk_sse2_unaligned)`
		e354a5	`@@ -539,23 +539,23 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/mempcpy.c. */`
		e354a5	`IFUNC_IMPL (i, name, mempcpy,`
		e354a5	`IFUNC_IMPL_ADD (array, i, mempcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__mempcpy_avx512_no_vzeroupper)`
		e354a5	`IFUNC_IMPL_ADD (array, i, mempcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__mempcpy_avx512_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, mempcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__mempcpy_avx512_unaligned_erms)`
		e354a5	`IFUNC_IMPL_ADD (array, i, mempcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__mempcpy_avx_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, mempcpy,`
		e354a5	`- HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX),`
		e354a5	`__mempcpy_avx_unaligned_erms)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, mempcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, mempcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__mempcpy_ssse3_back)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, mempcpy, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, mempcpy, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__mempcpy_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, mempcpy, 1,`
		e354a5	`__mempcpy_sse2_unaligned)`
		e354a5	`@@ -566,11 +566,11 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`/* Support sysdeps/x86_64/multiarch/strncmp.c. */`
		e354a5	`IFUNC_IMPL (i, name, strncmp,`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncmp,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__strncmp_avx2)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncmp, HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncmp, CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`__strncmp_sse42)`
		e354a5	`- IFUNC_IMPL_ADD (array, i, strncmp, HAS_CPU_FEATURE (SSSE3),`
		e354a5	`+ IFUNC_IMPL_ADD (array, i, strncmp, CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`__strncmp_ssse3)`
		e354a5	`IFUNC_IMPL_ADD (array, i, strncmp, 1, __strncmp_sse2))`
		e354a5
		e354a5	`@@ -580,10 +580,10 @@ __libc_ifunc_impl_list (const char name, struct libc_ifunc_impl array,`
		e354a5	`IFUNC_IMPL_ADD (array, i, __wmemset_chk, 1,`
		e354a5	`__wmemset_chk_sse2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __wmemset_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX2_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX2),`
		e354a5	`__wmemset_chk_avx2_unaligned)`
		e354a5	`IFUNC_IMPL_ADD (array, i, __wmemset_chk,`
		e354a5	`- HAS_ARCH_FEATURE (AVX512F_Usable),`
		e354a5	`+ CPU_FEATURE_USABLE (AVX512F),`
		e354a5	`__wmemset_chk_avx512_unaligned))`
		e354a5	`#endif`
		e354a5
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-memcmp.h b/sysdeps/x86_64/multiarch/ifunc-memcmp.h`
		e354a5	`index bf5ab8eb7ffd0002..6c1f3153579d19c4 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-memcmp.h`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-memcmp.h`
		e354a5	`@@ -30,15 +30,15 @@ IFUNC_SELECTOR (void)`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`- && CPU_FEATURES_CPU_P (cpu_features, MOVBE)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, MOVBE)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (avx2_movbe);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_1))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_1))`
		e354a5	`return OPTIMIZE (sse4_1);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-memmove.h b/sysdeps/x86_64/multiarch/ifunc-memmove.h`
		e354a5	`index 5b1eb1c92c2f199b..5e5f02994531ec14 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-memmove.h`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-memmove.h`
		e354a5	`@@ -45,13 +45,13 @@ IFUNC_SELECTOR (void)`
		e354a5	`\|\| CPU_FEATURES_ARCH_P (cpu_features, Prefer_FSRM))`
		e354a5	`return OPTIMIZE (erms);`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable)`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F)`
		e354a5	`&& !CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_AVX512))`
		e354a5	`{`
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER))`
		e354a5	`return OPTIMIZE (avx512_no_vzeroupper);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, ERMS))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, ERMS))`
		e354a5	`return OPTIMIZE (avx512_unaligned_erms);`
		e354a5
		e354a5	`return OPTIMIZE (avx512_unaligned);`
		e354a5	`@@ -59,16 +59,16 @@ IFUNC_SELECTOR (void)`
		e354a5
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`{`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, ERMS))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, ERMS))`
		e354a5	`return OPTIMIZE (avx_unaligned_erms);`
		e354a5
		e354a5	`return OPTIMIZE (avx_unaligned);`
		e354a5	`}`
		e354a5
		e354a5	`- if (!CPU_FEATURES_CPU_P (cpu_features, SSSE3)`
		e354a5	`+ if (!CPU_FEATURE_USABLE_P (cpu_features, SSSE3)`
		e354a5	`\|\| CPU_FEATURES_ARCH_P (cpu_features, Fast_Unaligned_Copy))`
		e354a5	`{`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, ERMS))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, ERMS))`
		e354a5	`return OPTIMIZE (sse2_unaligned_erms);`
		e354a5
		e354a5	`return OPTIMIZE (sse2_unaligned);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-memset.h b/sysdeps/x86_64/multiarch/ifunc-memset.h`
		e354a5	`index 19b5ae676c2d5d53..708bd72e2c3d3963 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-memset.h`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-memset.h`
		e354a5	`@@ -42,27 +42,27 @@ IFUNC_SELECTOR (void)`
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Prefer_ERMS))`
		e354a5	`return OPTIMIZE (erms);`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable)`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F)`
		e354a5	`&& !CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_AVX512))`
		e354a5	`{`
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER))`
		e354a5	`return OPTIMIZE (avx512_no_vzeroupper);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, ERMS))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, ERMS))`
		e354a5	`return OPTIMIZE (avx512_unaligned_erms);`
		e354a5
		e354a5	`return OPTIMIZE (avx512_unaligned);`
		e354a5	`}`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX2))`
		e354a5	`{`
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, ERMS))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, ERMS))`
		e354a5	`return OPTIMIZE (avx2_unaligned_erms);`
		e354a5	`else`
		e354a5	`return OPTIMIZE (avx2_unaligned);`
		e354a5	`}`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, ERMS))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, ERMS))`
		e354a5	`return OPTIMIZE (sse2_unaligned_erms);`
		e354a5
		e354a5	`return OPTIMIZE (sse2_unaligned);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-sse4_2.h b/sysdeps/x86_64/multiarch/ifunc-sse4_2.h`
		e354a5	`index f2b791cccf12c425..73383f4b583b29c8 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-sse4_2.h`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-sse4_2.h`
		e354a5	`@@ -27,7 +27,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_2))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_2))`
		e354a5	`return OPTIMIZE (sse42);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h b/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h`
		e354a5	`index 1ca170b663a4e65c..6a4bb07849a11f51 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h`
		e354a5	`@@ -29,14 +29,14 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX_Usable))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX))`
		e354a5	`return OPTIMIZE (avx);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_2)`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_2)`
		e354a5	`&& !CPU_FEATURES_ARCH_P (cpu_features, Slow_SSE4_2))`
		e354a5	`return OPTIMIZE (sse42);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-strcpy.h b/sysdeps/x86_64/multiarch/ifunc-strcpy.h`
		e354a5	`index 4f2286fefccda069..100dca5cde0ecac5 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-strcpy.h`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-strcpy.h`
		e354a5	`@@ -32,14 +32,14 @@ IFUNC_SELECTOR (void)`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (avx2);`
		e354a5
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (sse2_unaligned);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/ifunc-wmemset.h b/sysdeps/x86_64/multiarch/ifunc-wmemset.h`
		e354a5	`index 2f1085f5fc483c70..eb2422104751b235 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/ifunc-wmemset.h`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/ifunc-wmemset.h`
		e354a5	`@@ -28,10 +28,10 @@ IFUNC_SELECTOR (void)`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`{`
		e354a5	`- if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable)`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F)`
		e354a5	`&& !CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_AVX512))`
		e354a5	`return OPTIMIZE (avx512_unaligned);`
		e354a5	`else`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/sched_cpucount.c b/sysdeps/x86_64/multiarch/sched_cpucount.c`
		e354a5	`index 7949119dcdb5a94b..b38ff37c6511ca1b 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/sched_cpucount.c`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/sched_cpucount.c`
		e354a5	`@@ -33,4 +33,4 @@`
		e354a5	`#undef __sched_cpucount`
		e354a5
		e354a5	`libc_ifunc (__sched_cpucount,`
		e354a5	`- HAS_CPU_FEATURE (POPCNT) ? popcount_cpucount : generic_cpucount);`
		e354a5	`+ CPU_FEATURE_USABLE (POPCNT) ? popcount_cpucount : generic_cpucount);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/strchr.c b/sysdeps/x86_64/multiarch/strchr.c`
		e354a5	`index 76d64fb378e9bbac..329547132c3a301b 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/strchr.c`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/strchr.c`
		e354a5	`@@ -36,7 +36,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (avx2);`
		e354a5
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/strcmp.c b/sysdeps/x86_64/multiarch/strcmp.c`
		e354a5	`index b903e418df151ec1..3f433fbccf9e7121 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/strcmp.c`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/strcmp.c`
		e354a5	`@@ -37,14 +37,14 @@ IFUNC_SELECTOR (void)`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (avx2);`
		e354a5
		e354a5	`if (CPU_FEATURES_ARCH_P (cpu_features, Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (sse2_unaligned);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/strncmp.c b/sysdeps/x86_64/multiarch/strncmp.c`
		e354a5	`index 02b6d0b6f5717e2a..686d654f3da84379 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/strncmp.c`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/strncmp.c`
		e354a5	`@@ -37,15 +37,15 @@ IFUNC_SELECTOR (void)`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (avx2);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_2)`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_2)`
		e354a5	`&& !CPU_FEATURES_ARCH_P (cpu_features, Slow_SSE4_2))`
		e354a5	`return OPTIMIZE (sse42);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/test-multiarch.c b/sysdeps/x86_64/multiarch/test-multiarch.c`
		e354a5	`index 417147c3d5f325a5..cc2ea56a6753402d 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/test-multiarch.c`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/test-multiarch.c`
		e354a5	`@@ -75,18 +75,18 @@ do_test (int argc, char **argv)`
		e354a5	`int fails;`
		e354a5
		e354a5	`get_cpuinfo ();`
		e354a5	`- fails = check_proc ("avx", HAS_ARCH_FEATURE (AVX_Usable),`
		e354a5	`- "HAS_ARCH_FEATURE (AVX_Usable)");`
		e354a5	`- fails += check_proc ("fma4", HAS_ARCH_FEATURE (FMA4_Usable),`
		e354a5	`- "HAS_ARCH_FEATURE (FMA4_Usable)");`
		e354a5	`- fails += check_proc ("sse4_2", HAS_CPU_FEATURE (SSE4_2),`
		e354a5	`- "HAS_CPU_FEATURE (SSE4_2)");`
		e354a5	`- fails += check_proc ("sse4_1", HAS_CPU_FEATURE (SSE4_1)`
		e354a5	`- , "HAS_CPU_FEATURE (SSE4_1)");`
		e354a5	`- fails += check_proc ("ssse3", HAS_CPU_FEATURE (SSSE3),`
		e354a5	`- "HAS_CPU_FEATURE (SSSE3)");`
		e354a5	`- fails += check_proc ("popcnt", HAS_CPU_FEATURE (POPCNT),`
		e354a5	`- "HAS_CPU_FEATURE (POPCNT)");`
		e354a5	`+ fails = check_proc ("avx", CPU_FEATURE_USABLE (AVX),`
		e354a5	`+ "CPU_FEATURE_USABLE (AVX)");`
		e354a5	`+ fails += check_proc ("fma4", CPU_FEATURE_USABLE (FMA4),`
		e354a5	`+ "CPU_FEATURE_USABLE (FMA4)");`
		e354a5	`+ fails += check_proc ("sse4_2", CPU_FEATURE_USABLE (SSE4_2),`
		e354a5	`+ "CPU_FEATURE_USABLE (SSE4_2)");`
		e354a5	`+ fails += check_proc ("sse4_1", CPU_FEATURE_USABLE (SSE4_1)`
		e354a5	`+ , "CPU_FEATURE_USABLE (SSE4_1)");`
		e354a5	`+ fails += check_proc ("ssse3", CPU_FEATURE_USABLE (SSSE3),`
		e354a5	`+ "CPU_FEATURE_USABLE (SSSE3)");`
		e354a5	`+ fails += check_proc ("popcnt", CPU_FEATURE_USABLE (POPCNT),`
		e354a5	`+ "CPU_FEATURE_USABLE (POPCNT)");`
		e354a5
		e354a5	`printf ("%d differences between /proc/cpuinfo and glibc code.\n", fails);`
		e354a5
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/wcscpy.c b/sysdeps/x86_64/multiarch/wcscpy.c`
		e354a5	`index f23b1fd853a4dcb4..8fffb5c3163ab3e4 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/wcscpy.c`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/wcscpy.c`
		e354a5	`@@ -34,7 +34,7 @@ IFUNC_SELECTOR (void)`
		e354a5	`{`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSSE3))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3))`
		e354a5	`return OPTIMIZE (ssse3);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`
		e354a5	`diff --git a/sysdeps/x86_64/multiarch/wcsnlen.c b/sysdeps/x86_64/multiarch/wcsnlen.c`
		e354a5	`index bd376057e3e26ed6..b3144c938df70b1e 100644`
		e354a5	`--- a/sysdeps/x86_64/multiarch/wcsnlen.c`
		e354a5	`+++ b/sysdeps/x86_64/multiarch/wcsnlen.c`
		e354a5	`@@ -36,11 +36,11 @@ IFUNC_SELECTOR (void)`
		e354a5	`const struct cpu_features* cpu_features = __get_cpu_features ();`
		e354a5
		e354a5	`if (!CPU_FEATURES_ARCH_P (cpu_features, Prefer_No_VZEROUPPER)`
		e354a5	`- && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)`
		e354a5	`+ && CPU_FEATURE_USABLE_P (cpu_features, AVX2)`
		e354a5	`&& CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load))`
		e354a5	`return OPTIMIZE (avx2);`
		e354a5
		e354a5	`- if (CPU_FEATURES_CPU_P (cpu_features, SSE4_1))`
		e354a5	`+ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_1))`
		e354a5	`return OPTIMIZE (sse4_1);`
		e354a5
		e354a5	`return OPTIMIZE (sse2);`

rpms / glibc

Source Code

Blame SOURCES/glibc-rh1817513-77.patch