diff options
| author | Elliott Hughes <enh@google.com> | 2015-05-11 22:22:13 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-05-11 22:22:13 -0700 |
| commit | 36284db817e98a94c629470070972eee7142364a (patch) | |
| tree | 124912af59b1414aed51b168cf0b5c39b9da539b /libcutils/arch-arm | |
| parent | 80b129f9f08ce9d8b4e315a4413dda61e5dbdd75 (diff) | |
| download | system_core-36284db817e98a94c629470070972eee7142364a.tar.gz system_core-36284db817e98a94c629470070972eee7142364a.tar.bz2 system_core-36284db817e98a94c629470070972eee7142364a.zip | |
Switch arch-arm/memset32.S to unified syntax.
This fixes the clang build.
Change-Id: I492c7dc016986020de3f70a77e0ace6610f50765
Diffstat (limited to 'libcutils/arch-arm')
| -rw-r--r-- | libcutils/arch-arm/memset32.S | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libcutils/arch-arm/memset32.S b/libcutils/arch-arm/memset32.S index 6efab9f93..1e89636b4 100644 --- a/libcutils/arch-arm/memset32.S +++ b/libcutils/arch-arm/memset32.S @@ -18,6 +18,8 @@ * */ + .syntax unified + .text .align @@ -45,7 +47,7 @@ android_memset16: /* align to 32 bits */ tst r0, #2 - strneh r1, [r0], #2 + strhne r1, [r0], #2 subne r2, r2, #2 .fnend @@ -68,27 +70,27 @@ android_memset32: /* conditionally writes 0 to 7 words (length in r3) */ movs r3, r3, lsl #28 - stmcsia r0!, {r1, lr} - stmcsia r0!, {r1, lr} - stmmiia r0!, {r1, lr} + stmiacs r0!, {r1, lr} + stmiacs r0!, {r1, lr} + stmiami r0!, {r1, lr} movs r3, r3, lsl #2 strcs r1, [r0], #4 .Laligned32: mov r3, r1 1: subs r2, r2, #32 - stmhsia r0!, {r1,r3,r12,lr} - stmhsia r0!, {r1,r3,r12,lr} + stmiahs r0!, {r1,r3,r12,lr} + stmiahs r0!, {r1,r3,r12,lr} bhs 1b add r2, r2, #32 /* conditionally stores 0 to 30 bytes */ movs r2, r2, lsl #28 - stmcsia r0!, {r1,r3,r12,lr} - stmmiia r0!, {r1,lr} + stmiacs r0!, {r1,r3,r12,lr} + stmiami r0!, {r1,lr} movs r2, r2, lsl #2 strcs r1, [r0], #4 - strmih lr, [r0], #2 + strhmi lr, [r0], #2 ldr lr, [sp], #4 .cfi_def_cfa_offset 0 |