summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/Target/Mips/MipsAsmPrinter.cpp3
-rw-r--r--llvm/test/CodeGen/Mips/null.ll2
2 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Target/Mips/MipsAsmPrinter.cpp b/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
index 3ed6c55b5d6..8cc645f73fb 100644
--- a/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
+++ b/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
@@ -200,7 +200,8 @@ void MipsAsmPrinter::EmitFunctionEntryLabel() {
OutStreamer.EmitRawText(StringRef("\t.set\tmips16"));
else
OutStreamer.EmitRawText(StringRef("\t.set\tnomips16"));
- OutStreamer.EmitRawText(StringRef("\t.set\tnomicromips"));
+ // leave out until FSF available gas has micromips changes
+ // OutStreamer.EmitRawText(StringRef("\t.set\tnomicromips"));
OutStreamer.EmitRawText("\t.ent\t" + Twine(CurrentFnSym->getName()));
}
OutStreamer.EmitLabel(CurrentFnSym);
diff --git a/llvm/test/CodeGen/Mips/null.ll b/llvm/test/CodeGen/Mips/null.ll
index f34f6a4b8cb..7beae99c455 100644
--- a/llvm/test/CodeGen/Mips/null.ll
+++ b/llvm/test/CodeGen/Mips/null.ll
@@ -6,7 +6,7 @@ entry:
ret i32 0
; 16: .set mips16 # @main
-; 16: .set nomicromips
+
; 16: jr $ra
OpenPOWER on IntegriCloud