diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-19 17:19:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-19 17:19:37 -0700 |
| commit | 581f43056b594429b3df4678d87989c93d8f81d2 (patch) | |
| tree | 785bf3a7c78b3b4d1474505abf2eaab5961c533f /libc | |
| parent | b3cfdb6220b9ce8ec6d25984ef086fa06f157236 (diff) | |
| parent | 76ef331cd6967ca8f5af779d25c8b634f8cdd2b6 (diff) | |
| download | bionic-581f43056b594429b3df4678d87989c93d8f81d2.zip bionic-581f43056b594429b3df4678d87989c93d8f81d2.tar.gz bionic-581f43056b594429b3df4678d87989c93d8f81d2.tar.bz2 | |
am 76ef331c: am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling
Merge commit '76ef331cd6967ca8f5af779d25c8b634f8cdd2b6' into eclair-mr2-plus-aosp
* commit '76ef331cd6967ca8f5af779d25c8b634f8cdd2b6':
use local symbols in memset so it doesn't screw up profiling
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/arch-arm/bionic/memset.S | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ memset: 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 @@ memset: movs r3, r3, lsl #2 strcs r1, [r0], #4 -aligned32: +3: subs r2, r2, #32 mov r3, r1 bmi 2f |