From 8c1c5332c2edd886cafb39c505e7213d1c24cf1e Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Wed, 1 Apr 2020 16:23:55 +0100 Subject: [PATCH] disable-fuzzer-compiler-rt =================================================================== Gbp-Pq: Name disable-fuzzer-compiler-rt.diff --- clang/runtime/CMakeLists.txt | 2 +- compiler-rt/lib/CMakeLists.txt | 5 ++++- compiler-rt/test/CMakeLists.txt | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt index e20cc26f6..c0413d2b6 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -130,7 +130,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) FileCheck count not llvm-nm llvm-objdump llvm-symbolizer) # Add top-level targets for various compiler-rt test suites. - set(COMPILER_RT_TEST_SUITES check-fuzzer check-asan check-hwasan check-asan-dynamic check-dfsan + set(COMPILER_RT_TEST_SUITES check-asan check-hwasan check-asan-dynamic check-dfsan check-lsan check-msan check-sanitizer check-tsan check-ubsan check-ubsan-minimal check-profile check-cfi check-cfi-and-supported check-safestack check-gwp_asan) foreach(test_suite ${COMPILER_RT_TEST_SUITES}) diff --git a/compiler-rt/lib/CMakeLists.txt b/compiler-rt/lib/CMakeLists.txt index 39082aa06..96bdad4c3 100644 --- a/compiler-rt/lib/CMakeLists.txt +++ b/compiler-rt/lib/CMakeLists.txt @@ -57,5 +57,8 @@ if(COMPILER_RT_BUILD_XRAY) endif() if(COMPILER_RT_BUILD_LIBFUZZER) - compiler_rt_build_runtime(fuzzer) + if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" AND + NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + compiler_rt_build_runtime(fuzzer) + endif() endif() diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index 0d9ac5528..323cd1e0b 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -57,7 +57,10 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) # OpenBSD not supporting asan, cannot run the tests if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID) - compiler_rt_test_runtime(fuzzer) + if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" AND + NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + compiler_rt_test_runtime(fuzzer) + endif() endif() foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD}) -- 2.30.2