Commit 12a27c01 authored by Ralph Giles's avatar Ralph Giles Committed by Ralph Giles
Browse files

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
parent 8a32e1a7
Next Release Next Release
- Incompatible changes: - Incompatible changes:
The AV1 encoder's default keyframe interval changed to 128 from 9999. 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" 2016-04-07 v0.1.0 "AOMedia Codec 1"
This release is the first Alliance for Open Media codec. This release is the first Alliance for Open Media codec.
......
...@@ -47,9 +47,6 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -47,9 +47,6 @@ COMPILING THE APPLICATIONS/LIBRARIES:
--help output of the configure script. As of this writing, the list of --help output of the configure script. As of this writing, the list of
available targets is: available targets is:
armv6-linux-rvct
armv6-linux-gcc
armv6-none-rvct
arm64-darwin-gcc arm64-darwin-gcc
armv7-android-gcc armv7-android-gcc
armv7-darwin-gcc armv7-darwin-gcc
......
...@@ -43,10 +43,6 @@ ...@@ -43,10 +43,6 @@
# Configuring with --disable-runtime-cpu-detect --disable-neon \ # Configuring with --disable-runtime-cpu-detect --disable-neon \
# --disable-neon-asm # --disable-neon-asm
# will remove any NEON dependency. # 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. # Running ndk-build will build libaom and include it in your project.
# #
...@@ -61,9 +57,6 @@ ASM_CNV_PATH := $(LOCAL_PATH)/$(ASM_CNV_PATH_LOCAL) ...@@ -61,9 +57,6 @@ ASM_CNV_PATH := $(LOCAL_PATH)/$(ASM_CNV_PATH_LOCAL)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
include $(CONFIG_DIR)libs-armv7-android-gcc.mk include $(CONFIG_DIR)libs-armv7-android-gcc.mk
LOCAL_ARM_MODE := arm 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) else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
include $(CONFIG_DIR)libs-armv8-android-gcc.mk include $(CONFIG_DIR)libs-armv8-android-gcc.mk
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
......
...@@ -687,9 +687,6 @@ process_common_toolchain() { ...@@ -687,9 +687,6 @@ process_common_toolchain() {
aarch64*) aarch64*)
tgt_isa=arm64 tgt_isa=arm64
;; ;;
armv6*)
tgt_isa=armv6
;;
armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf) armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
tgt_isa=armv7 tgt_isa=armv7
float_abi=hard float_abi=hard
...@@ -898,37 +895,6 @@ process_common_toolchain() { ...@@ -898,37 +895,6 @@ process_common_toolchain() {
if disabled neon && enabled neon_asm; then if disabled neon && enabled neon_asm; then
die "Disabling neon while keeping neon-asm is not supported" die "Disabling neon while keeping neon-asm is not supported"
fi 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 esac
asm_conversion_cmd="cat" asm_conversion_cmd="cat"
......
...@@ -382,9 +382,6 @@ if ($opts{arch} eq 'x86') { ...@@ -382,9 +382,6 @@ if ($opts{arch} eq 'x86') {
} }
close CONFIG_FILE; close CONFIG_FILE;
mips; mips;
} elsif ($opts{arch} eq 'armv6') {
@ALL_ARCHS = filter(qw/media/);
arm;
} elsif ($opts{arch} =~ /armv7\w?/) { } elsif ($opts{arch} =~ /armv7\w?/) {
@ALL_ARCHS = filter(qw/neon_asm neon/); @ALL_ARCHS = filter(qw/neon_asm neon/);
&require(@REQUIRES); &require(@REQUIRES);
......
...@@ -94,9 +94,6 @@ EOF ...@@ -94,9 +94,6 @@ EOF
# alphabetically by architecture, generic-gnu last. # alphabetically by architecture, generic-gnu last.
all_platforms="${all_platforms} arm64-darwin-gcc" all_platforms="${all_platforms} arm64-darwin-gcc"
all_platforms="${all_platforms} arm64-linux-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-android-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8
...@@ -224,8 +221,6 @@ ARCH_EXT_LIST_X86=" ...@@ -224,8 +221,6 @@ ARCH_EXT_LIST_X86="
avx2 avx2
" "
ARCH_EXT_LIST=" ARCH_EXT_LIST="
edsp
media
neon neon
neon_asm neon_asm
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment