x86inc.asm: fix NASM compilation

Change-Id: I1e7f3c32969dac7911921062b396750302878c2e

diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx
index fe5b076111edb0d1b42b2a7504f132d1cde9df1b..e91e305a281b30b10e2a647103b59a172d94f7d5 100644 (file)
--- a/third_party/x86inc/README.libvpx
+++ b/third_party/x86inc/README.libvpx
@@ -20,3 +20,5 @@ Copy PIC 'GLOBAL' macros from x86_abi_support.asm
 Use .text instead of .rodata on macho to avoid broken tables in PIC mode.
 Use .text with no alignment for aout
 Only use 'hidden' visibility with Chromium
+Move '%use smartalign' for nasm out of 'INIT_CPUFLAGS' and before
+  'ALIGNMODE'.

diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm
index 77a58f295b33f3ca3d9d9c687c8abff468f423dc..be59de3116745f54d77e839e8240efba29da8a80 100644 (file)
--- a/third_party/x86inc/x86inc.asm
+++ b/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