am 9bc988da: Merge "Fix assembly code for clang"
* commit '9bc988dadc2fb0a129e085882a09e8a370cba680':
Fix assembly code for clang
diff --git a/src/opts/SkBlitRow_opts_arm_neon.cpp b/src/opts/SkBlitRow_opts_arm_neon.cpp
index 01a6a2a..b2549f8 100644
--- a/src/opts/SkBlitRow_opts_arm_neon.cpp
+++ b/src/opts/SkBlitRow_opts_arm_neon.cpp
@@ -299,7 +299,7 @@
"11: \n\t"
// unzips achieve the same as a vld4 operation
- "vuzpq.u16 q0, q1 \n\t"
+ "vuzp.u16 q0, q1 \n\t"
"vuzp.u8 d0, d1 \n\t"
"vuzp.u8 d2, d3 \n\t"
// expand 0565 q12 to 8888 {d4-d7}
diff --git a/src/opts/memset16_neon.S b/src/opts/memset16_neon.S
index b1719fa..4546344 100644
--- a/src/opts/memset16_neon.S
+++ b/src/opts/memset16_neon.S
@@ -15,11 +15,11 @@
***************************************************************************/
+ .syntax unified
.code 32
.fpu neon
.align 4
.globl memset16_neon
- .func
memset16_neon:
cmp r2, #0
@@ -70,7 +70,7 @@
strcs r1, [r0], #4
strcs r1, [r0], #4
lsls r12, r12, #2
- strcsh r1, [r0], #2
+ strhcs r1, [r0], #2
memset_route:
/*
* Decide where to route for the maximum copy sizes. Note that we
@@ -139,5 +139,4 @@
pop {r0}
bx lr
- .endfunc
.end
diff --git a/src/opts/memset32_neon.S b/src/opts/memset32_neon.S
index a9eaa0e..723ab13 100644
--- a/src/opts/memset32_neon.S
+++ b/src/opts/memset32_neon.S
@@ -5,11 +5,11 @@
* found in the LICENSE file.
***************************************************************************/
+ .syntax unified
.code 32
.fpu neon
.align 4
.globl memset32_neon
- .func
/* r0 = buffer, r1 = value, r2 = times to write */
memset32_neon:
@@ -109,5 +109,4 @@
str r1, [r0, #0]
bx lr
- .endfunc
.end
