diff options
| author |  thakis <thakis@chromium.org> | 2014-08-11 15:27:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-11 15:27:24 -0700 |
| commit | ea13afff6e46d8a969611cdd56c996bfb05a27c1 (patch) | |
| tree | b5e65a34d1be27b5780e45ec946f47a7359a70ad /src/opts | |
| parent | 3b73e0163c03a2cb1ee9efa9fddb931751415026 (diff) | |
Let skia build with clang's integrated assembler.
1. vuzpq is a gcc instruction. Replace it with the equivalent vuzp
(see http://llvm.org/PR20423)
2. .func / .endfunc only have an effect with -gstabs, which we don't
use. As it's unused and clang doesn't support it, remove
.func / .endfunc (also see http://llvm.org/20424)
BUG=chromium:124610
R=mtklein@google.com
Author: thakis@chromium.org
Review URL: https://codereview.chromium.org/461693004
Diffstat (limited to 'src/opts')
| -rw-r--r-- | src/opts/SkBlitRow_opts_arm_neon.cpp | 2 | ||||
| -rw-r--r-- | src/opts/memset16_neon.S | 2 | ||||
| -rw-r--r-- | src/opts/memset32_neon.S | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/opts/SkBlitRow_opts_arm_neon.cpp b/src/opts/SkBlitRow_opts_arm_neon.cpp index 94ab77ca1d..4b7e3beeaa 100644 --- a/src/opts/SkBlitRow_opts_arm_neon.cpp +++ b/src/opts/SkBlitRow_opts_arm_neon.cpp @@ -299,7 +299,7 @@ void S32A_D565_Opaque_neon(uint16_t* SK_RESTRICT dst, "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 7473a40061..7b2b19029a 100644 --- a/src/opts/memset16_neon.S +++ b/src/opts/memset16_neon.S @@ -21,7 +21,6 @@ .fpu neon .align 4 .globl memset16_neon - .func memset16_neon: cmp r2, #0 @@ -141,5 +140,4 @@ memset_end: pop {r0} bx lr - .endfunc .end diff --git a/src/opts/memset32_neon.S b/src/opts/memset32_neon.S index a9eaa0e830..fa034764e0 100644 --- a/src/opts/memset32_neon.S +++ b/src/opts/memset32_neon.S @@ -9,7 +9,6 @@ .fpu neon .align 4 .globl memset32_neon - .func /* r0 = buffer, r1 = value, r2 = times to write */ memset32_neon: @@ -109,5 +108,4 @@ memset32_dropthru: str r1, [r0, #0] bx lr - .endfunc .end |