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 781 matching lines @@
         *-solaris-*)
             add_extralibs -lposix4
             ;;
     esac
 
     # Process ARM architecture variants
     case ${toolchain} in
     arm*)
         # on arm, isa versions are supersets
         case ${tgt_isa} in
-        armv8)
+        arm64|armv8)
             soft_enable neon
             ;;
         armv7|armv7s)
             soft_enable neon
             soft_enable neon_asm
             soft_enable media
             soft_enable edsp
             soft_enable fast_unaligned
             ;;
         armv6)
@@ skipping 228 matching lines @@
             darwin_arch="-arch ppc"
             enabled ppc64 && darwin_arch="${darwin_arch}64"
             add_cflags  ${darwin_arch} -m${bits} -fasm-blocks
             add_asflags ${darwin_arch} -force_cpusubtype_ALL -I"\$(dir \$<)darwin"
             add_ldflags ${darwin_arch} -m${bits}
             enabled altivec && add_cflags -faltivec
         ;;
         esac
     ;;
     x86*)
-        bits=32
-        enabled x86_64 && bits=64
-        check_cpp <<EOF && bits=x32
-#ifndef __ILP32__
-#error "not x32"
-#endif
-EOF
-
         case  ${tgt_os} in
             win*)
                 enabled gcc && add_cflags -fno-common
                 ;;
             solaris*)
                 CC=${CC:-${CROSS}gcc}
                 CXX=${CXX:-${CROSS}g++}
                 LD=${LD:-${CROSS}gcc}
                 CROSS=${CROSS:-g}
                 ;;
@@ skipping 18 matching lines @@
                     atom*)
                         tune_cflags="-x"
                         tune_cpu="SSE3_ATOM"
                     ;;
                     *)
                         tune_cflags="-march="
                     ;;
                 esac
             ;;
             gcc*)
-                add_cflags -m${bits}
-                add_ldflags -m${bits}
                 link_with_cc=gcc
                 tune_cflags="-march="
                 setup_gnu_toolchain
                 #for 32 bit x86 builds, -O3 did not turn on this flag
                 enabled optimizations && disabled gprof && check_add_cflags -fomit-frame-pointer
             ;;
             vs*)
                 # When building with Microsoft Visual Studio the assembler is
                 # invoked directly. Checking at configure time is unnecessary.
                 # 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|10)
                          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
 
+        bits=32
+        enabled x86_64 && bits=64
+        check_cpp <<EOF && bits=x32
+#ifndef __ILP32__
+#error "not x32"
+#endif
+EOF
+        case ${tgt_cc} in
+            gcc*)
+                add_cflags -m${bits}
+                add_ldflags -m${bits}
+            ;;
+        esac
+
         soft_enable runtime_cpu_detect
         # We can't use 'check_cflags' until the compiler is configured and CC is
         # populated.
         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
@@ skipping 82 matching lines @@
         check_add_ldflags -fprofile-arcs -ftest-coverage
 
     if enabled optimizations; then
         if enabled rvct; then
             enabled small && check_add_cflags -Ospace || check_add_cflags -Otime
         else
             enabled small && check_add_cflags -O2 ||  check_add_cflags -O3
         fi
     fi
 
-    # default use_x86inc to yes if pic is no or 64bit or we are not on darwin
-    if [ ${tgt_isa} = x86_64 -o ! "$pic" = "yes" -o \
-         "${tgt_os#darwin}" = "${tgt_os}"  ]; then
-      soft_enable use_x86inc
+    tgt_os_no_version=$(echo "${tgt_os}" | tr -d "[0-9]")
+    # Default use_x86inc to yes when we are 64 bit, non-pic, or on any
+    # non-Darwin target.
+    if [ "${tgt_isa}" = "x86_64" ] || [ "${pic}" != "yes" ] || \
+            [ "${tgt_os_no_version}" != "darwin" ]; then
+        soft_enable use_x86inc
     fi
 
     # Position Independent Code (PIC) support, for building relocatable
     # shared objects
     enabled gcc && enabled pic && check_add_cflags -fPIC
 
     # Work around longjmp interception on glibc >= 2.11, to improve binary
     # compatibility. See http://code.google.com/p/webm/issues/detail?id=166
     enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 
@@ skipping 125 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
 }