diff options
| author |  henrik.smiding <henrik.smiding@intel.com> | 2014-07-01 06:12:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-01 06:12:48 -0700 |
| commit | 4a2489f7bbaccfe588597193561526d579004653 (patch) | |
| tree | 4ce64fa5b91586db059d8c7e722fca0af649a4cd | |
| parent | 12ffdb31c9a01b255768a9a522c7af90a345c952 (diff) | |
Hide symbols in S32A_Opaque_BlitRow32_SSE4
Marks the symbols in the S32A_Opaque_BlitRow32_SSE4 files as hidden,
so Chromium can build.
Also enables the optimizations.
Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
R=mtklein@google.com, joakim.landberg@intel.com
Author: henrik.smiding@intel.com
Review URL: https://codereview.chromium.org/368573002
| -rw-r--r-- | src/opts/SkBlitRow_opts_SSE4.h | 4 | ||||
| -rw-r--r-- | src/opts/SkBlitRow_opts_SSE4_asm.S | 4 | ||||
| -rw-r--r-- | src/opts/SkBlitRow_opts_SSE4_x64_asm.S | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/opts/SkBlitRow_opts_SSE4.h b/src/opts/SkBlitRow_opts_SSE4.h index b6ab140e0a..6c6276eae0 100644 --- a/src/opts/SkBlitRow_opts_SSE4.h +++ b/src/opts/SkBlitRow_opts_SSE4.h @@ -18,9 +18,7 @@ extern "C" void S32A_Opaque_BlitRow32_SSE4_asm(SkPMColor* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, U8CPU alpha); -// Temporarily disabled. Chrome canary bot fails to link chrome with error: -// lib/libskia.so: error: undefined reference to 'S32A_Opaque_BlitRow32_SSE4_asm' -//#define SK_ATT_ASM_SUPPORTED +#define SK_ATT_ASM_SUPPORTED #endif #endif diff --git a/src/opts/SkBlitRow_opts_SSE4_asm.S b/src/opts/SkBlitRow_opts_SSE4_asm.S index 8822125f12..417e517f92 100644 --- a/src/opts/SkBlitRow_opts_SSE4_asm.S +++ b/src/opts/SkBlitRow_opts_SSE4_asm.S @@ -60,11 +60,13 @@ .type S32A_Opaque_BlitRow32_SSE4_asm, @function #endif .p2align 4 -#if defined(__clang__) && defined(SK_BUILD_FOR_MAC) +#if defined(SK_BUILD_FOR_MAC) .global _S32A_Opaque_BlitRow32_SSE4_asm + .private_extern _S32A_Opaque_BlitRow32_SSE4_asm _S32A_Opaque_BlitRow32_SSE4_asm: #else .global S32A_Opaque_BlitRow32_SSE4_asm + .hidden S32A_Opaque_BlitRow32_SSE4_asm S32A_Opaque_BlitRow32_SSE4_asm: #endif .cfi_startproc diff --git a/src/opts/SkBlitRow_opts_SSE4_x64_asm.S b/src/opts/SkBlitRow_opts_SSE4_x64_asm.S index 41ba1ec3bf..41a147e9a3 100644 --- a/src/opts/SkBlitRow_opts_SSE4_x64_asm.S +++ b/src/opts/SkBlitRow_opts_SSE4_x64_asm.S @@ -48,11 +48,13 @@ .type S32A_Opaque_BlitRow32_SSE4_asm, @function #endif .p2align 4 -#if defined(__clang__) && defined(SK_BUILD_FOR_MAC) +#if defined(SK_BUILD_FOR_MAC) .global _S32A_Opaque_BlitRow32_SSE4_asm + .private_extern _S32A_Opaque_BlitRow32_SSE4_asm _S32A_Opaque_BlitRow32_SSE4_asm: #else .global S32A_Opaque_BlitRow32_SSE4_asm + .hidden S32A_Opaque_BlitRow32_SSE4_asm S32A_Opaque_BlitRow32_SSE4_asm: #endif .cfi_startproc |