diff options
| author | Johann <johannkoenig@google.com> | 2015-07-28 15:06:50 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2015-08-07 16:22:02 -0700 |
| commit | 25a2434752f36cbc393d368624b437080b2d2052 (patch) | |
| tree | 72906c70945346f54b249571ecb6797fc1ef4b68 /third_party | |
| parent | 35747296b0cde0c10cf2013fb3f7afd7480aa44e (diff) | |
| download | libvpx-25a2434752f36cbc393d368624b437080b2d2052.tar.gz | |
Use libvpx defines to set name mangling rules
Change-Id: I03986bf2b05032d8a29e5bd629f7f6703269ab13
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/x86inc/README.libvpx | 2 | ||||
| -rw-r--r-- | 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 fcb49e16c..728c0ebd8 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 fbd95a632..b4c30ca7d 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 |