[commits] r10576 - in /fsf/trunk/libc: ChangeLog sysdeps/x86_64/multiarch/init-arch.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri May 28 00:03:32 2010
New Revision: 10576

Log:
Import glibc-mainline for 2010-05-28

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/x86_64/multiarch/init-arch.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri May 28 00:03:32 2010
@@ -1,3 +1,9 @@
+2010-05-26  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[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@xxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/sh/sh4/register-dump.h: Fix iov[] size.

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/init-arch.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/init-arch.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/init-arch.c Fri May 28 00:03:32 2010
@@ -62,15 +62,15 @@
       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: