PageRenderTime 23ms CodeModel.GetById 18ms app.highlight 1ms RepoModel.GetById 2ms app.codeStats 0ms

/media/libvpx/xcode4.patch

http://github.com/zpao/v8monkey
Patch | 42 lines | 38 code | 4 blank | 0 comment | 0 complexity | 32c919638e8655db5acc94f5b5cb1516 MD5 | raw file
 1commit 52f6e28e9e5e176424c1c65ff13aa57abf9c00e6
 2Author: Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
 3Date:   Sat Mar 5 15:36:40 2011 -0500
 4
 5    Fix build with xcode4 and simplify GLOBAL.
 6    
 7    Without this change I get link errors in firefox's libxul. It looks
 8    like the linker expect a particular pattern for getting the GOT. This
 9    patch changes webm to use the same pattern used by the compiler.
10    
11    Change-Id: Iea8c2e134ad45c1dc7d221ff885a8429bfa4e057
12
13diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm
14index a872b28..be64cd7 100644
15--- a/vpx_ports/x86_abi_support.asm
16+++ b/vpx_ports/x86_abi_support.asm
17@@ -168,15 +168,10 @@
18     %macro GET_GOT 1
19       push %1
20       call %%get_got
21-      %%sub_offset:
22-      jmp  %%exitGG
23       %%get_got:
24-      mov  %1, [esp]
25-      add %1, fake_got - %%sub_offset
26-      ret
27-      %%exitGG:
28+      pop  %1
29       %undef GLOBAL
30-      %define GLOBAL(x) x + %1 - fake_got
31+      %define GLOBAL(x) x + %1 - %%get_got
32       %undef RESTORE_GOT
33       %define RESTORE_GOT pop %1
34     %endmacro
35@@ -289,7 +284,6 @@
36 %elifidn __OUTPUT_FORMAT__,macho32
37 %macro SECTION_RODATA 0
38 section .text
39-fake_got:
40 %endmacro
41 %else
42 %define SECTION_RODATA section .rodata