Merge remote-tracking branch 'rnk-github/llvm-dylib-default' into llvm-dylib-default

Author: rnk

bolt/unittests/Core/MemoryMaps.cpp

@@ -12,7 +12,6 @@
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/TargetSelect.h"
-#include "llvm/Testing/Support/Error.h"
 #include "gtest/gtest.h"
 
 using namespace llvm;
@@ -110,7 +109,7 @@ TEST_P(MemoryMapsTester, ParseMultipleSegments) {
   Error Err = DA.preprocessProfile(*BC);
 
   // Ignore errors from perf2bolt when parsing memory events later on.
-  ASSERT_THAT_ERROR(std::move(Err), Succeeded());
+  ASSERT_FALSE(!!Err) << "Expected success";
 
   auto &BinaryMMapInfo = DA.getBinaryMMapInfo();
   auto El = BinaryMMapInfo.find(Pid);

llvm/lib/Testing/Support/CMakeLists.txt

@@ -14,8 +14,6 @@ add_llvm_library(LLVMTestingSupport
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Testing/Support
 
-  DISABLE_LLVM_LINK_LLVM_DYLIB
-
   LINK_COMPONENTS
   Support
   )