diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-04-28 01:08:40 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-04-28 01:08:40 +0000 |
| commit | a3facc5cb53e114a697ac61b30d3dab3a2d75830 (patch) | |
| tree | 434d6bd89f0a5f64f7902928cf409c434a147692 /llvm/lib | |
| parent | 72bdee4c10d6b8afb83837950d771ef2fac4a0cb (diff) | |
| download | bcm5719-llvm-a3facc5cb53e114a697ac61b30d3dab3a2d75830.tar.gz bcm5719-llvm-a3facc5cb53e114a697ac61b30d3dab3a2d75830.zip | |
further simplify EmitAlignment by eliminating the
ForcedAlignBits argument, tweaking the single client of it.
llvm-svn: 102484
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 | ||||
| -rw-r--r-- | llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 5f8c804f5b6..aa6e2b25f8e 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -1154,14 +1154,11 @@ void AsmPrinter::EmitLabelOffsetDifference(const MCSymbol *Hi, uint64_t Offset, // // The algorithm is: // Align = NumBits; -// if (GV && GV->hasalignment) Align = GV->getalignment(); -// Align = std::max(Align, ForcedAlignBits); +// if (GV && GV->hasalignment) Align = GV->getAlignment(); // -void AsmPrinter::EmitAlignment(unsigned NumBits, const GlobalValue *GV, - unsigned ForcedAlignBits) const { +void AsmPrinter::EmitAlignment(unsigned NumBits, const GlobalValue *GV) const { if (GV && GV->getAlignment()) NumBits = Log2_32(GV->getAlignment()); - NumBits = std::max(NumBits, ForcedAlignBits); if (NumBits == 0) return; // No need to emit alignment. diff --git a/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp b/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp index 1c5d624f4c3..c100c590135 100644 --- a/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp +++ b/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp @@ -148,7 +148,7 @@ void XCoreAsmPrinter::EmitGlobalVariable(const GlobalVariable *GV) { llvm_unreachable("Unknown linkage type!"); } - EmitAlignment(Align, GV, 2); + EmitAlignment(Align > 2 ? Align : 2, GV); unsigned Size = TD->getTypeAllocSize(C->getType()); if (GV->isThreadLocal()) { |
