1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp
index 8178168ef5..1935914e0e 100644
--- a/lib/Lex/TokenLexer.cpp
+++ b/lib/Lex/TokenLexer.cpp
@@ -444,9 +444,10 @@ bool TokenLexer::PasteTokens(Token &Tok) {
           return true;
         }
       
-        // TODO: If not in assembler language mode.
-        PP.Diag(PasteOpLoc, diag::err_pp_bad_paste)
-        << std::string(Buffer.begin(), Buffer.end()-1);
+        // Do not emit the warning when preprocessing assembler code.
+        if (!PP.getLangOptions().AsmPreprocessor)
+          PP.Diag(PasteOpLoc, diag::err_pp_bad_paste)
+            << std::string(Buffer.begin(), Buffer.end()-1);
         return false;
       }