commit 64df1f177b9d1519075bc46ab4e1413495179ea3
author Viktor Kutuzov <vkutuzov@accesssoftek.com> Mon Oct 27 12:33:10 2014 +0000
committer Viktor Kutuzov <vkutuzov@accesssoftek.com> Mon Oct 27 12:33:10 2014 +0000
tree f8f097c73bb854cf3409de33725133e18b453e71
parent c8f3435f0ea4e8aadf575a1b313ba57390619aa8

Revert rL220675 due to failures on check-clang

llvm-svn: 220677

clang/lib/Driver/SanitizerArgs.cpp

diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp
index 4909a67..6a372b0 100644
--- a/clang/lib/Driver/SanitizerArgs.cpp
+++ b/clang/lib/Driver/SanitizerArgs.cpp
@@ -267,16 +267,11 @@
                                                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))) {