diff options
| author | mirabilos <thorsten.glaser@teckids.org> | 2017-03-25 23:28:32 +0300 |
|---|---|---|
| committer | mirabilos <thorsten.glaser@teckids.org> | 2017-03-25 23:28:32 +0300 |
| commit | a96f21a528d7fdcd86b156c09f142822fa7193c3 (patch) | |
| tree | 746d5997de2888cccaaf09c38755ae4d533339eb | |
| parent | 4f940da706f2f0be9869022b128c23bea2dad645 (diff) | |
rename get_GOT to RETRIEVE_RODATA; don’t define it on amd64 (since we don’t call it there)
| -rw-r--r-- | src/common.asm | 7 | ||||
| -rw-r--r-- | src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm | 2 | ||||
| -rw-r--r-- | src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/common.asm b/src/common.asm index d498b9f..e90589d 100644 --- a/src/common.asm +++ b/src/common.asm @@ -56,8 +56,7 @@ section .note.GNU-stack noalloc noexec nowrite progbits %undef lsym %ifdef ASM_ARCH_AMD64 -%macro get_GOT 0 -%endmacro +; amd64; don't define or call RETRIEVE_RODATA %define lsym(name) rel name %endif @@ -66,7 +65,7 @@ section .note.GNU-stack noalloc noexec nowrite progbits %ifdef PIC ; i386 ELF PIC %define use_elf_pic 1 -%macro get_GOT 0 +%macro RETRIEVE_RODATA 0 call ..@get_GOT %%getgot: add ebx, _GLOBAL_OFFSET_TABLE_ + $$ - %%getgot wrt ..gotpc @@ -85,7 +84,7 @@ section .note.GNU-stack noalloc noexec nowrite progbits %endif %ifndef lsym -%macro get_GOT 0 +%macro RETRIEVE_RODATA 0 %endmacro %define lsym(name) name %endif diff --git a/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm b/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm index 7ace68e..2c14bfa 100644 --- a/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm +++ b/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm @@ -1364,7 +1364,7 @@ PROC rfxcodec_encode_dwt_shift_x86_sse2 movdqu [esp], xmm0 ; save registers push ebx - get_GOT + RETRIEVE_RODATA push esi push edi push ebp diff --git a/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm b/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm index 20d7f2b..ef3a9f4 100644 --- a/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm +++ b/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm @@ -1232,7 +1232,7 @@ PROC rfxcodec_encode_dwt_shift_x86_sse41 movdqu [esp], xmm0 ; save registers push ebx - get_GOT + RETRIEVE_RODATA push esi push edi push ebp |