libvpx: Pull from upstream

source/libvpx/third_party/x86inc/x86inc.asm

 ;*****************************************************************************
 ;* x86inc.asm: x264asm abstraction layer
 ;*****************************************************************************
 ;* Copyright (C) 2005-2015 x264 project
 ;*
 ;* Authors: Loren Merritt <lorenm@u.washington.edu>
 ;*          Anton Mitrofanov <BugMaster@narod.ru>
 ;*          Fiona Glaser <fiona@x264.com>
 ;*          Henrik Gramner <henrik@gramner.com>
 ;*
@@ skipping 858 matching lines @@
 %assign cpuflags_slowctz  (1<<18)
 %assign cpuflags_lzcnt    (1<<19)
 %assign cpuflags_aligned  (1<<20) ; not a cpu feature, but a function variant
 %assign cpuflags_atom     (1<<21)
 %assign cpuflags_bmi1     (1<<22)|cpuflags_lzcnt
 %assign cpuflags_bmi2     (1<<23)|cpuflags_bmi1
 
 %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.
 %macro INIT_CPUFLAGS 0-*
     %xdefine SUFFIX
     %undef cpuname
     %assign cpuflags 0
 
     %if %0 >= 1
         %rep %0
@@ skipping 16 matching lines @@
             %define movnta movntps
         %endif
         %if cpuflag(aligned)
             %define movu mova
         %elif cpuflag(sse3) && notcpuflag(ssse3)
             %define movu lddqu
         %endif
     %endif
 
     %ifdef __NASM_VER__
-        %use smartalign
         ALIGNMODE k7
     %elif ARCH_X86_64 || cpuflag(sse2)
         CPU amdnop
     %else
         CPU basicnop
     %endif
 %endmacro
 
 ; Merge mmx and sse*
 ; m# is a simd register of the currently selected size
@@ skipping 673 matching lines @@
 ; workaround: vpbroadcastq is broken in x86_32 due to a yasm bug
 %if ARCH_X86_64 == 0
 %macro vpbroadcastq 2
 %if sizeof%1 == 16
     movddup %1, %2
 %else
     vbroadcastsd %1, %2
 %endif
 %endmacro
 %endif