diff options
| author | Nick Bray <ncbray@google.com> | 2019-02-20 17:57:19 -0800 |
|---|---|---|
| committer | Nick Bray <ncbray@google.com> | 2019-02-22 11:20:30 -0800 |
| commit | d877e216f2eb26ba5cb54966b61cf20d89004356 (patch) | |
| tree | 20c29f93926249dc6c2c778545991675f94f353d /lib | |
| parent | 519cc8c27fbb1f14288effb0dc0f8d7ebd8e732b (diff) | |
| download | common-d877e216f2eb26ba5cb54966b61cf20d89004356.tar.gz | |
Use unified syntax for problematic asm files.
Clang's integrated assembler does not like the old syntax.
Bug: 125023379
Change-Id: I74f0080355588530dd8c4ae08ff60f760ffb7c94
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/string/arch/arm/arm/memcpy.S | 14 | ||||
| -rw-r--r-- | lib/libc/string/arch/arm/arm/memset.S | 6 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lib/libc/string/arch/arm/arm/memcpy.S b/lib/libc/string/arch/arm/arm/memcpy.S index 7cc57b8a..bac5f94b 100644 --- a/lib/libc/string/arch/arm/arm/memcpy.S +++ b/lib/libc/string/arch/arm/arm/memcpy.S @@ -22,6 +22,8 @@ */ #include <asm.h> +.syntax unified + .text .align 2 @@ -138,16 +140,16 @@ FUNCTION(memcpy) msr CPSR_f, r12 // move into NZCV fields in CPSR // move as many bytes as necessary to get the dst aligned - ldrvsb r3, [r1], #1 // V set - ldrcsh r4, [r1], #2 // C set + ldrbvs r3, [r1], #1 // V set + ldrhcs r4, [r1], #2 // C set ldreq r5, [r1], #4 // Z set - strvsb r3, [r0], #1 - strcsh r4, [r0], #2 + strbvs r3, [r0], #1 + strhcs r4, [r0], #2 streq r5, [r0], #4 - ldmmiia r1!, {r3-r4} // N set - stmmiia r0!, {r3-r4} + ldmiami r1!, {r3-r4} // N set + stmiami r0!, {r3-r4} // fix the remaining len sub r2, r2, r12, lsr #28 diff --git a/lib/libc/string/arch/arm/arm/memset.S b/lib/libc/string/arch/arm/arm/memset.S index 7070ed6e..378d96d4 100644 --- a/lib/libc/string/arch/arm/arm/memset.S +++ b/lib/libc/string/arch/arm/arm/memset.S @@ -22,6 +22,8 @@ */ #include <asm.h> +.syntax unified + .text .align 2 @@ -98,8 +100,8 @@ FUNCTION(memset) msr CPSR_f, r3 // move into NZCV fields in CPSR // move as many bytes as necessary to get the dst aligned - strvsb r1, [r0], #1 // V set - strcsh r1, [r0], #2 // C set + strbvs r1, [r0], #1 // V set + strhcs r1, [r0], #2 // C set streq r1, [r0], #4 // Z set strmi r1, [r0], #4 // N set strmi r1, [r0], #4 // N set |