[FFmpeg-cvslog] x86inc: modify ALIGN to not generate long nops on i586

[Loren Merritt]

ffmpeg | branch: master | Loren Merritt <lorenm at u.washington.edu> | Tue Jul  3 17:51:43 2012 +0000| [2cd1f5cadcab6c6c992c3d07575f76e3e6e59c0e] | committer: Diego Biurrun

x86inc: modify ALIGN to not generate long nops on i586

Signed-off-by: Diego Biurrun <diego at biurrun.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cd1f5cadcab6c6c992c3d07575f76e3e6e59c0e
---

 libavutil/x86/x86inc.asm |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index c167057..42ba97a 100644
--- 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