Incorrect x86 CPU family and model check.

(cherry picked from commit 3c88fe1e3ab8c6115e9b0c6eb109718da2116a33)

diff --git a/ChangeLog b/ChangeLog
index 871a70c5a304c313a4a41239493b078ffb5accc1..b03035f17d49c81d7d7bdba9086b0abc637eea40 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 0fe2f86b4f1b3d4a3c5624a639d3686a5812ff8b..198fcaa8d34efde99deba565d05850fb3af08c42 100644 (file)
--- a/sysdeps/x86_64/multiarch/init-arch.c
+++ b/sysdeps/x86_64/multiarch/init-arch.c
@@ -62,12 +62,12 @@ __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;
     }
   /* This spells out "AuthenticAMD".  */