diff options
author | Parag Salasakar <img.mips1@gmail.com> | 2015-04-15 21:17:13 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-04-15 21:17:13 -0700 |
commit | 3701dcc5c15bd6a182addfb2ff10941f87d4f414 (patch) | |
tree | 726a36437837f7e736c8e0fc17f2584b549c41ca /build/make | |
parent | 1551d7c00b49e5ae05ffda739b675b8ffdeebb1d (diff) | |
parent | 4009b63c42734eb720e6244b183e4be974fd7cf6 (diff) | |
download | libvpx-3701dcc5c15bd6a182addfb2ff10941f87d4f414.tar libvpx-3701dcc5c15bd6a182addfb2ff10941f87d4f414.tar.gz libvpx-3701dcc5c15bd6a182addfb2ff10941f87d4f414.tar.bz2 libvpx-3701dcc5c15bd6a182addfb2ff10941f87d4f414.zip |
Merge "mips msa configuration fix"
Diffstat (limited to 'build/make')
-rw-r--r-- | build/make/configure.sh | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 84ca4b9d3..a51a8470a 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1036,25 +1036,30 @@ EOF disable_feature fast_unaligned fi + if enabled runtime_cpu_detect; then + disable_feature runtime_cpu_detect + fi + if [ -n "${tune_cpu}" ]; then case ${tune_cpu} in p5600) - add_cflags -mips32r5 -funroll-loops -mload-store-pairs - add_cflags -msched-weight -mhard-float - add_asflags -mips32r5 -mhard-float + check_add_cflags -mips32r5 -funroll-loops -mload-store-pairs + check_add_cflags -msched-weight -mhard-float -mfp64 + check_add_asflags -mips32r5 -mhard-float -mfp64 + check_add_ldflags -mfp64 ;; i6400) - add_cflags -mips64r6 -mabi=64 -funroll-loops -mload-store-pairs - add_cflags -msched-weight -mhard-float - add_asflags -mips64r6 -mabi=64 -mhard-float - add_ldflags -mips64r6 -mabi=64 + check_add_cflags -mips64r6 -mabi=64 -funroll-loops -msched-weight + check_add_cflags -mload-store-pairs -mhard-float -mfp64 + check_add_asflags -mips64r6 -mabi=64 -mhard-float -mfp64 + check_add_ldflags -mips64r6 -mabi=64 -mfp64 ;; esac if enabled msa; then - add_cflags -mmsa -mfp64 -flax-vector-conversions - add_asflags -mmsa -mfp64 -flax-vector-conversions - add_ldflags -mmsa -mfp64 -flax-vector-conversions + add_cflags -mmsa + add_asflags -mmsa + add_ldflags -mmsa disable_feature fast_unaligned fi @@ -1300,11 +1305,15 @@ EOF # only for MIPS platforms case ${toolchain} in mips*) - if enabled dspr2; then - if enabled big_endian; then + if enabled big_endian; then + if enabled dspr2; then echo "dspr2 optimizations are available only for little endian platforms" disable_feature dspr2 fi + if enabled msa; then + echo "msa optimizations are available only for little endian platforms" + disable_feature msa + fi fi ;; esac |