diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-09 06:37:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-09 06:37:45 -0800 |
| commit | 2fe000dfd673859eb3b1e1c9739de66445d9fe08 (patch) | |
| tree | 8ca9544bbd9d8a873a0b418d14f87015f9e00369 | |
| parent | d6d1c4c87c3f2e60d9aab570aefc3e63d0467f33 (diff) | |
| download | glibc-2fe000dfd673859eb3b1e1c9739de66445d9fe08.tar.gz glibc-2fe000dfd673859eb3b1e1c9739de66445d9fe08.tar.xz glibc-2fe000dfd673859eb3b1e1c9739de66445d9fe08.zip | |
sparc32: Fix non-v9 build failure in memcpy.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc32/memcpy.S | 23 |
2 files changed, 22 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 2963971d48..afb549b93f 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 c9c7c40e81..748a0862fe 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 |