[PATCH 1002/1017] check CMAKE_LIBRARY_ARCHITECTURE instead of CMAKE_SYSTEM_PROCESSOR

e.g. architecture armhf runs on an aarch64 processor, too

Gbp-Pq: Name 1002-check-CMAKE_LIBRARY_ARCHITECTURE-instead-of-CMAKE_SY.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5521bb852205a1959d32e814e76fc12916da71a..a31872cabbad67662d5fff5da7704e5038248b85 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,10 @@ cmake_policy(SET CMP0067 OLD)
 project(pocl)
 set(CMAKE_PROJECT_DESCRIPTION "pocl is a portable OpenCl runtime.")
 
+MESSAGE(STATUS "CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
+MESSAGE(STATUS "CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
+MESSAGE(STATUS "CMAKE_LIBRARY_ARCHITECTURE: ${CMAKE_LIBRARY_ARCHITECTURE}")
+
 set(LATEST_KNOWN_CXX_STD_VERSION "20")
 set(SUPPORTED_CXX_STD_VERSION "11")
 

diff --git a/tests/kernel/CMakeLists.txt b/tests/kernel/CMakeLists.txt
index 25ee0b7bcff1b18ed52b579f380070b29e55b3d9..6ef0e357465a80ec0553edf07477eb82c44149c1 100644 (file)
--- a/tests/kernel/CMakeLists.txt
+++ b/tests/kernel/CMakeLists.txt
@@ -242,12 +242,13 @@ if (NOT ENABLE_POCL_FLOAT_CONVERSION)
   # on most platforms, the printf tests for vector types expose bugs in the
   # pocl printf implementation (passing of variadic arguments containing OpenCL
   # vector types) and maybe also related bugs in llvm (issue #682, #1007)
-  if(NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR
-          CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x"))
+  if(NOT (CMAKE_LIBRARY_ARCHITECTURE STREQUAL "aarch64-linux-gnu" OR
+          CMAKE_LIBRARY_ARCHITECTURE STREQUAL "s390x-linux-gnu"))
     set_tests_properties("kernel/test_printf_vectors"
                         "kernel/test_printf_vectors_ulongn"
       PROPERTIES WILL_FAIL 1)
   endif()
+
 endif()
 
 add_test_pocl(NAME "kernel/test_sizeof_uint"