diff --git a/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td b/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
index 4a37ea7..4b43035 100644
--- a/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -101,8 +101,6 @@ 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 err_drv_sanitizer_requires_pie : Error<
-  "%select{Thread|Memory}0Sanitizer requires '-pie'">;
 def err_drv_unknown_objc_runtime : Error<
   "unknown or ill-formed Objective-C runtime '%0'">;
 
diff --git a/llvm/tools/clang/lib/Driver/Tools.cpp b/llvm/tools/clang/lib/Driver/Tools.cpp
index fd2dd25..3008ab5 100644
--- a/llvm/tools/clang/lib/Driver/Tools.cpp
+++ b/llvm/tools/clang/lib/Driver/Tools.cpp
@@ -1513,8 +1513,8 @@ static void addTsanRTLinux(const ToolChain &TC, const ArgList &Args,
                            ArgStringList &CmdArgs) {
   if (!Args.hasArg(options::OPT_shared)) {
     if (!Args.hasArg(options::OPT_pie))
-      TC.getDriver().Diag(diag::err_drv_sanitizer_requires_pie) <<
-        /* Thread */ 0;
+      TC.getDriver().Diag(diag::err_drv_argument_only_allowed_with) <<
+        "-fsanitize=thread" << "-pie";
     // LibTsan is "libclang_rt.tsan-<ArchName>.a" in the Linux library
     // resource directory.
     SmallString<128> LibTsan(TC.getDriver().ResourceDir);
@@ -1534,8 +1534,8 @@ static void addMsanRTLinux(const ToolChain &TC, const ArgList &Args,
                            ArgStringList &CmdArgs) {
   if (!Args.hasArg(options::OPT_shared)) {
     if (!Args.hasArg(options::OPT_pie))
-      TC.getDriver().Diag(diag::err_drv_sanitizer_requires_pie) <<
-        /* Memory */ 1;
+      TC.getDriver().Diag(diag::err_drv_argument_only_allowed_with) <<
+        "-fsanitize=memory" << "-pie";
     // LibMsan is "libclang_rt.msan-<ArchName>.a" in the Linux library
     // resource directory.
     SmallString<128> LibMsan(TC.getDriver().ResourceDir);