Index: lib/Target/Mips/AsmParser/MipsAsmParser.cpp
===================================================================
--- lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -2482,7 +2482,6 @@
 bool MipsAsmParser::parseSetAtDirective() {
   // Line can be .set at - defaults to $1
   // or .set at=$reg
-  // FIXME: AtRegNo should be unsigned
   int AtRegNo;
   getParser().Lex();
   if (getLexer().is(AsmToken::EndOfStatement)) {
@@ -2506,7 +2505,6 @@
       return false;
     }
 
-    // FIXME: Remove this check (setATReg also checks if AtRegNo < 31).
     if (AtRegNo < 0 || AtRegNo > 31) {
       reportParseError("unexpected token in statement");
       return false;
@@ -2576,7 +2574,7 @@
     return false;
   }
   if (Options.isReorder()) {
-    reportParseError("you must '.set noreorder' before '.set nomacro'");
+    reportParseError("`noreorder' must be set before `nomacro'");
     return false;
   }
   Options.setNomacro();
@@ -3046,7 +3044,8 @@
   }
 
   // Unknown option.
-  Warning(Parser.getTok().getLoc(), "unknown option");
+  Warning(Parser.getTok().getLoc(), 
+          "unknown option, expected 'pic0' or 'pic2'");
   Parser.eatToEndOfStatement();
   return false;
 }