diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 06:07:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 06:09:31 +0100 |
commit | 9456a8628b4054d11c0b652ee0d4f1b61c3b9464 (patch) | |
tree | 7984c7e76811b809ef3990bc5dedde2cb741e9e9 /configure | |
parent | fecebb7abab6cac2dc07393f1d2f2463305dcd31 (diff) | |
parent | 54f7881615a5ce2f89283e7ac2015b8ef141537c (diff) | |
download | ffmpeg-streaming-9456a8628b4054d11c0b652ee0d4f1b61c3b9464.zip ffmpeg-streaming-9456a8628b4054d11c0b652ee0d4f1b61c3b9464.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Remove dcbzl check for e500v1 and e500v2 architectures
See: d5733936d857ce5c7d28c0bc9e89a2e2548f8895
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3636,10 +3636,12 @@ elif enabled ppc; then e500v2) cpuflags="-mcpu=8548 -mhard-float -mfloat-gprs=double" disable altivec + disable dcbzl ;; e500) cpuflags="-mcpu=8540 -mhard-float" disable altivec + disable dcbzl ;; esac @@ -4260,8 +4262,7 @@ elif enabled ppc; then enable local_aligned_8 local_aligned_16 - [ $cpu != e500 -a $cpu != e500v2 ] && - check_inline_asm dcbzl '"dcbzl 0, %0" :: "r"(0)' + check_inline_asm dcbzl '"dcbzl 0, %0" :: "r"(0)' check_inline_asm ibm_asm '"add 0, 0, 0"' check_inline_asm ppc4xx '"maclhw r10, r11, r12"' check_inline_asm xform_asm '"lwzx %1, %y0" :: "Z"(*(int*)0), "r"(0)' |