diff options
| author | Ulrich Drepper <gmail@redhat.com> | 2010-12-03 09:50:35 -0500 |
|---|---|---|
| committer | Ulrich Drepper <gmail@redhat.com> | 2010-12-03 09:50:35 -0500 |
| commit | a5b913e299027a799ae5435d66e3f20e95859654 (patch) | |
| tree | 1986d40edb80f36d1c5f3c52536b5c4585f4c2f1 | |
| parent | c038d98d63ccf0da892f2147c6d92a7d2badd87d (diff) | |
| parent | 3a4a2499ec9c87d05a0d7d1522dad3df73c6c9dd (diff) | |
| download | glibc-a5b913e299027a799ae5435d66e3f20e95859654.tar.gz glibc-a5b913e299027a799ae5435d66e3f20e95859654.tar.xz glibc-a5b913e299027a799ae5435d66e3f20e95859654.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sysdeps/i386/fpu/libm-test-ulps | 4 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/strcmp-ssse3.S | 9 |
3 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 740f648508..0fa7a55bf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,15 @@ * po/it.po: Update from translation team. +2010-12-01 H.J. Lu <hongjiu.lu@intel.com> + + * sysdeps/i386/i686/multiarch/strcmp-ssse3.S (STRCMP): Remove + unused codes. + +2010-11-30 Ulrich Drepper <drepper@gmail.com> + + * sysdeps/i386/fpu/libm-test-ulps: Relax ynf(10,0.75) test expectations. + 2010-11-24 Andreas Schwab <schwab@redhat.com> * resolv/nss_dns/dns-host.c (getanswer_r): Don't handle ttl == 0 diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps index 5231789be1..4b1a9e7349 100644 --- a/sysdeps/i386/fpu/libm-test-ulps +++ b/sysdeps/i386/fpu/libm-test-ulps @@ -857,8 +857,8 @@ ifloat: 1 ildouble: 2 ldouble: 2 Test "yn (10, 0.75) == -2133501638.90573424452445412893839236": -float: 1 -ifloat: 1 +float: 2 +ifloat: 2 ildouble: 4 ldouble: 4 Test "yn (10, 1.0) == -121618014.278689189288130426667971145": diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S index a4de2259d2..607b69b6ff 100644 --- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S +++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S @@ -70,9 +70,7 @@ ENTRY (STRCMP) movl CNT(%esp), %ebp cmp $16, %ebp jb L(less16bytes_sncmp) - jmp L(more16bytes) -#endif - +#else movzbl (%eax), %ecx cmpb %cl, (%edx) jne L(neq) @@ -123,11 +121,6 @@ ENTRY (STRCMP) add $8, %edx add $8, %eax -#ifdef USE_AS_STRNCMP - cmp $8, %ebp - lea -8(%ebp), %ebp - je L(eq) -L(more16bytes): #endif movl %edx, %ecx and $0xfff, %ecx |