diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-19 17:09:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-19 17:09:51 -0700 |
| commit | 214dec2811ef893984ce5bceceb28a47d701fa9f (patch) | |
| tree | e1e3da3c55ee13cafd9536c5ada67dc4145ece9f /libc/arch-arm | |
| parent | cd230988286eb6aa395e051345052773f1943294 (diff) | |
| parent | 7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c (diff) | |
| download | bionic-214dec2811ef893984ce5bceceb28a47d701fa9f.zip bionic-214dec2811ef893984ce5bceceb28a47d701fa9f.tar.gz bionic-214dec2811ef893984ce5bceceb28a47d701fa9f.tar.bz2 | |
am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling
Merge commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c' into eclair-plus-aosp
* commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c':
use local symbols in memset so it doesn't screw up profiling
Diffstat (limited to 'libc/arch-arm')
| -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 |