Merge pull request uxlfoundation#991 from hvdijk/improve-arm-processor-checks

Improve ARM processor checks.

Author: hvdijk

modules/compiler/targets/host/CMakeLists.txt

@@ -151,9 +151,8 @@ if(CA_HOST_CROSS_COMPILERS)
     else()
       set(HostArchitecture x86_64)
     endif()
-  elseif(CMAKE_SYSTEM_PROCESSOR_TOUPPER STREQUAL ARM OR
-         CMAKE_SYSTEM_PROCESSOR_TOUPPER STREQUAL AARCH64 OR
-         CMAKE_SYSTEM_PROCESSOR_TOUPPER STREQUAL ARM64)
+  elseif(CMAKE_SYSTEM_PROCESSOR_TOUPPER MATCHES "^ARM" OR
+         CMAKE_SYSTEM_PROCESSOR_TOUPPER STREQUAL AARCH64)
     if(CA_BUILD_32_BITS OR CMAKE_SIZEOF_VOID_P EQUAL 4)
       set(HostArchitecture arm)
     else()

modules/compiler/vecz/test/lit/lit.site.cfg.py.in

@@ -31,7 +31,7 @@ lit_config.load_config(config, common_lit_cfg_path)
 
 if '@CMAKE_SYSTEM_PROCESSOR@'.casefold() in ['aarch64', 'arm64']:
     config.available_features.add('aarch64')
-elif '@CMAKE_SYSTEM_PROCESSOR@'.casefold() == 'arm':
+elif '@CMAKE_SYSTEM_PROCESSOR@'.casefold().startswith('arm'):
     config.available_features.add('arm')
 
 # Some lit tests may fail when cross-compiled, so add the native feature if not

modules/lit/lit.common.cfg.in

@@ -98,7 +98,7 @@ elif config.system_processor in ('x86', 'i686'):
     config.available_features.add('x86')
 elif config.system_processor in ('aarch64', 'arm64'):
     config.available_features.add('aarch64')
-elif config.system_processor in ('arm', 'armv7'):
+elif config.system_processor.startswith('arm'):
     config.available_features.add('arm32')
 
 config.ca_host_os = '@CMAKE_SYSTEM_NAME@'

modules/mux/targets/CMakeLists.txt

@@ -81,10 +81,10 @@ function(get_ca_host_arch parent_variable_name)
     string(TOUPPER "${CMAKE_SYSTEM_PROCESSOR}" ARCH)
   endif()
 
-  if(ARCH STREQUAL "ARM")
-    set(${parent_variable_name} "Arm" PARENT_SCOPE)
-  elseif(ARCH STREQUAL "ARM64" OR ARCH STREQUAL "AARCH64")
+  if(ARCH STREQUAL "ARM64" OR ARCH STREQUAL "AARCH64")
     set(${parent_variable_name} "AArch64" PARENT_SCOPE)
+  elseif(ARCH MATCHES "^ARM")
+    set(${parent_variable_name} "Arm" PARENT_SCOPE)
   elseif(ARCH MATCHES "^(I[3-6]86|X86)$")
     set(${parent_variable_name} "x86" PARENT_SCOPE)
   elseif(ARCH STREQUAL "X86_64" OR ARCH STREQUAL "AMD64")