From 89ba55ed1cffee20b011a3164a73088f6e5ac223 Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 28 Jul 2015 14:37:05 -0700 Subject: [PATCH] Expand PIC default to macho64 and respect CONFIG_PIC from libvpx Change-Id: Ic8c07cc02c80953920f5f86b426a55114ea2cc44 --- third_party/x86inc/README.libvpx | 1 + third_party/x86inc/x86inc.asm.new | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx index 728c0ebd8..eb5211583 100644 --- 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 b4c30ca7d..0c7e5b4ce 100644 --- 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