diff --git a/include/llvm/MC/MCStreamer.h b/include/llvm/MC/MCStreamer.h
index c49f2582d09..f4545bef224 100644
--- a/include/llvm/MC/MCStreamer.h
+++ b/include/llvm/MC/MCStreamer.h
@@ -164,7 +164,7 @@ namespace llvm {
     /// @param Symbol - The zerofill symbol to emit, if non-NULL.
     /// @param Size - The size of the zerofill symbol.
     /// @param Pow2Alignment - The alignment of the zerofill symbol if non-zero.
-    virtual void EmitZerofill(MCSection *Section, MCSymbol *Symbol = 0,
+    virtual void EmitZerofill(const MCSection *Section, MCSymbol *Symbol = 0,
                               unsigned Size = 0,unsigned Pow2Alignment = 0) = 0;
 
     /// @}
diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp
index 60c737a9488..4c2f128b1da 100644
--- a/lib/MC/MCAsmStreamer.cpp
+++ b/lib/MC/MCAsmStreamer.cpp
@@ -58,7 +58,7 @@ public:
   virtual void EmitCommonSymbol(MCSymbol *Symbol, unsigned Size,
                                 unsigned Pow2Alignment, bool IsLocal);
 
-  virtual void EmitZerofill(MCSection *Section, MCSymbol *Symbol = NULL,
+  virtual void EmitZerofill(const MCSection *Section, MCSymbol *Symbol = 0,
                             unsigned Size = 0, unsigned Pow2Alignment = 0);
 
   virtual void EmitBytes(const StringRef &Data);
@@ -189,7 +189,7 @@ void MCAsmStreamer::EmitCommonSymbol(MCSymbol *Symbol, unsigned Size,
   OS << '\n';
 }
 
-void MCAsmStreamer::EmitZerofill(MCSection *Section, MCSymbol *Symbol,
+void MCAsmStreamer::EmitZerofill(const MCSection *Section, MCSymbol *Symbol,
                                  unsigned Size, unsigned Pow2Alignment) {
   // Note: a .zerofill directive does not switch sections.
   OS << ".zerofill ";
diff --git a/lib/MC/MCMachOStreamer.cpp b/lib/MC/MCMachOStreamer.cpp
index f5887dbc817..7e8a715eaaf 100644
--- a/lib/MC/MCMachOStreamer.cpp
+++ b/lib/MC/MCMachOStreamer.cpp
@@ -107,7 +107,7 @@ public:
   virtual void EmitCommonSymbol(MCSymbol *Symbol, unsigned Size,
                                 unsigned Pow2Alignment, bool IsLocal);
 
-  virtual void EmitZerofill(MCSection *Section, MCSymbol *Symbol = NULL,
+  virtual void EmitZerofill(const MCSection *Section, MCSymbol *Symbol = 0,
                             unsigned Size = 0, unsigned Pow2Alignment = 0);
 
   virtual void EmitBytes(const StringRef &Data);
@@ -273,7 +273,7 @@ void MCMachOStreamer::EmitCommonSymbol(MCSymbol *Symbol, unsigned Size,
   llvm_unreachable("FIXME: Not yet implemented!");
 }
 
-void MCMachOStreamer::EmitZerofill(MCSection *Section, MCSymbol *Symbol,
+void MCMachOStreamer::EmitZerofill(const MCSection *Section, MCSymbol *Symbol,
                                    unsigned Size, unsigned Pow2Alignment) {
   llvm_unreachable("FIXME: Not yet implemented!");
 }
diff --git a/lib/MC/MCNullStreamer.cpp b/lib/MC/MCNullStreamer.cpp
index 61a9d49bcc9..14534ed01b1 100644
--- a/lib/MC/MCNullStreamer.cpp
+++ b/lib/MC/MCNullStreamer.cpp
@@ -46,7 +46,7 @@ namespace {
     virtual void EmitCommonSymbol(MCSymbol *Symbol, unsigned Size,
                                   unsigned Pow2Alignment, bool IsLocal) {}
 
-    virtual void EmitZerofill(MCSection *Section, MCSymbol *Symbol = NULL,
+    virtual void EmitZerofill(const MCSection *Section, MCSymbol *Symbol = 0,
                               unsigned Size = 0, unsigned Pow2Alignment = 0) {}
 
     virtual void EmitBytes(const StringRef &Data) {}