From e0a460e855bc6d0cf6e3569ca0db48711fd58e8a Mon Sep 17 00:00:00 2001 From: Packit Service Date: Jan 06 2021 22:39:33 +0000 Subject: Apply patch glibc-rh1817513-81.patch patch_name: glibc-rh1817513-81.patch present_in_specfile: true location_in_specfile: 482 --- diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h index 21708c0..3b401d4 100644 --- a/sysdeps/x86/cpu-features.h +++ b/sysdeps/x86/cpu-features.h @@ -156,7 +156,7 @@ extern const struct cpu_features *__get_cpu_features (void) #define bit_cpu_DS_CPL (1u << 4) #define bit_cpu_VMX (1u << 5) #define bit_cpu_SMX (1u << 6) -#define bit_cpu_EST (1u << 7) +#define bit_cpu_EIST (1u << 7) #define bit_cpu_TM2 (1u << 8) #define bit_cpu_SSSE3 (1u << 9) #define bit_cpu_CNXT_ID (1u << 10) @@ -231,10 +231,10 @@ extern const struct cpu_features *__get_cpu_features (void) #define bit_cpu_ERMS (1u << 9) #define bit_cpu_INVPCID (1u << 10) #define bit_cpu_RTM (1u << 11) -#define bit_cpu_PQM (1u << 12) +#define bit_cpu_RDT_M (1u << 12) #define bit_cpu_DEPR_FPU_CS_DS (1u << 13) #define bit_cpu_MPX (1u << 14) -#define bit_cpu_PQE (1u << 15) +#define bit_cpu_RDT_A (1u << 15) #define bit_cpu_AVX512F (1u << 16) #define bit_cpu_AVX512DQ (1u << 17) #define bit_cpu_RDSEED (1u << 18) @@ -371,7 +371,7 @@ extern const struct cpu_features *__get_cpu_features (void) #define index_cpu_DS_CPL COMMON_CPUID_INDEX_1 #define index_cpu_VMX COMMON_CPUID_INDEX_1 #define index_cpu_SMX COMMON_CPUID_INDEX_1 -#define index_cpu_EST COMMON_CPUID_INDEX_1 +#define index_cpu_EIST COMMON_CPUID_INDEX_1 #define index_cpu_TM2 COMMON_CPUID_INDEX_1 #define index_cpu_SSSE3 COMMON_CPUID_INDEX_1 #define index_cpu_CNXT_ID COMMON_CPUID_INDEX_1 @@ -446,10 +446,10 @@ extern const struct cpu_features *__get_cpu_features (void) #define index_cpu_ERMS COMMON_CPUID_INDEX_7 #define index_cpu_INVPCID COMMON_CPUID_INDEX_7 #define index_cpu_RTM COMMON_CPUID_INDEX_7 -#define index_cpu_PQM COMMON_CPUID_INDEX_7 +#define index_cpu_RDT_M COMMON_CPUID_INDEX_7 #define index_cpu_DEPR_FPU_CS_DS COMMON_CPUID_INDEX_7 #define index_cpu_MPX COMMON_CPUID_INDEX_7 -#define index_cpu_PQE COMMON_CPUID_INDEX_7 +#define index_cpu_RDT_A COMMON_CPUID_INDEX_7 #define index_cpu_AVX512F COMMON_CPUID_INDEX_7 #define index_cpu_AVX512DQ COMMON_CPUID_INDEX_7 #define index_cpu_RDSEED COMMON_CPUID_INDEX_7 @@ -584,7 +584,7 @@ extern const struct cpu_features *__get_cpu_features (void) #define reg_DS_CPL ecx #define reg_VMX ecx #define reg_SMX ecx -#define reg_EST ecx +#define reg_EIST ecx #define reg_TM2 ecx #define reg_SSSE3 ecx #define reg_CNXT_ID ecx @@ -659,10 +659,10 @@ extern const struct cpu_features *__get_cpu_features (void) #define reg_ERMS ebx #define reg_INVPCID ebx #define reg_RTM ebx -#define reg_PQM ebx +#define reg_RDT_M ebx #define reg_DEPR_FPU_CS_DS ebx #define reg_MPX ebx -#define reg_PQE ebx +#define reg_RDT_A ebx #define reg_AVX512F ebx #define reg_AVX512DQ ebx #define reg_RDSEED ebx diff --git a/sysdeps/x86/tst-get-cpu-features.c b/sysdeps/x86/tst-get-cpu-features.c index 85ec9d5..582b125 100644 --- a/sysdeps/x86/tst-get-cpu-features.c +++ b/sysdeps/x86/tst-get-cpu-features.c @@ -73,7 +73,7 @@ do_test (void) CHECK_CPU_FEATURE (DS_CPL); CHECK_CPU_FEATURE (VMX); CHECK_CPU_FEATURE (SMX); - CHECK_CPU_FEATURE (EST); + CHECK_CPU_FEATURE (EIST); CHECK_CPU_FEATURE (TM2); CHECK_CPU_FEATURE (SSSE3); CHECK_CPU_FEATURE (CNXT_ID); @@ -136,10 +136,10 @@ do_test (void) CHECK_CPU_FEATURE (ERMS); CHECK_CPU_FEATURE (INVPCID); CHECK_CPU_FEATURE (RTM); - CHECK_CPU_FEATURE (PQM); + CHECK_CPU_FEATURE (RDT_M); CHECK_CPU_FEATURE (DEPR_FPU_CS_DS); CHECK_CPU_FEATURE (MPX); - CHECK_CPU_FEATURE (PQE); + CHECK_CPU_FEATURE (RDT_A); CHECK_CPU_FEATURE (AVX512F); CHECK_CPU_FEATURE (AVX512DQ); CHECK_CPU_FEATURE (RDSEED); @@ -226,7 +226,7 @@ do_test (void) CHECK_CPU_FEATURE_USABLE (DS_CPL); CHECK_CPU_FEATURE_USABLE (VMX); CHECK_CPU_FEATURE_USABLE (SMX); - CHECK_CPU_FEATURE_USABLE (EST); + CHECK_CPU_FEATURE_USABLE (EIST); CHECK_CPU_FEATURE_USABLE (TM2); CHECK_CPU_FEATURE_USABLE (SSSE3); CHECK_CPU_FEATURE_USABLE (CNXT_ID); @@ -289,10 +289,10 @@ do_test (void) CHECK_CPU_FEATURE_USABLE (ERMS); CHECK_CPU_FEATURE_USABLE (INVPCID); CHECK_CPU_FEATURE_USABLE (RTM); - CHECK_CPU_FEATURE_USABLE (PQM); + CHECK_CPU_FEATURE_USABLE (RDT_M); CHECK_CPU_FEATURE_USABLE (DEPR_FPU_CS_DS); CHECK_CPU_FEATURE_USABLE (MPX); - CHECK_CPU_FEATURE_USABLE (PQE); + CHECK_CPU_FEATURE_USABLE (RDT_A); CHECK_CPU_FEATURE_USABLE (AVX512F); CHECK_CPU_FEATURE_USABLE (AVX512DQ); CHECK_CPU_FEATURE_USABLE (RDSEED);