[vlc-commits] Remove support for ARMv7s

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Wed Jan 22 18:28:21 2020 +0100| [e7210c467cd1f9f0c5e7b169247385a1bb5020d0] | committer: Felix Paul Kühne

Remove support for ARMv7s

This platform was used by iPhone 5 only, which can also execute ARMv7 and is quite dated now, so the maintenance burden cannot no longer be justified.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7210c467cd1f9f0c5e7b169247385a1bb5020d0
---

 contrib/bootstrap             | 4 ----
 contrib/src/vpx/rules.mak     | 8 --------
 extras/package/apple/build.sh | 4 ++--
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 01a234e55c..5ed5f6f25d 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -273,10 +273,6 @@ case "${OS}" in
 			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
 
 			case "${HOST}" in
-				*armv7s*)
-					add_make "PLATFORM_SHORT_ARCH := armv7s"
-					add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
-					;;
 				*arm64*|*aarch64*)
 					add_make "PLATFORM_SHORT_ARCH := arm64"
 					;;
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 23841bb28c..8dd9f6305c 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -38,15 +38,7 @@ endif
 VPX_LDFLAGS := $(LDFLAGS)
 
 ifeq ($(ARCH),arm)
-ifdef HAVE_IOS
-ifneq ($(filter armv7s%,$(subst -, ,$(HOST))),)
-VPX_ARCH := armv7s
-else
-VPX_ARCH := armv7
-endif
-else
 VPX_ARCH := armv7
-endif
 else ifeq ($(ARCH),i386)
 VPX_ARCH := x86
 else ifeq ($(ARCH),mips)
diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 3f4a15a191..2d5a9dfa4b 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -104,7 +104,7 @@ usage()
 {
     echo "Usage: $VLC_SCRIPT_NAME [options]"
     echo " --arch=ARCH     Architecture to build for"
-    echo "                   (i386|x86_64|armv7|armv7s|arm64)"
+    echo "                   (i386|x86_64|armv7|arm64)"
     echo " --sdk=SDK       Name of the SDK to build with (see 'xcodebuild -showsdks')"
     echo " --disable-debug Disable libvlc debug mode (for release)"
     echo " --verbose       Print verbose output and disable multi-core use"
@@ -182,7 +182,7 @@ set_deployment_target()
 validate_architecture()
 {
     case "$1" in
-    i386|x86_64|armv7|armv7s|arm64)
+    i386|x86_64|armv7|arm64)
         VLC_HOST_ARCH="$1"
         ;;
     aarch64)