This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] sparc32: Fix non-v9 build failure in memcpy.
- From: David Miller <davem at davemloft dot net>
- To: libc-alpha at sourceware dot org
- Date: Tue, 09 Mar 2010 06:38:14 -0800 (PST)
- Subject: [PATCH] sparc32: Fix non-v9 build failure in memcpy.
This fixes a sparc32 non-v9 build failure I inadvertently
introduced to mainline the other week.
Committed.
sparc32: Fix non-v9 build failure in memcpy.
---
ChangeLog | 2 ++
sysdeps/sparc/sparc32/memcpy.S | 25 +++++++++++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
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
--
1.6.6.1