Index: source/libvpx/third_party/x86inc/x86inc.asm |
diff --git a/source/libvpx/third_party/x86inc/x86inc.asm b/source/libvpx/third_party/x86inc/x86inc.asm |
index 77a58f295b33f3ca3d9d9c687c8abff468f423dc..be59de3116745f54d77e839e8240efba29da8a80 100644 |
--- a/source/libvpx/third_party/x86inc/x86inc.asm |
+++ b/source/libvpx/third_party/x86inc/x86inc.asm |
@@ -876,6 +876,10 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits |
%define cpuflag(x) ((cpuflags & (cpuflags_ %+ x)) == (cpuflags_ %+ x)) |
%define notcpuflag(x) ((cpuflags & (cpuflags_ %+ x)) != (cpuflags_ %+ x)) |
+%ifdef __NASM_VER__ |
+ %use smartalign |
+%endif |
+ |
; Takes an arbitrary number of cpuflags from the above list. |
; All subsequent functions (up to the next INIT_CPUFLAGS) is built for the specified cpu. |
; You shouldn't need to invoke this macro directly, it's a subroutine for INIT_MMX &co. |
@@ -912,7 +916,6 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits |
%endif |
%ifdef __NASM_VER__ |
- %use smartalign |
ALIGNMODE k7 |
%elif ARCH_X86_64 || cpuflag(sse2) |
CPU amdnop |