From: Johann <johannkoenig@google.com>
Date: Mon, 6 Apr 2020 07:06:45 +0000 (+0900)
Subject: x86_abi_support: do not decorate coff functions
X-Git-Tag: v1.9.0-rc1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1717ac939c12e31a358056a36c2fa7a8882e71ed;p=libvpx

x86_abi_support: do not decorate coff functions

:private_extern only applies to macho. Match x86inc.asm logic:
%if FORMAT_ELF
  global %2:function hidden
%elif FORMAT_MACHO
  global %2:private_extern
%else
  global %2
%endif

May fix a build issue on windows:
vp8/encoder/x86/block_error_sse2.asm:18: error:
  COFF format does not support any special symbol types

BUG=webm:1679

Change-Id: I7e1f4043b064a04752d1cedd030cbe7f5461fe40
---

diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm
index e35589065..420aa668d 100644
--- a/vpx_ports/x86_abi_support.asm
+++ b/vpx_ports/x86_abi_support.asm
@@ -132,10 +132,12 @@
     %define PRIVATE :function hidden
   %elifidn __OUTPUT_FORMAT__,elfx32
     %define PRIVATE :function hidden
-  %elif LIBVPX_YASM_WIN64
-    %define PRIVATE
-  %else
+  %elifidn __OUTPUT_FORMAT__,macho32
     %define PRIVATE :private_extern
+  %elifidn __OUTPUT_FORMAT__,macho64
+    %define PRIVATE :private_extern
+  %else
+    %define PRIVATE
   %endif
 %else
   %define PRIVATE