diff options
| author | Tom Finegan <tomfinegan@google.com> | 2019-03-06 11:18:22 -0800 |
|---|---|---|
| committer | James Cowgill <jcowgill@debian.org> | 2019-08-31 23:20:17 +0100 |
| commit | e7789dac4f9c25c3fe7dc0b685888612f408dd02 (patch) | |
| tree | 3c2b3e293980acd087331564a3dcb0e7160db2e3 | |
| parent | d35ef5972f4a0f2059b358db061d3daec9b5ab29 (diff) | |
cmake: Fix arm neon intrinsic flag handling bugs.
- Apply -mfpu=neon only to the sources for which it's intended
instead of all sources for all targets when using the armv7
linux toolchain.
- Fix references of the intrinsic flag variable in av1.cmake.
Change-Id: I06193a98f04d5c29164b3a14b2d9dd11db90800a
(cherry picked from commit 10d753fdf20a0112d48ce029737c03d9cabee839)
| -rw-r--r-- | av1/av1.cmake | 4 | ||||
| -rw-r--r-- | build/cmake/toolchains/armv7-linux-gcc.cmake | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/av1/av1.cmake b/av1/av1.cmake index 1c7f937e1..b36c82860 100644 --- a/av1/av1.cmake +++ b/av1/av1.cmake @@ -421,13 +421,13 @@ function(setup_av1_targets) if(HAVE_NEON) if(AOM_AV1_COMMON_INTRIN_NEON) - add_intrinsics_object_library("${AOM_INTRIN_NEON_FLAG}" "neon" + add_intrinsics_object_library("${AOM_NEON_INTRIN_FLAG}" "neon" "aom_av1_common" "AOM_AV1_COMMON_INTRIN_NEON" "aom") endif() if(AOM_AV1_ENCODER_INTRIN_NEON) - add_intrinsics_object_library("${AOM_INTRIN_NEON_FLAG}" "neon" + add_intrinsics_object_library("${AOM_NEON_INTRIN_FLAG}" "neon" "aom_av1_encoder" "AOM_AV1_ENCODER_INTRIN_NEON" "aom") endif() diff --git a/build/cmake/toolchains/armv7-linux-gcc.cmake b/build/cmake/toolchains/armv7-linux-gcc.cmake index 7d3d63085..6cbc2a8cf 100644 --- a/build/cmake/toolchains/armv7-linux-gcc.cmake +++ b/build/cmake/toolchains/armv7-linux-gcc.cmake @@ -28,16 +28,13 @@ endif() set(CMAKE_C_COMPILER ${CROSS}gcc) set(CMAKE_CXX_COMPILER ${CROSS}g++) set(AS_EXECUTABLE ${CROSS}as) -set(CMAKE_C_COMPILER_ARG1 - "-march=armv7-a -mfpu=neon ${AOM_EXTRA_TOOLCHAIN_FLAGS}") -set(CMAKE_CXX_COMPILER_ARG1 - "-march=armv7-a -mfpu=neon ${AOM_EXTRA_TOOLCHAIN_FLAGS}") +set(CMAKE_C_COMPILER_ARG1 "-march=armv7-a ${AOM_EXTRA_TOOLCHAIN_FLAGS}") +set(CMAKE_CXX_COMPILER_ARG1 "-march=armv7-a ${AOM_EXTRA_TOOLCHAIN_FLAGS}") set(AOM_AS_FLAGS --defsym ARCHITECTURE=7 -march=armv7-a -mfpu=neon ${AOM_EXTRA_TOOLCHAIN_FLAGS}) set(CMAKE_SYSTEM_PROCESSOR "armv7") -# No intrinsics flag required for armv7-linux-gcc. -set(AOM_NEON_INTRIN_FLAG "") +set(AOM_NEON_INTRIN_FLAG "-mfpu=neon") # No runtime cpu detect for armv7-linux-gcc. set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") |