]> granicus.if.org Git - libvpx/commitdiff
configure.sh: Remove armv6-darwin target.
authorTom Finegan <tomfinegan@google.com>
Mon, 2 May 2016 17:42:00 +0000 (10:42 -0700)
committerTom Finegan <tomfinegan@google.com>
Mon, 2 May 2016 20:33:25 +0000 (13:33 -0700)
- iOS SDKs no longer ship with armv6 support.
- Our minimum iOS version means all target devices have neon.
- Remove armv6 darwin LD workaround.
  - This removes a TODO.

Change-Id: I2fcb5b82c96213364275475be021c7dd8459d5c0

README
build/make/configure.sh
configure

diff --git a/README b/README
index 979440eb70b5651758d99d72659eea83f550f0ba..29072b91958c1e0ee9a1c878cbd17018fd196726 100644 (file)
--- a/README
+++ b/README
@@ -47,7 +47,6 @@ COMPILING THE APPLICATIONS/LIBRARIES:
   --help output of the configure script. As of this writing, the list of
   available targets is:
 
-    armv6-darwin-gcc
     armv6-linux-rvct
     armv6-linux-gcc
     armv6-none-rvct
index 8ea755abd7053cfcb8d01f4c77abe4d06df1d89f..7b471ca2805149ee966720c4a2857029e1233e82 100644 (file)
@@ -1018,18 +1018,7 @@ EOF
           NM="$(${XCRUN_FIND} nm)"
           RANLIB="$(${XCRUN_FIND} ranlib)"
           AS_SFX=.s
-
-          # Special handling of ld for armv6 because libclang_rt.ios.a does
-          # not contain armv6 support in Apple's clang package:
-          #   Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn).
-          # TODO(tomfinegan): Remove this. Our minimum iOS version (6.0)
-          # renders support for armv6 unnecessary because the 3GS and up
-          # support neon.
-          if [ "${tgt_isa}" = "armv6" ]; then
-            LD="$(${XCRUN_FIND} ld)"
-          else
-            LD="${CXX:-$(${XCRUN_FIND} ld)}"
-          fi
+          LD="${CXX:-$(${XCRUN_FIND} ld)}"
 
           # ASFLAGS is written here instead of using check_add_asflags
           # because we need to overwrite all of ASFLAGS and purge the
index ff97dee4487b89a1bd8a1aeb9b7fa4b96f5d1eb0..91407d33c7e47bc3cdeb43b39cf478cbe536b9a7 100755 (executable)
--- a/configure
+++ b/configure
@@ -98,7 +98,6 @@ EOF
 
 # all_platforms is a list of all supported target platforms. Maintain
 # alphabetically by architecture, generic-gnu last.
-all_platforms="${all_platforms} armv6-darwin-gcc"
 all_platforms="${all_platforms} armv6-linux-rvct"
 all_platforms="${all_platforms} armv6-linux-gcc"
 all_platforms="${all_platforms} armv6-none-rvct"