[commits] r11291 - in /fsf/glibc-2_12-branch/libc: ChangeLog sysdeps/i386/i686/multiarch/strspn.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Aug 19 09:04:50 2010
New Revision: 11291

Log:
Import glibc-2.12 for 2010-08-19

Modified:
    fsf/glibc-2_12-branch/libc/ChangeLog
    fsf/glibc-2_12-branch/libc/sysdeps/i386/i686/multiarch/strspn.S

Modified: fsf/glibc-2_12-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_12-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_12-branch/libc/ChangeLog Thu Aug 19 09:04:50 2010
@@ -1,3 +1,7 @@
+2010-08-19  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/i386/i686/multiarch/strspn.S [!SHARED]: Fix SSE4.2 check.
+
 2010-08-06  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid):

Modified: fsf/glibc-2_12-branch/libc/sysdeps/i386/i686/multiarch/strspn.S
==============================================================================
--- fsf/glibc-2_12-branch/libc/sysdeps/i386/i686/multiarch/strspn.S (original)
+++ fsf/glibc-2_12-branch/libc/sysdeps/i386/i686/multiarch/strspn.S Thu Aug 19 09:04:50 2010
@@ -1,5 +1,5 @@
 /* Multiple versions of strspn
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009,2010 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -65,7 +65,7 @@
 	jne	1f
 	call	__init_cpu_features
 1:	leal	__strspn_ia32, %eax
-	testl	$index_SSE2, CPUID_OFFSET+index_SSE4_2+__cpu_features
+	testl	$bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
 	jz	2f
 	leal	__strspn_sse42, %eax
 2:	ret