From: Johann <johannkoenig@google.com>
Date: Thu, 18 Feb 2016 01:55:18 +0000 (-0800)
Subject: Use libvpx defines to set name mangling rules
X-Git-Tag: v1.6.0~338^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4de9641f1aca8f64977c2b1616c81c8ef0c5c511;p=libvpx

Use libvpx defines to set name mangling rules

Change-Id: Ie5dbfe73bdb6132047f9ab7d5716714d50befea5
---

diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx
index 5e9bf9433..c4fb5682a 100644
--- a/third_party/x86inc/README.libvpx
+++ b/third_party/x86inc/README.libvpx
@@ -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 b/third_party/x86inc/x86inc.asm
index 94d85929a..39218958a 100644
--- a/third_party/x86inc/x86inc.asm
+++ b/third_party/x86inc/x86inc.asm
@@ -75,6 +75,15 @@
     %define FORMAT_ELF 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