Revert rL220675 due to failures on check-clang

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@220677 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/SanitizerArgs.cpp b/lib/Driver/SanitizerArgs.cpp
index 4909a67d15d90d11291457ab3548de008220f074..6a372b08481e4c788cecdc55193f1ef77e91d2dd 100644 (file)
--- a/lib/Driver/SanitizerArgs.cpp
+++ b/lib/Driver/SanitizerArgs.cpp
@@ -267,16 +267,11 @@ unsigned SanitizerArgs::filterUnsupportedKinds(const ToolChain &TC,
                                                const llvm::opt::Arg *A,
                                                bool DiagnoseErrors,
                                                unsigned &DiagnosedKinds) {
-  bool IsFreeBSD = TC.getTriple().getOS() == llvm::Triple::FreeBSD;
   bool IsLinux = TC.getTriple().getOS() == llvm::Triple::Linux;
   bool IsX86 = TC.getTriple().getArch() == llvm::Triple::x86;
   bool IsX86_64 = TC.getTriple().getArch() == llvm::Triple::x86_64;
   if (!(IsLinux && IsX86_64)) {
-    filterUnsupportedMask(TC, Kinds, Memory | DataFlow, Args, A,
-                          DiagnoseErrors, DiagnosedKinds);
-  }
-  if (!((IsLinux || IsFreeBSD) && IsX86_64)) {
-    filterUnsupportedMask(TC, Kinds, Thread, Args, A,
+    filterUnsupportedMask(TC, Kinds, Thread | Memory | DataFlow, Args, A,
                           DiagnoseErrors, DiagnosedKinds);
   }
   if (!(IsLinux && (IsX86 || IsX86_64))) {