diff --git a/include/llvm/MC/MCAsmInfo.h b/include/llvm/MC/MCAsmInfo.h index 5e31dfeb0da..f499189a906 100644 --- a/include/llvm/MC/MCAsmInfo.h +++ b/include/llvm/MC/MCAsmInfo.h @@ -195,10 +195,6 @@ namespace llvm { /// directive. bool HasLCOMMDirective; // Defaults to false. - /// COMMDirectiveTakesAlignment - True if COMMDirective take a third - /// argument that specifies the alignment of the declaration. - bool COMMDirectiveTakesAlignment; // Defaults to true. - /// HasDotTypeDotSizeDirective - True if the target has .type and .size /// directives, this is true for most ELF targets. bool HasDotTypeDotSizeDirective; // Defaults to true. @@ -400,9 +396,6 @@ namespace llvm { return SetDirective; } bool hasLCOMMDirective() const { return HasLCOMMDirective; } - bool getCOMMDirectiveTakesAlignment() const { - return COMMDirectiveTakesAlignment; - } bool hasDotTypeDotSizeDirective() const {return HasDotTypeDotSizeDirective;} bool hasSingleParameterDotFile() const { return HasSingleParameterDotFile; } bool hasNoDeadStrip() const { return HasNoDeadStrip; } diff --git a/lib/MC/MCAsmInfo.cpp b/lib/MC/MCAsmInfo.cpp index 547f904d70f..c0ca7e9df9f 100644 --- a/lib/MC/MCAsmInfo.cpp +++ b/lib/MC/MCAsmInfo.cpp @@ -53,7 +53,6 @@ MCAsmInfo::MCAsmInfo() { GlobalDirective = "\t.globl\t"; SetDirective = 0; HasLCOMMDirective = false; - COMMDirectiveTakesAlignment = true; HasDotTypeDotSizeDirective = true; HasSingleParameterDotFile = true; HasNoDeadStrip = false; diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp index bf39239e7a7..0698bd4ea19 100644 --- a/lib/MC/MCAsmStreamer.cpp +++ b/lib/MC/MCAsmStreamer.cpp @@ -254,7 +254,7 @@ void MCAsmStreamer::EmitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) { void MCAsmStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, unsigned ByteAlignment) { OS << "\t.comm\t" << *Symbol << ',' << Size; - if (ByteAlignment != 0 && MAI.getCOMMDirectiveTakesAlignment()) { + if (ByteAlignment != 0) { if (MAI.getAlignmentIsInBytes()) OS << ',' << ByteAlignment; else