This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.11-254-g2fe000d


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, master has been updated
       via  2fe000dfd673859eb3b1e1c9739de66445d9fe08 (commit)
      from  d6d1c4c87c3f2e60d9aab570aefc3e63d0467f33 (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=2fe000dfd673859eb3b1e1c9739de66445d9fe08

commit 2fe000dfd673859eb3b1e1c9739de66445d9fe08
Author: David S. Miller <davem@davemloft.net>
Date:   Tue Mar 9 06:37:45 2010 -0800

    sparc32: Fix non-v9 build failure in memcpy.

diff --git a/ChangeLog b/ChangeLog
index 2963971..afb549b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	of R_SPARC_TLS_LE_* needs to use 32-bit loads and stores, not
 	64-bit ones.
 
+	* sysdeps/sparc/sparc32/memcpy.S: Fix build.
+
 2010-03-07  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
diff --git a/sysdeps/sparc/sparc32/memcpy.S b/sysdeps/sparc/sparc32/memcpy.S
index c9c7c40..748a086 100644
--- a/sysdeps/sparc/sparc32/memcpy.S
+++ b/sysdeps/sparc/sparc32/memcpy.S
@@ -117,10 +117,27 @@ ENTRY(memcpy)		/* %o0=dst %o1=src %o2=len */
 	bleu		90f
 	 andcc		%o1, 3, %g0
 
-	bne		78b
-3:	 andcc		%o1, 4, %g0
+	be		78f
+	 andcc		%o1, 4, %g0
 
-	be		2f
+	andcc		%o1, 1, %g0
+	be		4f
+	 andcc		%o1, 2, %g0
+
+	ldub		[%o1], %g2
+	add		%o1, 1, %o1
+	stb		%g2, [%o0]
+	sub		%o2, 1, %o2
+	bne		77f
+	 add		%o0, 1, %o0
+4:	lduh		[%o1], %g2
+	add		%o1, 2, %o1
+	sth		%g2, [%o0]
+	sub		%o2, 2, %o2
+	add		%o0, 2, %o0
+
+77:	andcc		%o1, 4, %g0
+78:	be		2f
 	 mov		%o2, %g1
 
 	ld		[%o1], %o4

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

Summary of changes:
 ChangeLog                      |    2 ++
 sysdeps/sparc/sparc32/memcpy.S |   25 +++++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]