diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2010-10-04 23:18:58 +0200 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-10-04 19:47:54 -0400 |
| commit | 5cdc3a4c29c5da43a4c346d57932c1c46068abec (patch) | |
| tree | a3b6514c0d6bd8133c9b9c9e462cbcda2ee991e7 /vpx_ports | |
| parent | e114f699f654235e05fb1bbd605c35708890d8b8 (diff) | |
| download | libvpx-5cdc3a4c29c5da43a4c346d57932c1c46068abec.tar libvpx-5cdc3a4c29c5da43a4c346d57932c1c46068abec.tar.gz libvpx-5cdc3a4c29c5da43a4c346d57932c1c46068abec.tar.bz2 libvpx-5cdc3a4c29c5da43a4c346d57932c1c46068abec.zip | |
nasm: address labels 'rel label' vice 'wrt rip'
nasm does not support `label wrt rip', it requires `rel label'. It is
still fully compatible with yasm.
Provide nasm compatibility. No binary change by this patch with yasm on
{x86_64,i686}-fedora13-linux-gnu. Few longer opcodes with nasm on
{x86_64,i686}-fedora13-linux-gnu have been checked as safe.
Change-Id: I488773a4e930a56e43b0cc72d867ee5291215f50
Diffstat (limited to 'vpx_ports')
| -rw-r--r-- | vpx_ports/x86_abi_support.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm index 470c58a6d..a872b280e 100644 --- a/vpx_ports/x86_abi_support.asm +++ b/vpx_ports/x86_abi_support.asm @@ -160,7 +160,7 @@ ret %%exitGG: %undef GLOBAL - %define GLOBAL + %1 wrt ..gotoff + %define GLOBAL(x) x + %1 wrt ..gotoff %undef RESTORE_GOT %define RESTORE_GOT pop %1 %endmacro @@ -176,7 +176,7 @@ ret %%exitGG: %undef GLOBAL - %define GLOBAL + %1 - fake_got + %define GLOBAL(x) x + %1 - fake_got %undef RESTORE_GOT %define RESTORE_GOT pop %1 %endmacro @@ -186,7 +186,7 @@ %else %macro GET_GOT 1 %endmacro - %define GLOBAL wrt rip + %define GLOBAL(x) rel x %ifidn __OUTPUT_FORMAT__,elf64 %define WRT_PLT wrt ..plt %define HIDDEN_DATA(x) x:data hidden @@ -197,7 +197,7 @@ %ifnmacro GET_GOT %macro GET_GOT 1 %endmacro - %define GLOBAL + %define GLOBAL(x) x %endif %ifndef RESTORE_GOT %define RESTORE_GOT |