From: Johann <johannkoenig@google.com>
Date: Thu, 2 Apr 2020 01:14:38 +0000 (+0900)
Subject: x86inc.asm: set PREFIX from libvpx defines
X-Git-Tag: v1.9.0-rc1~43^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66095ce5951cc382e064dc724f9019c0220e652f;p=libvpx

x86inc.asm: set PREFIX from libvpx defines

Reapply 4de9641f1

BUG=webm:1679

Change-Id: I70b2224121f8f997fcd04c38a07a8126c2855ec6
---

diff --git a/third_party/x86inc/README.libvpx_new b/third_party/x86inc/README.libvpx_new
index 6bb81656b..f0738ad88 100644
--- a/third_party/x86inc/README.libvpx_new
+++ b/third_party/x86inc/README.libvpx_new
@@ -10,3 +10,5 @@ defines that help automatically allow assembly to work cross-platform.
 Local Modifications:
 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.
diff --git a/third_party/x86inc/x86inc.asm_new b/third_party/x86inc/x86inc.asm_new
index 7b10249f4..8a3845c90 100644
--- a/third_party/x86inc/x86inc.asm_new
+++ b/third_party/x86inc/x86inc.asm_new
@@ -82,6 +82,15 @@
     %define FORMAT_MACHO 1
 %endif
 
+; Set PREFIX for libvpx builds.
+%if FORMAT_ELF
+    %undef PREFIX
+%elif WIN64
+    %undef PREFIX
+%else
+    %define PREFIX
+%endif
+
 %ifdef PREFIX
     %define mangle(x) _ %+ x
 %else