libvpx: Pull from upstream

source/libvpx/build/make/configure.sh

 #!/bin/sh
 ##
 ##  configure.sh
 ##
 ##  This script is sourced by the main configure script and contains
 ##  utility functions and other common bits that aren't strictly libvpx
 ##  related.
 ##
 ##  This build system is based in part on the FFmpeg configure script.
 ##
@@ skipping 23 matching lines @@
 }
 
 
 log(){
     echo "$@" >>$logfile
 }
 
 
 log_file(){
     log BEGIN $1
-    pr -n -t $1 >>$logfile
+    cat -n $1 >>$logfile
     log END $1
 }
 
 
 log_echo() {
     echo "$@"
     log "$@"
 }
 
 
@@ skipping 212 matching lines @@
 RAND=$(awk 'BEGIN { srand(); printf "%d\n",(rand() * 32768)}')
 TMP_H="${TMPDIRx}/vpx-conf-$$-${RAND}.h"
 TMP_C="${TMPDIRx}/vpx-conf-$$-${RAND}.c"
 TMP_CC="${TMPDIRx}/vpx-conf-$$-${RAND}.cc"
 TMP_O="${TMPDIRx}/vpx-conf-$$-${RAND}.o"
 TMP_X="${TMPDIRx}/vpx-conf-$$-${RAND}.x"
 TMP_ASM="${TMPDIRx}/vpx-conf-$$-${RAND}.asm"
 
 clean_temp_files() {
     rm -f ${TMP_C} ${TMP_CC} ${TMP_H} ${TMP_O} ${TMP_X} ${TMP_ASM}
+    enabled gcov && rm -f ${TMP_C%.c}.gcno ${TMP_CC%.cc}.gcno
 }
 
 #
 # Toolchain Check Functions
 #
 check_cmd() {
     enabled external_build && return
     log "$@"
     "$@" >>${logfile} 2>&1
 }
@@ skipping 33 matching lines @@
     disable_feature $var
     check_cpp "$@" <<EOF && enable_feature $var
 #include "$header"
 int x;
 EOF
 }
 
 
 check_cflags() {
     log check_cflags "$@"
-    check_cc "$@" <<EOF
+    check_cc -Werror "$@" <<EOF
 int x;
 EOF
 }
 
 check_cxxflags() {
     log check_cxxflags "$@"
 
     # Catch CFLAGS that trigger CXX warnings
     case "$CXX" in
       *c++-analyzer|*clang++|*g++*) check_cxx -Werror "$@" <<EOF
 int x;
 EOF
       ;;
-      *) check_cxx "$@" <<EOF
+      *) check_cxx -Werror "$@" <<EOF
 int x;
 EOF
       ;;
     esac
 }
 
 check_add_cflags() {
     check_cxxflags "$@" && add_cxxflags_only "$@"
     check_cflags "$@" && add_cflags_only "$@"
 }
@@ skipping 16 matching lines @@
 EOF
     log_file ${TMP_ASM}
     check_cmd ${AS} ${ASFLAGS} -o ${TMP_O} ${TMP_ASM}
     readelf -WS ${TMP_O} >${TMP_X}
     log_file ${TMP_X}
     if ! grep -q '\.rodata .* 16$' ${TMP_X}; then
         die "${AS} ${ASFLAGS} does not support section alignment (nasm <=2.08?)"
     fi
 }
 
+# tests for -m$1 toggling the feature given in $2. If $2 is empty $1 is used.
+check_gcc_machine_option() {
+    local opt="$1"
+    local feature="$2"
+    [ -n "$feature" ] || feature="$opt"
+
+    if enabled gcc && ! disabled "$feature" && ! check_cflags "-m$opt"; then
+        RTCD_OPTIONS="${RTCD_OPTIONS}--disable-$feature "
+    else
+        soft_enable "$feature"
+    fi
+}
+
 write_common_config_banner() {
     print_webm_license config.mk "##" ""
     echo '# This file automatically generated by configure. Do not edit!' >> config.mk
     echo "TOOLCHAIN := ${toolchain}" >> config.mk
 
     case ${toolchain} in
         *-linux-rvct)
             echo "ALT_LIBC := ${alt_libc}" >> config.mk
             ;;
     esac
 }
 
 write_common_config_targets() {
     for t in ${all_targets}; do
         if enabled ${t}; then
             if enabled universal || enabled child; then
                 fwrite config.mk "ALL_TARGETS += ${t}-${toolchain}"
             else
                 fwrite config.mk "ALL_TARGETS += ${t}"
             fi
         fi
     true;
     done
 true
 }
 
 write_common_target_config_mk() {
-    local CC=${CC}
-    local CXX=${CXX}
+    local CC="${CC}"
+    local CXX="${CXX}"
     enabled ccache && CC="ccache ${CC}"
     enabled ccache && CXX="ccache ${CXX}"
     print_webm_license $1 "##" ""
 
     cat >> $1 << EOF
 # This file automatically generated by configure. Do not edit!
 SRC_PATH="$source_path"
 SRC_PATH_BARE=$source_path
 BUILD_PFX=${BUILD_PFX}
 TOOLCHAIN=${toolchain}
@@ skipping 662 matching lines @@
                          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
 
         soft_enable runtime_cpu_detect
-        soft_enable mmx
-        soft_enable sse
-        soft_enable sse2
-        soft_enable sse3
-        soft_enable ssse3
         # We can't use 'check_cflags' until the compiler is configured and CC is
         # populated.
-        if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then
-            RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 "
-        else
-            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
+        check_gcc_machine_option mmx
+        check_gcc_machine_option sse
+        check_gcc_machine_option sse2
+        check_gcc_machine_option sse3
+        check_gcc_machine_option ssse3
+        check_gcc_machine_option sse4 sse4_1
+        check_gcc_machine_option avx
+        check_gcc_machine_option avx2
 
         case "${AS}" in
             auto|"")
                 which nasm >/dev/null 2>&1 && AS=nasm
                 which yasm >/dev/null 2>&1 && AS=yasm
                 [ "${AS}" = auto -o -z "${AS}" ] \
                     && die "Neither yasm nor nasm have been found"
             ;;
         esac
         log_echo "  using $AS"
@@ skipping 214 matching lines @@
     # Prepare the PWD for building.
     for f in ${OOT_INSTALLS}; do
             install -D ${source_path}/$f $f
     done
     fi
     cp ${source_path}/build/make/Makefile .
 
     clean_temp_files
     true
 }