Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts: ChangeLog
git-mirror · Dec 3, 2010 · a5b913e · a5b913e
2 parents c038d98 + 3a4a249
commit a5b913e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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