From: Chris Lattner Date: Sun, 4 Jan 2009 20:19:20 +0000 (+0000) Subject: elf writer really wants the size of the global, not the size X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=02b73ab017d4e63ab7f0b020d355f1dfb58bf652;p=oota-llvm.git elf writer really wants the size of the global, not the size of the pointer to the global. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61630 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/ELFWriter.cpp b/lib/CodeGen/ELFWriter.cpp index 683a21e5e49..f0da37aca36 100644 --- a/lib/CodeGen/ELFWriter.cpp +++ b/lib/CodeGen/ELFWriter.cpp @@ -34,7 +34,7 @@ #include "ELFWriter.h" #include "llvm/Module.h" #include "llvm/PassManager.h" -#include "llvm/Type.h" // FIXME: For PATypeHolder::get(). +#include "llvm/DerivedTypes.h" #include "llvm/CodeGen/FileWriters.h" #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/CodeGen/MachineConstantPool.h" @@ -274,9 +274,9 @@ void ELFWriter::EmitGlobal(GlobalVariable *GV) { return; } - const Type *GVType = (const Type*)GV->getType(); unsigned Align = TM.getTargetData()->getPreferredAlignment(GV); - unsigned Size = TM.getTargetData()->getABITypeSize(GVType); + unsigned Size = + TM.getTargetData()->getABITypeSize(GV->getType()->getElementType()); // If this global has a zero initializer, it is part of the .bss or common // section.