diff --git a/include/llvm/MC/MCStreamer.h b/include/llvm/MC/MCStreamer.h
index 36313258c75..8d7d542e6cb 100644
--- a/include/llvm/MC/MCStreamer.h
+++ b/include/llvm/MC/MCStreamer.h
@@ -57,6 +57,7 @@ namespace llvm {
       SK_ARMELFStreamer,
       SK_MachOStreamer,
       SK_PureStreamer,
+      SK_MipsELFStreamer,
       SK_WinCOFFStreamer
     };
 
diff --git a/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h b/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h
index 0d067e063b3..360dbe178cc 100644
--- a/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h
+++ b/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h
@@ -19,12 +19,16 @@ public:
   MipsELFStreamer(MCContext &Context, MCAsmBackend &TAB,
                   raw_ostream &OS, MCCodeEmitter *Emitter,
                   bool RelaxAll, bool NoExecStack)
-    : MCELFStreamer(Context, TAB, OS, Emitter) {
+    : MCELFStreamer(SK_MipsELFStreamer, Context, TAB, OS, Emitter) {
   }
 
   ~MipsELFStreamer() {}
   void emitELFHeaderFlagsCG(const MipsSubtarget &Subtarget);
 //  void emitELFHeaderFlagCG(unsigned Val);
+
+  static bool classof(const MCStreamer *S) {
+    return S->getKind() == SK_MipsELFStreamer;
+  }
 };
 
   MCELFStreamer* createMipsELFStreamer(MCContext &Context, MCAsmBackend &TAB,
diff --git a/lib/Target/Mips/MipsAsmPrinter.cpp b/lib/Target/Mips/MipsAsmPrinter.cpp
index df6baaf474e..07a4faa144c 100644
--- a/lib/Target/Mips/MipsAsmPrinter.cpp
+++ b/lib/Target/Mips/MipsAsmPrinter.cpp
@@ -551,8 +551,8 @@ void MipsAsmPrinter::EmitEndOfAsmFile(Module &M) {
   // Emit Mips ELF register info
   Subtarget->getMReginfo().emitMipsReginfoSectionCG(
              OutStreamer, getObjFileLowering(), *Subtarget);
-  MipsELFStreamer & MES = static_cast<MipsELFStreamer &>(OutStreamer);
-  MES.emitELFHeaderFlagsCG(*Subtarget);
+  if (MipsELFStreamer *MES = dyn_cast<MipsELFStreamer>(&OutStreamer))
+    MES->emitELFHeaderFlagsCG(*Subtarget);
 }
 
 MachineLocation