diff options
| -rw-r--r-- | third_party/x86inc/README.libvpx | 1 | ||||
| -rw-r--r-- | third_party/x86inc/x86inc.asm | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx index c4fb5682a..d7d5bf28d 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 b/third_party/x86inc/x86inc.asm index 39218958a..229446f79 100644 --- a/third_party/x86inc/x86inc.asm +++ b/third_party/x86inc/x86inc.asm @@ -96,11 +96,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 |