| 1 | Fix build flags for ARMv7.
|
| 2 |
|
| 3 | Taken from Debian:
|
| 4 | https://salsa.debian.org/multimedia-team/x265/-/blob/master/debian/patches/0001-Fix-arm-flags.patch
|
| 5 |
|
| 6 | From: Sebastian Ramacher <[email protected]>
|
| 7 | Date: Wed, 26 Apr 2017 22:05:06 +0200
|
| 8 | Subject: Fix arm* flags
|
| 9 |
|
| 10 | ---
|
| 11 | source/CMakeLists.txt | 6 +-----
|
| 12 | 1 file changed, 1 insertion(+), 5 deletions(-)
|
| 13 |
|
| 14 | diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
| 15 | |
| 16 | |
| 17 | @@ -77,7 +77,7 @@ elseif(ARMMATCH GREATER "-1")
|
| 18 | add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=1 -DHAVE_ARMV6=0)
|
| 19 | else()
|
| 20 | message(STATUS "Detected ARM target processor")
|
| 21 | - add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=1)
|
| 22 | + add_definitions(-DX265_ARCH_ARM=1)
|
| 23 | endif()
|
| 24 | else()
|
| 25 | message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
|
| 26 | @@ -252,10 +252,7 @@ if(GCC)
|
| 27 | else()
|
| 28 | find_package(Neon)
|
| 29 | if(CPU_HAS_NEON)
|
| 30 | - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
|
| 31 | add_definitions(-DHAVE_NEON)
|
| 32 | - else()
|
| 33 | - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
|
| 34 | endif()
|
| 35 | endif()
|
| 36 | endif()
|