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

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Jun  4 00:03:44 2011
New Revision: 14087

Log:
Import glibc-mainline for 2011-06-04

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 Sat Jun  4 00:03:44 2011
@@ -1,3 +1,8 @@
+2011-06-02  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+	Assume Intel Core i3/i5/i7 processor if AVX is available.
+
 2011-05-31  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard): Fix

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 Sat Jun  4 00:03:44 2011
@@ -74,6 +74,7 @@
 	}
       else if (family == 0x06)
 	{
+	  ecx = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx;
 	  model += extended_model;
 	  switch (model)
 	    {
@@ -82,6 +83,12 @@
 	      /* BSF is slow on Atom.  */
 	      __cpu_features.feature[index_Slow_BSF] |= bit_Slow_BSF;
 	      break;
+
+	    default:
+	      /* Unknown family 0x06 processors.  Assuming this is one
+	         of Core i3/i5/i7 processors if AVX is available.  */
+	      if ((ecx & bit_AVX) == 0)
+		break;
 
 	    case 0x1a:
 	    case 0x1e: