From e0ab36470161b84e3cadf4be6ba31fbbb352f79b Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 28 Jul 2015 14:43:45 -0700 Subject: Set 'private_extern' visibility for macho targets Don't set it when building with 'nasm' Change-Id: I01c211090f6870e0d34011f867471249a5f54bb0 --- third_party/x86inc/README.libvpx | 1 + third_party/x86inc/x86inc.asm.new | 12 ++++++++++++ 2 files changed, 13 insertions(+) (limited to 'third_party') diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx index 13d86adea..fdbbad49b 100644 --- a/third_party/x86inc/README.libvpx +++ b/third_party/x86inc/README.libvpx @@ -15,3 +15,4 @@ Manage name mangling (prefixing with '_') manually because 'PREFIX' does not Expand PIC default to macho64 and respect CONFIG_PIC from libvpx Catch all elf formats for 'hidden' status and SECTION notes. Avoid 'amdnop' when building with nasm. +Set 'private_extern' visibility for macho targets. diff --git a/third_party/x86inc/x86inc.asm.new b/third_party/x86inc/x86inc.asm.new index c516a7877..24a03ad93 100644 --- a/third_party/x86inc/x86inc.asm.new +++ b/third_party/x86inc/x86inc.asm.new @@ -691,6 +691,18 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, global %2:function %%VISIBILITY %elifidn __OUTPUT_FORMAT__,elf64 global %2:function %%VISIBILITY + %elifidn __OUTPUT_FORMAT__,macho32 + %ifdef __NASM_VER__ + global %2 + %else + global %2:private_extern + %endif + %elifidn __OUTPUT_FORMAT__,macho64 + %ifdef __NASM_VER__ + global %2 + %else + global %2:private_extern + %endif %else global %2 %endif -- cgit v1.2.1