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 5e9bf94333230dc6b0fa5d522e55d5557ba1dd21..c4fb5682acb286aadd730e9eee0fd3332407944c 100644 (file)
--- 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 94d85929a1e8e7f9002eb55958ea0fd012e4cf79..39218958a537de664bfc9d94aca839eea10c5537 100644 (file)
--- 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