diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2012-07-03 17:51:43 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-07-05 17:37:11 +0200 |
| commit | 2cd1f5cadcab6c6c992c3d07575f76e3e6e59c0e (patch) | |
| tree | 88242544b2d7782aa97778a0ba1439f327913f1d /libavutil | |
| parent | d20f133ef962da71326bc3635e086696f45ab64e (diff) | |
| download | ffmpeg-2cd1f5cadcab6c6c992c3d07575f76e3e6e59c0e.tar.gz | |
x86inc: modify ALIGN to not generate long nops on i586
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index c167057921..42ba97ade5 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 |