Author: gulfemsavrun Date: 2025-08-05T10:02:21-07:00 New Revision: f5aae27909984a0747dce08e7031f843f6693103
URL: https://github.com/llvm/llvm-project/commit/f5aae27909984a0747dce08e7031f843f6693103 DIFF: https://github.com/llvm/llvm-project/commit/f5aae27909984a0747dce08e7031f843f6693103.diff LOG: Revert "[compiler-rt][test] Apply CFLAGS from sanitizer_common to all tests (…" This reverts commit b757bc8b13b1088e2f2b1b98aa33ebb16334b59d. Added: Modified: compiler-rt/cmake/config-ix.cmake compiler-rt/test/sanitizer_common/CMakeLists.txt Removed: ################################################################################ diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 212a09f55b32b..e3310b1ff0e2c 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -309,14 +309,6 @@ macro(get_test_cc_for_arch arch cc_out cflags_out) endif() string(REPLACE ";" " " ${cflags_out} "${${cflags_out}}") endif() - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID) - # ARM on Linux might use the slow unwinder as default and the unwind table - # is required to get a complete stacktrace. - string(APPEND ${cflags_out} " -funwind-tables") - if(CMAKE_SYSROOT) - string(APPEND ${cflags_out} " --sysroot=${CMAKE_SYSROOT}") - endif() - endif() endmacro() # Returns CFLAGS that should be used to run tests for the diff --git a/compiler-rt/test/sanitizer_common/CMakeLists.txt b/compiler-rt/test/sanitizer_common/CMakeLists.txt index b044b9c6c3e08..615666676f57a 100644 --- a/compiler-rt/test/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/test/sanitizer_common/CMakeLists.txt @@ -73,6 +73,17 @@ foreach(tool ${SUPPORTED_TOOLS}) get_test_cc_for_arch(${arch} SANITIZER_COMMON_TEST_TARGET_CC SANITIZER_COMMON_TEST_TARGET_CFLAGS) set(CONFIG_NAME ${tool}-${arch}-${OS_NAME}) + # ARM on Linux might use the slow unwinder as default and the unwind table is + # required to get a complete stacktrace. + if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND NOT ANDROID) + list(APPEND SANITIZER_COMMON_TEST_TARGET_CFLAGS -funwind-tables) + if(CMAKE_SYSROOT) + list(APPEND SANITIZER_COMMON_TEST_TARGET_CFLAGS "--sysroot=${CMAKE_SYSROOT}") + endif() + string(REPLACE ";" " " SANITIZER_COMMON_TEST_TARGET_CFLAGS + "${SANITIZER_COMMON_TEST_TARGET_CFLAGS}") + endif() + configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
