From 8bd71a1ec1cf2e24aca43b05319fad82e2c00af7 Mon Sep 17 00:00:00 2001
From: Eli Friedman <eli.friedman@gmail.com>
Date: Thu, 19 May 2011 17:48:09 +0000
Subject: [PATCH] Revert r131644; it's breaking the build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131653 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/MC/MCParser/AsmParser.cpp       | 16 ++++------------
 lib/MC/MCParser/DarwinAsmParser.cpp |  6 ++++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp
index 46e01c55351..179fd8d2693 100644
--- a/lib/MC/MCParser/AsmParser.cpp
+++ b/lib/MC/MCParser/AsmParser.cpp
@@ -27,7 +27,6 @@
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/MC/MCDwarf.h"
-#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/raw_ostream.h"
@@ -37,10 +36,6 @@
 #include <vector>
 using namespace llvm;
 
-static cl::opt<bool>
-FatalAssemblerWarnings("fatal-assembler-warnings",
-                       cl::desc("Consider warnings as error"));
-
 namespace {
 
 /// \brief Helper class for tracking macro definitions.
@@ -133,7 +128,7 @@ public:
   virtual MCContext &getContext() { return Ctx; }
   virtual MCStreamer &getStreamer() { return Out; }
 
-  virtual bool Warning(SMLoc L, const Twine &Meg);
+  virtual void Warning(SMLoc L, const Twine &Meg);
   virtual bool Error(SMLoc L, const Twine &Msg);
 
   const AsmToken &Lex();
@@ -375,12 +370,9 @@ void AsmParser::PrintMacroInstantiations() {
                  "note");
 }
 
-bool AsmParser::Warning(SMLoc L, const Twine &Msg) {
-  if (FatalAssemblerWarnings)
-    return Error(L, Msg);
+void AsmParser::Warning(SMLoc L, const Twine &Msg) {
   PrintMessage(L, Msg, "warning");
   PrintMacroInstantiations();
-  return false;
 }
 
 bool AsmParser::Error(SMLoc L, const Twine &Msg) {
@@ -1137,9 +1129,9 @@ bool AsmParser::ParseStatement() {
     if (!getTargetParser().ParseDirective(ID))
       return false;
 
-    bool retval = Warning(IDLoc, "ignoring directive for now");
+    Warning(IDLoc, "ignoring directive for now");
     EatToEndOfStatement();
-    return retval;
+    return false;
   }
 
   CheckForValidSection();
diff --git a/lib/MC/MCParser/DarwinAsmParser.cpp b/lib/MC/MCParser/DarwinAsmParser.cpp
index 6f450682cbe..3c092cdb19b 100644
--- a/lib/MC/MCParser/DarwinAsmParser.cpp
+++ b/lib/MC/MCParser/DarwinAsmParser.cpp
@@ -369,9 +369,11 @@ bool DarwinAsmParser::ParseDirectiveDumpOrLoad(StringRef Directive,
   // FIXME: If/when .dump and .load are implemented they will be done in the
   // the assembly parser and not have any need for an MCStreamer API.
   if (IsDump)
-    return Warning(IDLoc, "ignoring directive .dump for now");
+    Warning(IDLoc, "ignoring directive .dump for now");
   else
-    return Warning(IDLoc, "ignoring directive .load for now");
+    Warning(IDLoc, "ignoring directive .load for now");
+
+  return false;
 }
 
 /// ParseDirectiveLsym
-- 
2.34.1