about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2010-08-19 07:42:16 -0700
committerUlrich Drepper <drepper@redhat.com>2010-08-19 07:42:16 -0700
commitbdaa77bc20bbaf5a78da541b993cfead8b8c1b1c (patch)
tree9893bd0ee95c46c490634ddefd79a28144f5ec42
parentfe2f79db99a35919769a33f256e3a6067906c3e3 (diff)
downloadglibc-bdaa77bc20bbaf5a78da541b993cfead8b8c1b1c.tar.gz
glibc-bdaa77bc20bbaf5a78da541b993cfead8b8c1b1c.tar.xz
glibc-bdaa77bc20bbaf5a78da541b993cfead8b8c1b1c.zip
Fix ifunc thunk for strspn on x86 in static libc
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/i386/i686/multiarch/strspn.S4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c59375123d..d2d7b4a56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-19  Andreas Schwab  <schwab@redhat.com>
+
+	* sysdeps/i386/i686/multiarch/strspn.S [!SHARED]: Fix SSE4.2 check.
+
 2010-08-19  Luis Machado  <luisgpm@br.ibm.com>
 
 	* sysdeps/powerpc/powerpc32/power7/memchr.S: New file.
diff --git a/sysdeps/i386/i686/multiarch/strspn.S b/sysdeps/i386/i686/multiarch/strspn.S
index 7fe6f97f41..dbdf1af482 100644
--- a/sysdeps/i386/i686/multiarch/strspn.S
+++ b/sysdeps/i386/i686/multiarch/strspn.S
@@ -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 @@ ENTRY(strspn)
 	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