From 25a2434752f36cbc393d368624b437080b2d2052 Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 28 Jul 2015 15:06:50 -0700 Subject: [PATCH] Use libvpx defines to set name mangling rules Change-Id: I03986bf2b05032d8a29e5bd629f7f6703269ab13 --- third_party/x86inc/README.libvpx | 2 ++ third_party/x86inc/x86inc.asm.new | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx index fcb49e1..728c0eb 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.new b/third_party/x86inc/x86inc.asm.new index fbd95a6..b4c30ca 100644 --- a/third_party/x86inc/x86inc.asm.new +++ b/third_party/x86inc/x86inc.asm.new @@ -66,10 +66,16 @@ %endif %endif -%ifdef PREFIX - %define mangle(x) _ %+ x -%else +%ifidn __OUTPUT_FORMAT__,elf32 + %define mangle(x) x +%elifidn __OUTPUT_FORMAT__,elf64 + %define mangle(x) x +%elifidn __OUTPUT_FORMAT__,x64 %define mangle(x) x +%elifidn __OUTPUT_FORMAT__,win64 + %define mangle(x) x +%else + %define mangle(x) _ %+ x %endif %macro SECTION_RODATA 0-1 16 -- 2.7.4