aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2010-12-14 13:09:28 -0500
committerUlrich Drepper <drepper@gmail.com>2010-12-14 13:09:28 -0500
commit283007197c526f8f59bdc029a38d76538c70b0ff (patch)
tree972f7e19a266df78df1f1bf4f69d6d6fb7c0c856 /sysdeps/i386
parentdbb0472f054a4241feec09af30db850dd4d18a7b (diff)
downloadglibc-283007197c526f8f59bdc029a38d76538c70b0ff.tar
glibc-283007197c526f8f59bdc029a38d76538c70b0ff.tar.gz
glibc-283007197c526f8f59bdc029a38d76538c70b0ff.tar.bz2
glibc-283007197c526f8f59bdc029a38d76538c70b0ff.zip
Undo accidental checkin.
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/i686/multiarch/strcmp.S55
1 files changed, 30 insertions, 25 deletions
diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
index 8724594881..7136d47e85 100644
--- a/sysdeps/i386/i686/multiarch/strcmp.S
+++ b/sysdeps/i386/i686/multiarch/strcmp.S
@@ -40,32 +40,37 @@
need strncmp before the initialization happened. */
#if (defined SHARED || !defined USE_AS_STRNCMP) && !defined NOT_IN_libc
# ifdef SHARED
- .section .gnu.linkonce.t.__i686.get_pc_thunk.dx,"ax",@progbits
- .globl __i686.get_pc_thunk.dx
- .hidden __i686.get_pc_thunk.dx
- .p2align 2
- .type __i686.get_pc_thunk.dx,@function
-__i686.get_pc_thunk.dx:
- movl (%esp), %edx
+ .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
+ .globl __i686.get_pc_thunk.bx
+ .hidden __i686.get_pc_thunk.bx
+ .p2align 4
+ .type __i686.get_pc_thunk.bx,@function
+__i686.get_pc_thunk.bx:
+ movl (%esp), %ebx
ret
- .size __i686.get_pc_thunk.dx, .-__i686.get_pc_thunk.dx
.text
ENTRY(STRCMP)
.type STRCMP, @gnu_indirect_function
- call __i686.get_pc_thunk.dx
- addl $_GLOBAL_OFFSET_TABLE_, %edx
- cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%edx)
+ pushl %ebx
+ cfi_adjust_cfa_offset (4)
+ cfi_rel_offset (ebx, 0)
+ call __i686.get_pc_thunk.bx
+ addl $_GLOBAL_OFFSET_TABLE_, %ebx
+ cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%ebx)
jne 1f
call __init_cpu_features
-1: leal __STRCMP_SSE4_2@GOTOFF(%edx), %eax
- testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features@GOTOFF(%edx)
- jnz 2f
- leal __STRCMP_SSSE3@GOTOFF(%edx), %eax
- testl $bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features@GOTOFF(%edx)
- jnz 2f
- leal __STRCMP_IA32@GOTOFF(%edx), %ecx
-2: ret
+1: leal __STRCMP_IA32@GOTOFF(%ebx), %eax
+ testl $bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features@GOTOFF(%ebx)
+ jz 2f
+ leal __STRCMP_SSSE3@GOTOFF(%ebx), %eax
+ testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features@GOTOFF(%ebx)
+ jz 2f
+ leal __STRCMP_SSE4_2@GOTOFF(%ebx), %eax
+2: popl %ebx
+ cfi_adjust_cfa_offset (-4)
+ cfi_restore (ebx)
+ ret
END(STRCMP)
# else
.text
@@ -74,13 +79,13 @@ ENTRY(STRCMP)
cmpl $0, KIND_OFFSET+__cpu_features
jne 1f
call __init_cpu_features
-1: leal __STRCMP_SSE4_2, %eax
- testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
- jnz 2f
- leal __STRCMP_SSSE3, %eax
+1: leal __STRCMP_IA32, %eax
testl $bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features
- jnz 2f
- leal __STRCMP_IA32, %eax
+ jz 2f
+ leal __STRCMP_SSSE3, %eax
+ testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
+ jz 2f
+ leal __STRCMP_SSE4_2, %eax
2: ret
END(STRCMP)
# endif