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
This commit is contained in:
Johann 2015-07-28 14:42:23 -07:00
parent 5d8f9f53d1
commit bfbba9c6b0
2 changed files with 5 additions and 1 deletions

View File

@ -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.

View File

@ -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