Index: tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
===================================================================
--- tools/clang/include/clang/Basic/DiagnosticDriverKinds.td	(revision 157315)
+++ tools/clang/include/clang/Basic/DiagnosticDriverKinds.td	(working copy)
@@ -97,6 +97,8 @@
   "-fobjc-arc is not supported on current deployment target">;
 def err_drv_mg_requires_m_or_mm : Error<
   "option '-MG' requires '-M' or '-MM'">;
+def err_drv_asan_android_requires_pie : Error<
+  "AddressSanitizer on Android requires '-pie'">;
 
 def warn_c_kext : Warning<
   "ignoring -fapple-kext which is valid for c++ and objective-c++ only">;
Index: tools/clang/lib/Driver/Tools.cpp
===================================================================
--- tools/clang/lib/Driver/Tools.cpp	(revision 157315)
+++ tools/clang/lib/Driver/Tools.cpp	(working copy)
@@ -1283,6 +1283,8 @@
     return;
   if(TC.getTriple().getEnvironment() == llvm::Triple::ANDROIDEABI) {
     if (!Args.hasArg(options::OPT_shared)) {
+      if (!Args.hasArg(options::OPT_pie))
+        TC.getDriver().Diag(diag::err_drv_asan_android_requires_pie);
       // For an executable, we add a .preinit_array stub.
       CmdArgs.push_back("-u");
       CmdArgs.push_back("__asan_preinit");