Remove armv6 references from the build system.
We no longer support armv6 and the corresponding
optimized source files have been removed. This
commit removes support for the target and its
media instruction set extensions from the build
system as well.
Once armv6 jobs are removed from the integration
config we can start rejecting --enable/disable-media.
Also reject --enable-edsp.
Change-Id: I547dcc95adb3479d0232396952e72efe2a1343b9
diff --git a/CHANGELOG b/CHANGELOG
index dad0ea1..7510dc6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Next Release
- Incompatible changes:
The AV1 encoder's default keyframe interval changed to 128 from 9999.
+ Support for armv6 was removed.
2016-04-07 v0.1.0 "AOMedia Codec 1"
This release is the first Alliance for Open Media codec.
diff --git a/README b/README
index 9aa30da..82d3b36 100644
--- a/README
+++ b/README
@@ -47,9 +47,6 @@
--help output of the configure script. As of this writing, the list of
available targets is:
- armv6-linux-rvct
- armv6-linux-gcc
- armv6-none-rvct
arm64-darwin-gcc
armv7-android-gcc
armv7-darwin-gcc
diff --git a/build/make/Android.mk b/build/make/Android.mk
index 6757b1f..e50faef 100644
--- a/build/make/Android.mk
+++ b/build/make/Android.mk
@@ -43,10 +43,6 @@
# Configuring with --disable-runtime-cpu-detect --disable-neon \
# --disable-neon-asm
# will remove any NEON dependency.
-
-# To change to building armeabi, run ./libaom/configure again, but with
-# --target=armv6-android-gcc and modify the Application.mk file to
-# set APP_ABI := armeabi
#
# Running ndk-build will build libaom and include it in your project.
#
@@ -61,9 +57,6 @@
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
include $(CONFIG_DIR)libs-armv7-android-gcc.mk
LOCAL_ARM_MODE := arm
-else ifeq ($(TARGET_ARCH_ABI),armeabi)
- include $(CONFIG_DIR)libs-armv6-android-gcc.mk
- LOCAL_ARM_MODE := arm
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
include $(CONFIG_DIR)libs-armv8-android-gcc.mk
LOCAL_ARM_MODE := arm
diff --git a/build/make/configure.sh b/build/make/configure.sh
index 4ece17a..b18173b 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -687,9 +687,6 @@
aarch64*)
tgt_isa=arm64
;;
- armv6*)
- tgt_isa=armv6
- ;;
armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
tgt_isa=armv7
float_abi=hard
@@ -898,37 +895,6 @@
if disabled neon && enabled neon_asm; then
die "Disabling neon while keeping neon-asm is not supported"
fi
- case ${toolchain} in
- # Apple iOS SDKs no longer support armv6 as of the version 9
- # release (coincides with release of Xcode 7). Only enable media
- # when using earlier SDK releases.
- *-darwin*)
- if [ "$(show_darwin_sdk_major_version iphoneos)" -lt 9 ]; then
- soft_enable media
- else
- soft_disable media
- RTCD_OPTIONS="${RTCD_OPTIONS}--disable-media "
- fi
- ;;
- *)
- soft_enable media
- ;;
- esac
- ;;
- armv6)
- case ${toolchain} in
- *-darwin*)
- if [ "$(show_darwin_sdk_major_version iphoneos)" -lt 9 ]; then
- soft_enable media
- else
- die "Your iOS SDK does not support armv6."
- fi
- ;;
- *)
- soft_enable media
- ;;
- esac
- ;;
esac
asm_conversion_cmd="cat"
diff --git a/build/make/rtcd.pl b/build/make/rtcd.pl
index 3335fa9..7add5a0 100755
--- a/build/make/rtcd.pl
+++ b/build/make/rtcd.pl
@@ -382,9 +382,6 @@
}
close CONFIG_FILE;
mips;
-} elsif ($opts{arch} eq 'armv6') {
- @ALL_ARCHS = filter(qw/media/);
- arm;
} elsif ($opts{arch} =~ /armv7\w?/) {
@ALL_ARCHS = filter(qw/neon_asm neon/);
&require(@REQUIRES);
diff --git a/configure b/configure
index 76c8759..11606e0 100755
--- a/configure
+++ b/configure
@@ -94,9 +94,6 @@
# alphabetically by architecture, generic-gnu last.
all_platforms="${all_platforms} arm64-darwin-gcc"
all_platforms="${all_platforms} arm64-linux-gcc"
-all_platforms="${all_platforms} armv6-linux-rvct"
-all_platforms="${all_platforms} armv6-linux-gcc"
-all_platforms="${all_platforms} armv6-none-rvct"
all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8
@@ -224,8 +221,6 @@
avx2
"
ARCH_EXT_LIST="
- edsp
- media
neon
neon_asm
