diff options
| author | Rafael Ávila de Espíndola <rafael.espindola@gmail.com> | 2011-03-05 15:36:40 -0500 |
|---|---|---|
| committer | Rafael Ávila de Espíndola <rafael.espindola@gmail.com> | 2011-03-12 10:45:22 -0500 |
| commit | 52f6e28e9e5e176424c1c65ff13aa57abf9c00e6 (patch) | |
| tree | 55dff5d35aa8d8d9eca49a54861b5a15a07fb1b7 | |
| parent | 3788b3564c587983a10d7131b35c0d9c39540666 (diff) | |
| download | libvpx-52f6e28e9e5e176424c1c65ff13aa57abf9c00e6.tar libvpx-52f6e28e9e5e176424c1c65ff13aa57abf9c00e6.tar.gz libvpx-52f6e28e9e5e176424c1c65ff13aa57abf9c00e6.tar.bz2 libvpx-52f6e28e9e5e176424c1c65ff13aa57abf9c00e6.zip | |
Fix build with xcode4 and simplify GLOBAL.
Without this change I get link errors in firefox's libxul. It looks
like the linker expect a particular pattern for getting the GOT. This
patch changes webm to use the same pattern used by the compiler.
Change-Id: Iea8c2e134ad45c1dc7d221ff885a8429bfa4e057
| -rw-r--r-- | vpx_ports/x86_abi_support.asm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm index a872b280e..be64cd7c7 100644 --- a/vpx_ports/x86_abi_support.asm +++ b/vpx_ports/x86_abi_support.asm @@ -168,15 +168,10 @@ %macro GET_GOT 1 push %1 call %%get_got - %%sub_offset: - jmp %%exitGG %%get_got: - mov %1, [esp] - add %1, fake_got - %%sub_offset - ret - %%exitGG: + pop %1 %undef GLOBAL - %define GLOBAL(x) x + %1 - fake_got + %define GLOBAL(x) x + %1 - %%get_got %undef RESTORE_GOT %define RESTORE_GOT pop %1 %endmacro @@ -289,7 +284,6 @@ %elifidn __OUTPUT_FORMAT__,macho32 %macro SECTION_RODATA 0 section .text -fake_got: %endmacro %else %define SECTION_RODATA section .rodata |