Make the LegalizeType method naming scheme more regular.

[oota-llvm.git] / lib / CodeGen / MachOWriter.h

diff --git a/lib/CodeGen/MachOWriter.h b/lib/CodeGen/MachOWriter.h
index 6c44662bb5e60631d24f013ab44c5093b95b2304..44fa7d4d4492bfd4e57da1f105184e4b0a4db328 100644 (file)
--- a/lib/CodeGen/MachOWriter.h
+++ b/lib/CodeGen/MachOWriter.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Nate Begeman and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -21,6 +21,7 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetMachOWriterInfo.h"
+#include <map>
 
 namespace llvm {
   class GlobalVariable;
@@ -84,7 +85,7 @@ namespace llvm {
   class MachOWriter : public MachineFunctionPass {
     friend class MachOCodeEmitter;
   public:
-    static const char ID;
+    static char ID;
     MachineCodeEmitter &getMachineCodeEmitter() const {
       return *(MachineCodeEmitter*)MCE;
     }
@@ -466,7 +467,7 @@ namespace llvm {
       
       const Type *Ty = C->getType();
       if (Ty->isPrimitiveType() || Ty->isInteger()) {
-        unsigned Size = TM.getTargetData()->getTypeSize(Ty);
+        unsigned Size = TM.getTargetData()->getABITypeSize(Ty);
         switch(Size) {
         default: break; // Fall through to __TEXT,__const
         case 4: