shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Disable neon for Xcode versions < v6.3."

--- a/build/make/configure.sh

+++ b/build/make/configure.sh

@@ -655,6 +655,26 @@

   xcrun --sdk $1 --show-sdk-version 2>/dev/null | cut -d. -f1

 }

+# Print the Xcode version.

+show_xcode_version() {

+  xcodebuild -version | head -n1 | cut -d' ' -f2

+}

+

+# Fails when Xcode version is less than 6.3.

+check_xcode_minimum_version() {

+  xcode_major=$(show_xcode_version | cut -f1 -d.)

+  xcode_minor=$(show_xcode_version | cut -f2 -d.)

+  xcode_min_major=6

+  xcode_min_minor=3

+  if [ ${xcode_major} -lt ${xcode_min_major} ]; then

+    return 1

+  fi

+  if [ ${xcode_major} -eq ${xcode_min_major} ] \

+    && [ ${xcode_minor} -lt ${xcode_min_minor} ]; then

+    return 1

+  fi

+}

+

 process_common_toolchain() {

   if [ -z "$toolchain" ]; then

     gcctarget="${CHOST:-$(gcc -dumpmachine 2> /dev/null)}"

@@ -1068,6 +1088,19 @@

             [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"

           done

+          case ${tgt_isa} in

+            armv7|armv7s|armv8|arm64)

+              if enabled neon && ! check_xcode_minimum_version; then

+                soft_disable neon

+                log_echo "  neon disabled: upgrade Xcode (need v6.3+)."

+                if enabled neon_asm; then

+                  soft_disable neon_asm

+                  log_echo "  neon_asm disabled: upgrade Xcode (need v6.3+)."

+                fi

+              fi

+              ;;

+          esac

+

           asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"

           if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then

@@ -1123,7 +1156,7 @@

             check_add_ldflags -mfp64

             ;;

           i6400)

-            check_add_cflags -mips64r6 -mabi=64 -funroll-loops -msched-weight 

+            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