From 61655f779adcbf7967bf998436c8df0d41073b5d Mon Sep 17 00:00:00 2001 From: Jim Laskey Date: Thu, 15 Jun 2006 13:10:58 +0000 Subject: [PATCH] Alignment of globals has not been quite right. Needed to drop the pointer type to get the alignment of the element type. llvm-svn: 28799 --- lib/CodeGen/AsmPrinter.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp index b3e27c9970f..c5d6cb206fb 100644 --- a/lib/CodeGen/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter.cpp @@ -244,18 +244,16 @@ void AsmPrinter::EmitXXStructorList(Constant *List) { /// specified global, returned in log form. This includes an explicitly /// requested alignment (if the global has one). unsigned AsmPrinter::getPreferredAlignmentLog(const GlobalVariable *GV) const { - unsigned Alignment = TM.getTargetData()->getTypeAlignmentShift(GV->getType()); + const Type *ElemType = GV->getType()->getElementType(); + unsigned Alignment = TM.getTargetData()->getTypeAlignmentShift(ElemType); if (GV->getAlignment() > (1U << Alignment)) Alignment = Log2_32(GV->getAlignment()); if (GV->hasInitializer()) { - // Always round up alignment of global doubles to 8 bytes. - if (GV->getType()->getElementType() == Type::DoubleTy && Alignment < 3) - Alignment = 3; if (Alignment < 4) { // If the global is not external, see if it is large. If so, give it a // larger alignment. - if (TM.getTargetData()->getTypeSize(GV->getType()->getElementType()) > 128) + if (TM.getTargetData()->getTypeSize(ElemType) > 128) Alignment = 4; // 16-byte alignment. } }