x86inc: modify ALIGN to not generate long nops on i586

Signed-off-by: Diego Biurrun <diego@biurrun.de>
13 years ago · 2cd1f5cadc
parent d20f133ef9
commit 2cd1f5cadc
1 changed files with 4 additions and 0 deletions
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@ -571,6 +571,7 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits
 ; 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-2
+    CPU amdnop
    %if %0 >= 1
        %xdefine cpuname %1
        %assign cpuflags cpuflags_%1
@ -592,6 +593,9 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits
        %elifidn %1, sse3
            %define movu lddqu
        %endif
+        %if notcpuflag(mmx2)
+            CPU basicnop
+        %endif
    %else
        %xdefine SUFFIX
        %undef cpuname