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

diff --git a/src/opts/SkBlitRow_opts_SSE4.h b/src/opts/SkBlitRow_opts_SSE4.h
index b6ab140..6c6276e 100644 (file)
--- 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 8822125..417e517 100644 (file)
--- 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 41ba1ec..41a147e 100644 (file)
--- 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