Revert "Reapply 91184 with fixes and an addition to the testcase to cover the

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

diff --git a/lib/CodeGen/MachOWriter.h b/lib/CodeGen/MachOWriter.h
index 3067ff122997d3de2e580467f6a43d6a0cbeca52..9273f3854863cc5abee7347fb1180a1a212930f2 100644 (file)
--- a/lib/CodeGen/MachOWriter.h
+++ b/lib/CodeGen/MachOWriter.h
@@ -22,15 +22,16 @@ namespace llvm {
   class Constant;
   class GlobalVariable;
   class Mangler;
+  class MachineBasicBlock;
   class MachineRelocation;
   class MachOCodeEmitter;
-  class MachODySymTab;
-  class MachOHeader;
-  class MachOSection;
-  class MachOSym;
+  struct MachODySymTab;
+  struct MachOHeader;
+  struct MachOSection;
+  struct MachOSym;
   class TargetData;
   class TargetMachine;
-  class TargetAsmInfo;
+  class MCAsmInfo;
   class ObjectCodeEmitter;
   class OutputBuffer;
   class raw_ostream;
@@ -77,7 +78,7 @@ namespace llvm {
     bool is64Bit, isLittleEndian;
 
     // Target Asm Info
-    const TargetAsmInfo *TAI;
+    const MCAsmInfo *MAI;
 
     /// Header - An instance of MachOHeader that we will update while we build
     /// the file, and then emit during finalization.