Incorrect x86 CPU family and model check.

(cherry picked from commit 3c88fe1e3ab8c6115e9b0c6eb109718da2116a33)

diff --git a/ChangeLog b/ChangeLog
index bc58d931b86d5131899c26f744b6dda092082abc..5cd714889609f3077d901b5f149aa7a585070a20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #11640]
+       * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+       Properly check family and model.
+
 2010-05-26  Takashi Yoshii  <takashi.yoshii.zj@renesas.com>
 
        * sysdeps/unix/sysv/linux/sh/sh4/register-dump.h: Fix iov[] size.

diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
index efb89b6c922a2d1ea95ab6d6397cf6df4549160c..f13a9f4b7992036af9779ed487cf225b9ca664da 100644 (file)
--- a/sysdeps/x86_64/multiarch/init-arch.c
+++ b/sysdeps/x86_64/multiarch/init-arch.c
@@ -62,15 +62,15 @@ __init_cpu_features (void)
       unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
       unsigned int extended_family = (eax >> 20) & 0xff;
       unsigned int extended_model = (eax >> 12) & 0xf0;
-      if (__cpu_features.family == 0x0f)
+      if (family == 0x0f)
        {
          family += extended_family;
          model += extended_model;
        }
-      else if (__cpu_features.family == 0x06)
+      else if (family == 0x06)
        {
          model += extended_model;
-         switch (__cpu_features.model)
+         switch (model)
            {
            case 0x1a:
            case 0x1e: