disable-fuzzer-compiler-rt

===================================================================

Gbp-Pq: Name disable-fuzzer-compiler-rt.diff

diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt
index e20cc26f60af8625e1c52202b8c2132b5b3eff04..c0413d2b6d6ba2b912e3d929068ff4b743fc59f3 100644 (file)
--- 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 39082aa06d42e53a4fba3c4e986f5fa480c01dec..96bdad4c322fb72fce5c4e9a7af8a7101e0f3f4f 100644 (file)
--- 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 0d9ac5528886a2620e99c8cb726032775b220f46..323cd1e0bd19c5c5d57140cb163248814aa948a8 100644 (file)
--- 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})