Create the specified TargetObjInfo and use it.

llvm-svn: 33291

1 files changed, 18 insertions, 18 deletions

diff --git a/llvm/lib/Target/PowerPC/PPCMachOWriter.cpp b/llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
index ccf2e97a732..d79aa48d362 100644
--- a/llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
+++ b/llvm/lib/Target/PowerPC/PPCMachOWriter.cpp
@@ -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 was developed by Nate Begeman and is distributed under the
+// University of Illinois Open Source License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -17,6 +17,7 @@
 #include "llvm/PassManager.h"
 #include "llvm/CodeGen/MachOWriter.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Target/TargetObjInfo.h"
 using namespace llvm;
 
 namespace {
@@ -91,10 +92,10 @@ void PPCMachOWriter::GetTargetRelocation(MachineRelocation &MR,
       MachORelocation VANILLA(MR.getMachineCodeOffset(), To.Index, false, 2, 
                               isExtern, PPC_RELOC_VANILLA);
       ++From.nreloc;
-      outword(From.RelocBuffer, VANILLA.r_address);
-      outword(From.RelocBuffer, VANILLA.getPackedFields());
+      TOI->outword(From.RelocBuffer, VANILLA.r_address);
+      TOI->outword(From.RelocBuffer, VANILLA.getPackedFields());
     }
-    fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
+    TOI->fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
     break;
   case PPC::reloc_pcrel_bx:
     Addr -= MR.getMachineCodeOffset();
@@ -102,12 +103,12 @@ void PPCMachOWriter::GetTargetRelocation(MachineRelocation &MR,
     Addr &= 0xFFFFFF;
     Addr <<= 2;
     Addr |= (From.SectionData[MR.getMachineCodeOffset()] << 24);
-    fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
+    TOI->fixword(From.SectionData, Addr, MR.getMachineCodeOffset());
     break;
   case PPC::reloc_pcrel_bcx:
     Addr -= MR.getMachineCodeOffset();
     Addr &= 0xFFFC;
-    fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
+    TOI->fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
     break;
   case PPC::reloc_absolute_high:
     {
@@ -117,14 +118,14 @@ void PPCMachOWriter::GetTargetRelocation(MachineRelocation &MR,
                            PPC_RELOC_PAIR);
       ++From.nreloc;
       ++From.nreloc;
-      outword(From.RelocBuffer, HA16.r_address);
-      outword(From.RelocBuffer, HA16.getPackedFields());
-      outword(From.RelocBuffer, PAIR.r_address);
-      outword(From.RelocBuffer, PAIR.getPackedFields());
+      TOI->outword(From.RelocBuffer, HA16.r_address);
+      TOI->outword(From.RelocBuffer, HA16.getPackedFields());
+      TOI->outword(From.RelocBuffer, PAIR.r_address);
+      TOI->outword(From.RelocBuffer, PAIR.getPackedFields());
     }
     printf("ha16: %x\n", (unsigned)Addr);
     Addr += 0x8000;
-    fixhalf(From.SectionData, Addr >> 16, MR.getMachineCodeOffset() + 2);
+    TOI->fixhalf(From.SectionData, Addr >> 16, MR.getMachineCodeOffset() + 2);
     break;
   case PPC::reloc_absolute_low:
     {
@@ -134,13 +135,13 @@ void PPCMachOWriter::GetTargetRelocation(MachineRelocation &MR,
                            PPC_RELOC_PAIR);
       ++From.nreloc;
       ++From.nreloc;
-      outword(From.RelocBuffer, LO16.r_address);
-      outword(From.RelocBuffer, LO16.getPackedFields());
-      outword(From.RelocBuffer, PAIR.r_address);
-      outword(From.RelocBuffer, PAIR.getPackedFields());
+      TOI->outword(From.RelocBuffer, LO16.r_address);
+      TOI->outword(From.RelocBuffer, LO16.getPackedFields());
+      TOI->outword(From.RelocBuffer, PAIR.r_address);
+      TOI->outword(From.RelocBuffer, PAIR.getPackedFields());
     }
     printf("lo16: %x\n", (unsigned)Addr);
-    fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
+    TOI->fixhalf(From.SectionData, Addr, MR.getMachineCodeOffset() + 2);
     break;
   }
 }
@@ -150,4 +151,3 @@ MachineRelocation PPCMachOWriter::GetJTRelocation(unsigned Offset,
   // FIXME: do something about PIC
   return MachineRelocation::getBB(Offset, PPC::reloc_vanilla, MBB);
 }
-