diff options
| author | 周晓勇 <zhouxiaoyong@loongson.cn> | 2015-05-13 12:50:20 +0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 11:34:59 +0200 |
| commit | ce95c14cd4863aa9419472b97f5ad8dd6e02928f (patch) | |
| tree | 838bc0c94ab705e0dbe25bd4ffe7a6a95b393ba8 | |
| parent | 51f64552853e16d72644308db53abee870aecfb9 (diff) | |
| download | ffmpeg-ce95c14cd4863aa9419472b97f5ad8dd6e02928f.tar.gz | |
configure: disabled -mips64 option for loongson and remove redundant cpuflags
1.Option -march=loongson3a conflicts with -mips64 or -mips64r2.
2.Option -mhard-float has been removed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -3937,7 +3937,6 @@ elif enabled mips; then enable fast_cmov enable fast_unaligned disable aligned_stack - cpuflags="-march=$cpu" ;; generic) disable mips32r5 @@ -4691,7 +4690,7 @@ elif enabled mips; then if enabled mips64 && (enabled mipsdspr1 || enabled mipsdspr2); then add_cflags "-mips64r2" add_asflags "-mips64r2" - elif enabled mips64 && enabled mipsfpu; then + elif enabled mips64 && enabled mipsfpu && disabled loongson3; then add_cflags "-mips64" add_asflags "-mips64" elif enabled mipsdspr1 || enabled mipsdspr2; then @@ -4716,8 +4715,7 @@ elif enabled mips; then check_inline_asm mipsfpu '"madd.d $f0, $f2, $f4, $f6"' enabled msa && check_cflags "-mmsa" && check_ldflags "-mmsa" && check_inline_asm msa '"addvi.b $w0, $w1, 1"' - enabled loongson3 && add_cflags "-mhard-float" && add_asflags "-mhard-float" && - check_inline_asm loongson3 '"gsldxc1 $f0, 0($2, $3)"' + enabled loongson3 && check_inline_asm loongson3 '"gsldxc1 $f0, 0($2, $3)"' enabled mips32r5 && add_asflags "-mips32r5 -mfp64" enabled mips64r6 && add_asflags "-mips64r6 -mfp64" |