commit 87d948ecccffea9e9e37d0d053b246e2d6d6c47b
author Pirama Arumuga Nainar <pirama@google.com> Thu Mar 03 15:49:35 2016 -0800
committer Pirama Arumuga Nainar <pirama@google.com> Thu Mar 17 11:39:25 2016 -0700
tree 99fff4ac7dfe8322a1da3978352299e8f18e10d8
parent 574b9e18c787103e70b7c4f2eb225fbeffcfd476

Update aosp/master clang for rebase to r256229

http://b/26987366

Change-Id: I5d349c9843ea5c24d6e455956f8a446393b6873d

lib/Driver/CrossWindowsToolChain.cpp

diff --git a/lib/Driver/CrossWindowsToolChain.cpp b/lib/Driver/CrossWindowsToolChain.cpp
index 82456e7..57bf896 100644
--- a/lib/Driver/CrossWindowsToolChain.cpp
+++ b/lib/Driver/CrossWindowsToolChain.cpp
@@ -107,11 +107,16 @@
   }
 }
 
+clang::SanitizerMask CrossWindowsToolChain::getSupportedSanitizers() const {
+  SanitizerMask Res = ToolChain::getSupportedSanitizers();
+  Res |= SanitizerKind::Address;
+  return Res;
+}
+
 Tool *CrossWindowsToolChain::buildLinker() const {
-  return new tools::CrossWindows::Link(*this);
+  return new tools::CrossWindows::Linker(*this);
 }
 
 Tool *CrossWindowsToolChain::buildAssembler() const {
-  return new tools::CrossWindows::Assemble(*this);
+  return new tools::CrossWindows::Assembler(*this);
 }
-