cmake: remove rtcd target validation
Leave it up to other parts of the build system to determine
if an architecture is supported.
Treat armv8 like armv7 and do not require neon since the binaries are
compatible.
BUG=aomedia:2166
Change-Id: I65bda707b94a747e0668cd5da63d720421d9b5e0
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 41d8baf..cb64713 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -17,9 +17,6 @@
include(FindPerl)
include(FindThreads)
-set(AOM_SUPPORTED_CPU_TARGETS
- "arm64 armv7 armv7s generic mips32 mips64 ppc x86 x86_64")
-
include("${AOM_ROOT}/build/cmake/aom_config_defaults.cmake")
include("${AOM_ROOT}/build/cmake/aom_experiment_deps.cmake")
include("${AOM_ROOT}/build/cmake/aom_optimization.cmake")
@@ -108,7 +105,7 @@
# work.
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
if("${AOM_TARGET_SYSTEM}" STREQUAL "Linux" AND "${AOM_TARGET_CPU}" MATCHES
- "^armv7")
+ "^armv[78]")
set(AOM_AS_FLAGS ${AOM_AS_FLAGS} --defsym PIC=1)
else()
set(AOM_AS_FLAGS ${AOM_AS_FLAGS} -DPIC)
@@ -116,13 +113,6 @@
endif()
endif()
-if(NOT "${AOM_SUPPORTED_CPU_TARGETS}" MATCHES "${AOM_TARGET_CPU}")
- message(FATAL_ERROR
- "No RTCD support for ${AOM_TARGET_CPU}. Create it, or "
- "add -DAOM_TARGET_CPU=generic to your cmake command line for a "
- "generic build of libaom and tools.")
-endif()
-
if("${AOM_TARGET_CPU}" STREQUAL "x86" OR "${AOM_TARGET_CPU}" STREQUAL "x86_64")
find_program(AS_EXECUTABLE yasm $ENV{YASM_PATH})
if(NOT AS_EXECUTABLE OR ENABLE_NASM)
diff --git a/build/cmake/cpu.cmake b/build/cmake/cpu.cmake
index 6e8089e..ef2d755 100644
--- a/build/cmake/cpu.cmake
+++ b/build/cmake/cpu.cmake
@@ -9,18 +9,7 @@
# can obtain it at www.aomedia.org/license/patent.
#
-if("${AOM_TARGET_CPU}" STREQUAL "arm64")
- set(ARCH_ARM 1)
- set(RTCD_ARCH_ARM "yes")
-
- if(ENABLE_NEON)
- set(HAVE_NEON 1)
- set(RTCD_HAVE_NEON "yes")
- else()
- set(HAVE_NEON 0)
- set(AOM_RTCD_FLAGS ${AOM_RTCD_FLAGS} --disable-neon)
- endif()
-elseif("${AOM_TARGET_CPU}" MATCHES "^armv7")
+if("${AOM_TARGET_CPU}" MATCHES "^arm")
set(ARCH_ARM 1)
set(RTCD_ARCH_ARM "yes")
diff --git a/build/cmake/rtcd.pl b/build/cmake/rtcd.pl
index 46e0690..dafccdc 100755
--- a/build/cmake/rtcd.pl
+++ b/build/cmake/rtcd.pl
@@ -426,10 +426,10 @@
@ALL_ARCHS = filter("$opts{arch}", qw/msa/);
}
mips;
-} elsif ($opts{arch} =~ /armv7\w?/) {
+} elsif ($opts{arch} =~ /armv[78]\w?/) {
@ALL_ARCHS = filter(qw/neon/);
arm;
-} elsif ($opts{arch} eq 'armv8' || $opts{arch} eq 'arm64' ) {
+} elsif ($opts{arch} eq 'arm64' ) {
@ALL_ARCHS = filter(qw/neon/);
&require("neon");
arm;
