From: James Zern <jzern@google.com>
Date: Thu, 18 Feb 2016 02:32:57 +0000 (-0800)
Subject: x86inc.asm: only set visibility for chromium builds
X-Git-Tag: v1.6.0~338^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4b47b89f;p=libvpx

x86inc.asm: only set visibility for chromium builds

this restores the previous version's behavior avoiding issues with
builds that may split sources on directory boundaries; protected
visibility may work in this case.

Change-Id: Ie759bd96c9ea5b45613f450dffa6e67eb45f5a8b
---

diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx
index d0f57163f..8d3cd966d 100644
--- a/third_party/x86inc/README.libvpx
+++ b/third_party/x86inc/README.libvpx
@@ -17,3 +17,4 @@ Set 'private_extern' visibility for macho targets.
 Copy PIC 'GLOBAL' macros from x86_abi_support.asm
 Use .text instead of .rodata on macho to avoid broken tables in PIC mode.
 Use .text with no alignment for aout
+Only use 'hidden' visibility with Chromium
diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm
index 0694d21af..fc65bd3c8 100644
--- a/third_party/x86inc/x86inc.asm
+++ b/third_party/x86inc/x86inc.asm
@@ -786,7 +786,14 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
     annotate_function_size
     %if %1
         %xdefine %%FUNCTION_PREFIX private_prefix
-        %xdefine %%VISIBILITY hidden
+        ; libvpx explicitly sets visibility in shared object builds. Avoid
+        ; setting visibility to hidden as it may break builds that split
+        ; sources on e.g., directory boundaries.
+        %ifdef CHROMIUM
+            %xdefine %%VISIBILITY hidden
+        %else
+            %xdefine %%VISIBILITY
+        %endif
     %else
         %xdefine %%FUNCTION_PREFIX public_prefix
         %xdefine %%VISIBILITY