diff options
Diffstat (limited to 'libvpx/build/make/configure.sh')
| -rwxr-xr-x | libvpx/build/make/configure.sh | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/libvpx/build/make/configure.sh b/libvpx/build/make/configure.sh index bb7ab41..b43a4ec 100755 --- a/libvpx/build/make/configure.sh +++ b/libvpx/build/make/configure.sh @@ -1060,9 +1060,11 @@ EOF CC=${CC:-icc} LD=${LD:-icc} setup_gnu_toolchain - add_cflags -use-msasm -use-asm - add_ldflags -i-static - enabled x86_64 && add_cflags -ipo -no-prec-div -static -xSSE2 -axSSE2 + add_cflags -use-msasm # remove -use-msasm too? + # add -no-intel-extensions to suppress warning #10237 + # refer to http://software.intel.com/en-us/forums/topic/280199 + add_ldflags -i-static -no-intel-extensions + enabled x86_64 && add_cflags -ipo -static -O3 -no-prec-div enabled x86_64 && AR=xiar case ${tune_cpu} in atom*) @@ -1089,6 +1091,15 @@ EOF # Skip the check by setting AS arbitrarily AS=msvs msvs_arch_dir=x86-msvs + vc_version=${tgt_cc##vs} + case $vc_version in + 7|8|9) + echo "${tgt_cc} does not support avx/avx2, disabling....." + RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx --disable-avx2 " + soft_disable avx + soft_disable avx2 + ;; + esac ;; esac @@ -1106,6 +1117,18 @@ EOF soft_enable sse4_1 fi + if enabled gcc && ! disabled avx && ! check_cflags -mavx; then + RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx " + else + soft_enable avx + fi + + if enabled gcc && ! disabled avx2 && ! check_cflags -mavx2; then + RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx2 " + else + soft_enable avx2 + fi + case "${AS}" in auto|"") which nasm >/dev/null 2>&1 && AS=nasm |