summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorJonathan Metzman <metzman@chromium.org>2019-05-02 16:45:17 +0000
committerJonathan Metzman <metzman@chromium.org>2019-05-02 16:45:17 +0000
commit392b80b1c6c35c2fa8dc2261e01833a66cbb21f2 (patch)
treeb6ac4fc9e4f6bd6f74442cf82d215ac36551ec9c /cmake
parentef06c69c174af3b7c6c91bcda580412f98ace4d8 (diff)
downloadcompiler-rt-392b80b1c6c35c2fa8dc2261e01833a66cbb21f2.tar.gz
[libFuzzer] Re-enable libFuzzer on i386 Linux and fix test
Summary: Re-enable libFuzzer on i386 Linux after it was accidentally disabled. Also disable gc-sections.test on i386 since lld isn't garbage collecting properly with ASAN on i386. Reviewers: morehouse Reviewed By: morehouse Subscribers: srhines, mgorny, #sanitizers, llvm-commits Tags: #sanitizers, #llvm Differential Revision: https://reviews.llvm.org/D61415 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@359802 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/config-ix.cmake15
1 files changed, 8 insertions, 7 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index bf951978d..0ceca962f 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -232,7 +232,14 @@ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}
${MIPS32} ${MIPS64} ${PPC64} ${S390X})
set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64})
set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64})
-if(LINUX)
+
+if(ANDROID)
+ set(OS_NAME "Android")
+else()
+ set(OS_NAME "${CMAKE_SYSTEM_NAME}")
+endif()
+
+if(OS_NAME MATCHES "Linux")
set(ALL_FUZZER_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM64})
else()
set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64})
@@ -526,12 +533,6 @@ if(COMPILER_RT_SUPPORTED_ARCH)
endif()
message(STATUS "Compiler-RT supported architectures: ${COMPILER_RT_SUPPORTED_ARCH}")
-if(ANDROID)
- set(OS_NAME "Android")
-else()
- set(OS_NAME "${CMAKE_SYSTEM_NAME}")
-endif()
-
set(ALL_SANITIZERS asan;dfsan;msan;hwasan;tsan;safestack;cfi;scudo;ubsan_minimal)
set(COMPILER_RT_SANITIZERS_TO_BUILD all CACHE STRING
"sanitizers to build if supported on the target (all;${ALL_SANITIZERS})")