Fix ifunc thunk for strspn on x86 in static libc

diff --git a/ChangeLog b/ChangeLog
index c59375123d74ea15cba99c43d0c3a7247db7c0e0..d2d7b4a56d5cf1404fc6a189b3b74b0b149a0ab2 100644 (file)
--- 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 7fe6f97f41991ee42f42915c662f48bbee5c5ccc..dbdf1af48229b09f05e68d7c6a759ce455d32828 100644 (file)
--- 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