commit 76ef331cd6967ca8f5af779d25c8b634f8cdd2b6
author Mathias Agopian <mathias@google.com> Mon Oct 19 17:09:31 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 19 17:09:31 2009 -0700
tree 414e9070eff101d9ec08ad235f68c05e9d225f94
parent eeaf6544b676f68ccdd70a3fa78f44789a1bf69c
parent 7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c

am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling

Merge commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c' into eclair-mr2

* commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c':
  use local symbols in memset so it doesn't screw up profiling

libc/arch-arm/bionic/memset.S

diff --git a/libc/arch-arm/bionic/memset.S b/libc/arch-arm/bionic/memset.S
index d52d622..93abe15 100644
--- a/libc/arch-arm/bionic/memset.S
+++ b/libc/arch-arm/bionic/memset.S
@@ -80,7 +80,7 @@
         
 		rsb         r3, r0, #0
 		ands		r3, r3, #0x1C
-		beq         aligned32
+		beq         3f
 		cmp         r3, r2
 		andhi		r3, r2, #0x1C
 		sub         r2, r2, r3
@@ -93,7 +93,7 @@
 		movs		r3, r3, lsl #2
         strcs       r1, [r0], #4
 
-aligned32:
+3:
         subs        r2, r2, #32
         mov         r3, r1
         bmi         2f