Expand PIC default to macho64 and respect CONFIG_PIC from libvpx

Change-Id: Ic8c07cc02c80953920f5f86b426a55114ea2cc44

diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx
index 728c0ebd8d76601e8afae813e4f5702d0680cff2..eb5211583037bf735d443e83d1e9e9ce12722d94 100644 (file)
--- a/third_party/x86inc/README.libvpx
+++ b/third_party/x86inc/README.libvpx
@@ -12,3 +12,4 @@ Get configuration from vpx_config.asm.
 Prefix functions with vpx by default.
 Manage name mangling (prefixing with '_') manually because 'PREFIX' does not
   exist in libvpx.
+Expand PIC default to macho64 and respect CONFIG_PIC from libvpx

diff --git a/third_party/x86inc/x86inc.asm.new b/third_party/x86inc/x86inc.asm.new
index b4c30ca7daeb81cdf037d9874e269974fd12bae6..0c7e5b4ceb3ad52dbc9cc54c6a90c261a1b89a2e 100644 (file)
--- a/third_party/x86inc/x86inc.asm.new
+++ b/third_party/x86inc/x86inc.asm.new
@@ -88,11 +88,15 @@
 
 %if WIN64
     %define PIC
+%elifidn __OUTPUT_FORMAT__,macho64
+    %define PIC
 %elif ARCH_X86_64 == 0
 ; x86_32 doesn't require PIC.
 ; Some distros prefer shared objects to be PIC, but nothing breaks if
 ; the code contains a few textrels, so we'll skip that complexity.
     %undef PIC
+%elif CONFIG_PIC
+    %define PIC
 %endif
 %ifdef PIC
     default rel