diff options
| author | Carlos O'Donell <carlos_odonell@mentor.com> | 2012-05-16 20:14:24 -0700 |
|---|---|---|
| committer | Carlos O'Donell <carlos_odonell@mentor.com> | 2012-05-17 06:59:28 -0700 |
| commit | 1a0994f5356214e8af8a1c1cc33fbf74a7ac8993 (patch) | |
| tree | 99ce1f919a2509868a71f4262f055b5eec9accb0 /sysdeps/x86_64/multiarch/strcmp.S | |
| parent | 0af797def371ceb4f05586d7bcd25841653d2082 (diff) | |
| download | glibc-1a0994f5356214e8af8a1c1cc33fbf74a7ac8993.tar glibc-1a0994f5356214e8af8a1c1cc33fbf74a7ac8993.tar.gz glibc-1a0994f5356214e8af8a1c1cc33fbf74a7ac8993.tar.bz2 glibc-1a0994f5356214e8af8a1c1cc33fbf74a7ac8993.zip | |
BZ#14059: Fix AVX and FMA4 detection.
Fix AVX and FMA4 detection by following the guidelines
set out by Intel and AMD for detecting these features.
Diffstat (limited to 'sysdeps/x86_64/multiarch/strcmp.S')
| -rw-r--r-- | sysdeps/x86_64/multiarch/strcmp.S | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S index 2b9870ba93..d366d09690 100644 --- a/sysdeps/x86_64/multiarch/strcmp.S +++ b/sysdeps/x86_64/multiarch/strcmp.S @@ -1,5 +1,5 @@ /* strcmp with SSE4.2 - Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2009-2012 Free Software Foundation, Inc. Contributed by Intel Corporation. This file is part of the GNU C Library. @@ -83,6 +83,7 @@ .text ENTRY(STRCMP) .type STRCMP, @gnu_indirect_function + /* Manually inlined call to __get_cpu_features. */ cmpl $0, __cpu_features+KIND_OFFSET(%rip) jne 1f call __init_cpu_features @@ -100,13 +101,14 @@ END(STRCMP) # ifdef USE_AS_STRCASECMP_L ENTRY(__strcasecmp) .type __strcasecmp, @gnu_indirect_function + /* Manually inlined call to __get_cpu_features. */ cmpl $0, __cpu_features+KIND_OFFSET(%rip) jne 1f call __init_cpu_features 1: # ifdef HAVE_AVX_SUPPORT leaq __strcasecmp_avx(%rip), %rax - testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) + testl $bit_AVX_Usable, __cpu_features+FEATURE_OFFSET+index_AVX_Usable(%rip) jnz 2f # endif leaq __strcasecmp_sse42(%rip), %rax @@ -123,13 +125,14 @@ weak_alias (__strcasecmp, strcasecmp) # ifdef USE_AS_STRNCASECMP_L ENTRY(__strncasecmp) .type __strncasecmp, @gnu_indirect_function + /* Manually inlined call to __get_cpu_features. */ cmpl $0, __cpu_features+KIND_OFFSET(%rip) jne 1f call __init_cpu_features 1: # ifdef HAVE_AVX_SUPPORT leaq __strncasecmp_avx(%rip), %rax - testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) + testl $bit_AVX_Usable, __cpu_features+FEATURE_OFFSET+index_AVX_Usable(%rip) jnz 2f # endif leaq __strncasecmp_sse42(%rip), %rax |