Add HAS_RTM

diff --git a/ChangeLog b/ChangeLog
index 2611e75814ef77dc4ff37964ccbeee1c181a4645..589d82a7645e87a9cab2ecaea5ab29b3ca376b4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+       Initialize COMMON_CPUID_INDEX_7 element.
+       * sysdeps/x86_64/multiarch/init-arch.h (bit_RTM): New macro.
+       (CPUID_RTM): Likewise.
+       (HAS_RTM): Likewise.
+       (COMMON_CPUID_INDEX_7): New enum.
+
 2013-01-03  Andreas Schwab  <schwab@linux-m68k.org>
 
        [BZ #14981]

diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
index dc3b417c7932128f64db9feebd886a82f6ca9f27..992cbfb754cfb750274b85ee9d52bd35c475c717 100644 (file)
--- a/sysdeps/x86_64/multiarch/init-arch.c
+++ b/sysdeps/x86_64/multiarch/init-arch.c
@@ -143,6 +143,13 @@ __init_cpu_features (void)
   else
     kind = arch_kind_other;
 
+  if (__cpu_features.max_cpuid >= 7)
+    __cpuid_count (7, 0,
+                  __cpu_features.cpuid[COMMON_CPUID_INDEX_7].eax,
+                  __cpu_features.cpuid[COMMON_CPUID_INDEX_7].ebx,
+                  __cpu_features.cpuid[COMMON_CPUID_INDEX_7].ecx,
+                  __cpu_features.cpuid[COMMON_CPUID_INDEX_7].edx);
+
   /* Can we call xgetbv?  */
   if (CPUID_OSXSAVE)
     {

diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
index d3009b2e424f45860c98aefbf6e0abd39da93229..0aece18de3847178cae564454da870ee8c2909e6 100644 (file)
--- a/sysdeps/x86_64/multiarch/init-arch.h
+++ b/sysdeps/x86_64/multiarch/init-arch.h
@@ -26,6 +26,8 @@
 #define bit_FMA4_Usable                        (1 << 8)
 
 /* CPUID Feature flags.  */
+
+/* COMMON_CPUID_INDEX_1.  */
 #define bit_SSE2       (1 << 26)
 #define bit_SSSE3      (1 << 9)
 #define bit_SSE4_1     (1 << 19)
@@ -36,6 +38,9 @@
 #define bit_FMA                (1 << 12)
 #define bit_FMA4       (1 << 16)
 
+/* COMMON_CPUID_INDEX_7.  */
+#define bit_RTM                (1 << 11)
+
 /* XCR0 Feature flags.  */
 #define bit_XMM_state  (1 << 1)
 #define bit_YMM_state  (2 << 1)
@@ -67,6 +72,7 @@
 enum
   {
     COMMON_CPUID_INDEX_1 = 0,
+    COMMON_CPUID_INDEX_7,
     COMMON_CPUID_INDEX_80000001,       /* for AMD */
     /* Keep the following line at the end.  */
     COMMON_CPUID_INDEX_MAX
@@ -137,6 +143,8 @@ extern const struct cpu_features *__get_cpu_features (void)
   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_FMA)
 # define CPUID_FMA4 \
   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_80000001, ecx, bit_FMA4)
+# define CPUID_RTM \
+  HAS_CPUID_FLAG (COMMON_CPUID_INDEX_7, ebx, bit_RTM)
 
 /* HAS_* evaluates to true if we may use the feature at runtime.  */
 # define HAS_SSE2      HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, edx, bit_SSE2)
@@ -144,6 +152,7 @@ extern const struct cpu_features *__get_cpu_features (void)
 # define HAS_SSSE3     HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSSE3)
 # define HAS_SSE4_1    HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_1)
 # define HAS_SSE4_2    HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_2)
+# define HAS_RTM       HAS_CPU_FEATURE (COMMON_CPUID_INDEX_7, ebx, bit_RTM)
 
 # define index_Fast_Rep_String         FEATURE_INDEX_1
 # define index_Fast_Copy_Backward      FEATURE_INDEX_1