From 05c05ab154453780f10dd5239030461094b315d8 Mon Sep 17 00:00:00 2001 From: Kuba Mracek Date: Fri, 21 Apr 2017 18:02:22 +0000 Subject: [PATCH] Revert r301010: Bot failures on Windows, NetBSD and even some old Darwin. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301012 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Fuzzer/CMakeLists.txt | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/lib/Fuzzer/CMakeLists.txt b/lib/Fuzzer/CMakeLists.txt index c8d5d02771e..d44c12de3e1 100644 --- a/lib/Fuzzer/CMakeLists.txt +++ b/lib/Fuzzer/CMakeLists.txt @@ -11,14 +11,17 @@ if( NOT HAS_THREAD_LOCAL ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dthread_local=__thread") endif() +set(LIBFUZZER_FLAGS_BASE "${CMAKE_CXX_FLAGS}") +# Disable the coverage and sanitizer instrumentation for the fuzzer itself. +set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=trace-pc-guard,edge,trace-cmp,indirect-calls,8bit-counters -Werror") if( LLVM_USE_SANITIZE_COVERAGE ) - set(LIBFUZZER_FLAGS_BASE "${CMAKE_CXX_FLAGS}") - - # Disable the coverage and sanitizer instrumentation for the fuzzer itself. - set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=trace-pc-guard,edge,trace-cmp,indirect-calls,8bit-counters -Werror") -endif() - -add_library(LLVMFuzzerNoMainObjects OBJECT + if(NOT "${LLVM_USE_SANITIZER}" STREQUAL "Address") + message(FATAL_ERROR + "LibFuzzer and its tests require LLVM_USE_SANITIZER=Address and " + "LLVM_USE_SANITIZE_COVERAGE=YES to be set." + ) + endif() + add_library(LLVMFuzzerNoMainObjects OBJECT FuzzerCrossOver.cpp FuzzerDriver.cpp FuzzerExtFunctionsDlsym.cpp @@ -42,24 +45,15 @@ add_library(LLVMFuzzerNoMainObjects OBJECT FuzzerUtilPosix.cpp FuzzerUtilWindows.cpp ) -add_library(LLVMFuzzerNoMain STATIC + add_library(LLVMFuzzerNoMain STATIC $ ) -target_link_libraries(LLVMFuzzerNoMain ${LLVM_PTHREAD_LIB}) -add_library(LLVMFuzzer STATIC + target_link_libraries(LLVMFuzzerNoMain ${LLVM_PTHREAD_LIB}) + add_library(LLVMFuzzer STATIC FuzzerMain.cpp $ ) -target_link_libraries(LLVMFuzzer ${LLVM_PTHREAD_LIB}) - -if( LLVM_USE_SANITIZE_COVERAGE ) - - if(NOT "${LLVM_USE_SANITIZER}" STREQUAL "Address") - message(FATAL_ERROR - "LibFuzzer tests require LLVM_USE_SANITIZER=Address and " - "LLVM_USE_SANITIZE_COVERAGE=YES to be set." - ) - endif() + target_link_libraries(LLVMFuzzer ${LLVM_PTHREAD_LIB}) if( LLVM_INCLUDE_TESTS ) add_subdirectory(test) -- 2.40.0