diff options
| -rw-r--r-- | sysdeps/x86/cpu-features.c | 3 | ||||
| -rw-r--r-- | sysdeps/x86/cpu-features.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index 4be4be7051..90be104842 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -248,6 +248,9 @@ init_cpu_features (struct cpu_features *cpu_features) get_extended_indices (cpu_features); + if (CPU_FEATURES_CPU_P (cpu_features, RTM_ALWAYS_ABORT)) + cpu_features->cpuid[index_cpu_RTM].reg_RTM &= ~bit_cpu_RTM; + if (family == 0x06) { model += extended_model; diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h index 177aa0ebc8..aad6c5198d 100644 --- a/sysdeps/x86/cpu-features.h +++ b/sysdeps/x86/cpu-features.h @@ -81,6 +81,7 @@ #define bit_cpu_IBT (1u << 20) #define bit_cpu_SHSTK (1u << 7) #define bit_cpu_FSRM (1 << 4) +#define bit_cpu_RTM_ALWAYS_ABORT (1 << 11) /* XCR0 Feature flags. */ #define bit_XMM_state (1 << 1) @@ -213,6 +214,7 @@ extern const struct cpu_features *__get_cpu_features (void) # define index_cpu_IBT COMMON_CPUID_INDEX_7 # define index_cpu_SHSTK COMMON_CPUID_INDEX_7 # define index_cpu_FSRM COMMON_CPUID_INDEX_7 +# define index_cpu_RTM_ALWAYS_ABORT COMMON_CPUID_INDEX_7 # define reg_CX8 edx # define reg_CMOV edx @@ -245,6 +247,7 @@ extern const struct cpu_features *__get_cpu_features (void) # define reg_IBT edx # define reg_SHSTK ecx # define reg_FSRM edx +# define reg_RTM_ALWAYS_ABORT edx # define index_arch_Fast_Rep_String FEATURE_INDEX_1 # define index_arch_Fast_Copy_Backward FEATURE_INDEX_1 |