Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / sysdeps / x86_64 / multiarch / strcspn.S

diff --git a/sysdeps/x86_64/multiarch/strcspn.S b/sysdeps/x86_64/multiarch/strcspn.S
index 00e46173ae607221e424476d2616139f91662ea5..8e7ff1c6630b30afeca6c8aae9d6596f414349f4 100644 (file)
--- a/sysdeps/x86_64/multiarch/strcspn.S
+++ b/sysdeps/x86_64/multiarch/strcspn.S
@@ -1,6 +1,6 @@
 /* Multiple versions of strcspn
    All versions must be listed in ifunc-impl-list.c.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -19,9 +19,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
-
-#ifdef HAVE_SSE4_SUPPORT
-
 #include <sysdep.h>
 #include <init-arch.h>
 
@@ -45,11 +42,9 @@
        .text
 ENTRY(STRCSPN)
        .type   STRCSPN, @gnu_indirect_function
-       cmpl    $0, __cpu_features+KIND_OFFSET(%rip)
-       jne     1f
-       call    __init_cpu_features
-1:     leaq    STRCSPN_SSE2(%rip), %rax
-       testl   $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+       LOAD_RTLD_GLOBAL_RO_RDX
+       leaq    STRCSPN_SSE2(%rip), %rax
+       HAS_CPU_FEATURE (SSE4_2)
        jz      2f
        leaq    STRCSPN_SSE42(%rip), %rax
 2:     ret
@@ -65,16 +60,8 @@ END(STRCSPN)
 # undef END
 # define END(name) \
        cfi_endproc; .size STRCSPN_SSE2, .-STRCSPN_SSE2
-# undef libc_hidden_builtin_def
-/* It doesn't make sense to send libc-internal strcspn calls through a PLT.
-   The speedup we get from using SSE4.2 instruction is likely eaten away
-   by the indirect call in the PLT.  */
-# define libc_hidden_builtin_def(name) \
-       .globl __GI_STRCSPN; __GI_STRCSPN = STRCSPN_SSE2
 #endif
 
-#endif /* HAVE_SSE4_SUPPORT */
-
 #ifdef USE_AS_STRPBRK
 #include "../strpbrk.S"
 #else