GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.12.90-6-225-ga6be5cf

schwab@sourceware.org schwab@sourceware.org
Tue Dec 14 17:13:00 GMT 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, fedora/master has been updated
       via  a6be5cf5459eeb8359e5fa192e9dc397c02102bf (commit)
       via  0697e3af07496a6ce8f25cb22d8d1267fb7c6bba (commit)
      from  a4b3e923e8ed391580c9c591d181454099fbd2f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a6be5cf5459eeb8359e5fa192e9dc397c02102bf

commit a6be5cf5459eeb8359e5fa192e9dc397c02102bf
Author: Andreas Schwab <schwab@redhat.com>
Date:   Tue Dec 14 17:19:13 2010 +0100

    2.12.90-21

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 532d721..9968f38 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -20,7 +20,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 20
+Release: 21
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1030,6 +1030,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Dec 14 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-21
+- Revert bogus change
+
 * Mon Dec 13 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-20
 - Update from master
   - Declare wcpcpy and wcpncpy only under _GNU_SOURCE

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0697e3af07496a6ce8f25cb22d8d1267fb7c6bba

commit 0697e3af07496a6ce8f25cb22d8d1267fb7c6bba
Author: Andreas Schwab <schwab@redhat.com>
Date:   Tue Dec 14 17:15:39 2010 +0100

    Revert bogus change

diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
index 8724594..7136d47 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

-----------------------------------------------------------------------

Summary of changes:
 fedora/glibc.spec.in                 |    5 ++-
 sysdeps/i386/i686/multiarch/strcmp.S |   55 ++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list