diff options
| author | Johann <johannkoenig@google.com> | 2015-07-28 14:42:23 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2015-08-07 16:43:31 -0700 |
| commit | bfbba9c6b00cdc2fb33fc4670ba1e6fd40247128 (patch) | |
| tree | 0b80cddd28456d34ad9a5d2d4d0967895c8859fd /third_party/x86inc | |
| parent | 5d8f9f53d190dd54720a404612cc628ea54ad603 (diff) | |
| download | libvpx-bfbba9c6b00cdc2fb33fc4670ba1e6fd40247128.tar libvpx-bfbba9c6b00cdc2fb33fc4670ba1e6fd40247128.tar.gz libvpx-bfbba9c6b00cdc2fb33fc4670ba1e6fd40247128.tar.bz2 libvpx-bfbba9c6b00cdc2fb33fc4670ba1e6fd40247128.zip | |
Avoid 'amdnop' when building with nasm
Other implementations of x86inc.asm have more comprehensive nasm
workarounds. This is the only thing that was changed for the previous
import to libvpx. See if we can still get away with it.
Change-Id: I3ef6fe9a4816461c89431a82b7e4a08b4b948d39
Diffstat (limited to 'third_party/x86inc')
| -rw-r--r-- | third_party/x86inc/README.libvpx | 1 | ||||
| -rw-r--r-- | third_party/x86inc/x86inc.asm.new | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx index 629cecea7..13d86adea 100644 --- a/third_party/x86inc/README.libvpx +++ b/third_party/x86inc/README.libvpx @@ -14,3 +14,4 @@ Manage name mangling (prefixing with '_') manually because 'PREFIX' does not exist in libvpx. Expand PIC default to macho64 and respect CONFIG_PIC from libvpx Catch all elf formats for 'hidden' status and SECTION notes. +Avoid 'amdnop' when building with nasm. diff --git a/third_party/x86inc/x86inc.asm.new b/third_party/x86inc/x86inc.asm.new index b38ae9ef0..c516a7877 100644 --- a/third_party/x86inc/x86inc.asm.new +++ b/third_party/x86inc/x86inc.asm.new @@ -806,7 +806,10 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits %endif %endif - %if ARCH_X86_64 || cpuflag(sse2) + %ifdef __NASM_VER__ + %use smartalign + ALIGNMODE k7 + %elif ARCH_X86_64 || cpuflag(sse2) CPU amdnop %else CPU basicnop |