4 files changed, 6 insertions, 16 deletions
diff --git a/include/llvm/MC/MCAsmInfo.h b/include/llvm/MC/MCAsmInfo.h
index 82a47874ae..0be27530f2 100644
--- a/include/llvm/MC/MCAsmInfo.h
+++ b/include/llvm/MC/MCAsmInfo.h
@@ -113,7 +113,6 @@ namespace llvm {
     /// "\t.zero\t" and "\t.space\t".  If this is set to null, the
     /// Data*bitsDirective's will be used to emit zero bytes.
     const char *ZeroDirective;               // Defaults to "\t.zero\t"
-    const char *ZeroDirectiveSuffix;         // Defaults to ""
 
     /// AsciiDirective - This directive allows emission of an ascii string with
     /// the standard C escape characters embedded into it.
@@ -375,9 +374,6 @@ namespace llvm {
     const char *getZeroDirective() const {
       return ZeroDirective;
     }
-    const char *getZeroDirectiveSuffix() const {
-      return ZeroDirectiveSuffix;
-    }
     const char *getAsciiDirective() const {
       return AsciiDirective;
     }
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 9da8a29ffe..c22e501f53 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -916,16 +916,12 @@ void AsmPrinter::EmitAlignment(unsigned NumBits, const GlobalValue *GV,
 /// EmitZeros - Emit a block of zeros.
 ///
 void AsmPrinter::EmitZeros(uint64_t NumZeros, unsigned AddrSpace) const {
-  if (NumZeros) {
-    if (MAI->getZeroDirective()) {
-      O << MAI->getZeroDirective() << NumZeros;
-      if (MAI->getZeroDirectiveSuffix())
-        O << MAI->getZeroDirectiveSuffix();
-      O << '\n';
-    } else {
-      for (; NumZeros; --NumZeros)
-        O << MAI->getData8bitsDirective(AddrSpace) << "0\n";
-    }
+  if (NumZeros == 0) return;
+  if (MAI->getZeroDirective()) {
+    O << MAI->getZeroDirective() << NumZeros << '\n';
+  } else {
+    for (; NumZeros; --NumZeros)
+      O << MAI->getData8bitsDirective(AddrSpace) << "0\n";
   }
 }
 
diff --git a/lib/MC/MCAsmInfo.cpp b/lib/MC/MCAsmInfo.cpp
index 731ccf955b..cc03614157 100644
--- a/lib/MC/MCAsmInfo.cpp
+++ b/lib/MC/MCAsmInfo.cpp
@@ -37,7 +37,6 @@ MCAsmInfo::MCAsmInfo() {
   AllowQuotesInName = false;
   AllowNameToStartWithDigit = false;
   ZeroDirective = "\t.zero\t";
-  ZeroDirectiveSuffix = 0;
   AsciiDirective = "\t.ascii\t";
   AscizDirective = "\t.asciz\t";
   Data8bitsDirective = "\t.byte\t";
diff --git a/lib/Target/X86/X86MCAsmInfo.cpp b/lib/Target/X86/X86MCAsmInfo.cpp
index 9d7e66debb..001ce80728 100644
--- a/lib/Target/X86/X86MCAsmInfo.cpp
+++ b/lib/Target/X86/X86MCAsmInfo.cpp
@@ -109,7 +109,6 @@ X86WinMCAsmInfo::X86WinMCAsmInfo(const Triple &Triple) {
   PrivateGlobalPrefix = "$";
   AlignDirective = "\tALIGN\t";
   ZeroDirective = "\tdb\t";
-  ZeroDirectiveSuffix = " dup(0)";
   AsciiDirective = "\tdb\t";
   AscizDirective = 0;
   Data8bitsDirective = "\tdb\t";