split ARM detection into ARM32 and ARM64 (#512)

Author: farindk

CMakeLists.txt

@@ -99,14 +99,20 @@ if(HAVE_X86)
 endif()
 
 check_c_source_compiles(
-  "#if !defined(__arm__) && !defined(__aarch64__) \
-  && !defined(_M_ARM) && !defined(_M_ARM64)
-  #error not ARM
+  "#if !defined(__arm__) && !defined(_M_ARM)
+  #error not 32-bit ARM
   #endif
   int main(){return 0;}"
-  HAVE_ARM)
+  HAVE_ARM32)
 
-if(HAVE_ARM)
+check_c_source_compiles(
+  "#if !defined(__aarch64__) && !defined(_M_ARM64)
+  #error not 64-bit ARM
+  #endif
+  int main(){return 0;}"
+  HAVE_ARM64)
+
+if(HAVE_ARM32)
   enable_language(ASM)
   check_c_compiler_flag(-mfpu=neon HAVE_NEON)
 endif()

cmake/config.h.in

@@ -3,5 +3,6 @@
 #cmakedefine HAVE_MALLOC_H 1
 #cmakedefine HAVE_POSIX_MEMALIGN 1
 #cmakedefine HAVE_SSE4_1 1
-#cmakedefine HAVE_ARM 1
+#cmakedefine HAVE_ARM32 1
+#cmakedefine HAVE_ARM64 1
 #cmakedefine HAVE_NEON 1

libde265/CMakeLists.txt

@@ -100,11 +100,11 @@ if(HAVE_X86)
   endif()
 endif()
 
-if(HAVE_ARM)
-  add_subdirectory (arm)
+if(HAVE_ARM32)
+  add_subdirectory (arm32)
 endif()
 
-add_library(de265 ${libde265_sources} ${libde265_public_headers} ${ENCODER_OBJECTS} ${X86_OBJECTS} ${ARM_OBJECTS})
+add_library(de265 ${libde265_sources} ${libde265_public_headers} ${ENCODER_OBJECTS} ${X86_OBJECTS} ${ARM32_OBJECTS})
 target_include_directories(de265 PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 write_basic_package_version_file(libde265-config-version.cmake COMPATIBILITY ExactVersion)

libde265/arm/CMakeLists.txt

@@ -0,0 +1,20 @@
+add_library(arm32 OBJECT arm.cc arm.h)
+
+if(HAVE_NEON)
+  add_library(arm32_neon OBJECT
+    cpudetect.S
+    hevcdsp_qpel_neon.S
+  )
+
+  target_compile_options(arm32_neon PRIVATE
+    -mfpu=neon
+    -DHAVE_NEON
+    -DEXTERN_ASM=
+    -DHAVE_AS_FUNC
+    -DHAVE_SECTION_DATA_REL_RO
+  )
+
+  set(ARM32_OBJECTS $<TARGET_OBJECTS:arm32> $<TARGET_OBJECTS:arm32_neon> PARENT_SCOPE)
+else()
+  set(ARM32_OBJECTS $<TARGET_OBJECTS:arm32> PARENT_SCOPE)
+endif()