commit 0e40c373f017eebf2aa5c4610ca721788b918aa7
author Stephen Hines <srhines@google.com> Fri May 30 23:00:47 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 30 23:00:48 2014 +0000
tree f1337fde297b5ca3f9d5c17789031f717bdfe63c
parent 5d111f732f708e8d2cc8a0f16a50cb5a37000963
parent 283d8cbf5b3a6888c70f7931a54da9256e13d357

Merge "Fix up MCLinker build to work with LLVM 3.5 (r209713)."

include/mcld/Support/MemoryArea.h

diff --git a/include/mcld/Support/MemoryArea.h b/include/mcld/Support/MemoryArea.h
index c45b8ca..2fef506 100644
--- a/include/mcld/Support/MemoryArea.h
+++ b/include/mcld/Support/MemoryArea.h
@@ -41,7 +41,7 @@
   size_t size() const;
 
 private:
-  llvm::OwningPtr<llvm::MemoryBuffer> m_pMemoryBuffer;
+  std::unique_ptr<llvm::MemoryBuffer> m_pMemoryBuffer;
 };
 
 } // namespace of mcld

include/mcld/Support/raw_ostream.h

diff --git a/include/mcld/Support/raw_ostream.h b/include/mcld/Support/raw_ostream.h
index e202019..aae2336 100644
--- a/include/mcld/Support/raw_ostream.h
+++ b/include/mcld/Support/raw_ostream.h
@@ -9,6 +9,7 @@
 #ifndef MCLD_SUPPORT_RAWOSTREAM_H
 #define MCLD_SUPPORT_RAWOSTREAM_H
 #include <string>
+#include <llvm/Support/FileSystem.h>
 #include <llvm/Support/raw_ostream.h>
 
 namespace mcld {

lib/CodeGen/MCLDTargetMachine.cpp

diff --git a/lib/CodeGen/MCLDTargetMachine.cpp b/lib/CodeGen/MCLDTargetMachine.cpp
index 9f71390..e1d9a0e 100644
--- a/lib/CodeGen/MCLDTargetMachine.cpp
+++ b/lib/CodeGen/MCLDTargetMachine.cpp
@@ -77,10 +77,10 @@
                        generated assembly code to make it more readable."),
               cl::init(cl::BOU_UNSET));
 
-static bool getVerboseAsm() {
+static bool getVerboseAsm(TargetMachine &TM) {
   switch (ArgAsmVerbose) {
   default:
-  case cl::BOU_UNSET: return TargetMachine::getAsmVerbosityDefault();
+  case cl::BOU_UNSET: return TM.getAsmVerbosityDefault();
   case cl::BOU_TRUE:  return true;
   case cl::BOU_FALSE: return false;
   }
@@ -212,7 +212,7 @@
   case CGFT_ASMFile: {
     assert(Context != 0 && "Failed to get MCContext");
 
-    if (getTM().hasMCSaveTempLabels())
+    if (getTM().Options.MCOptions.MCSaveTempLabels)
       Context->setAllowTemporaryLabels(false);
 
     if (addCompilerPasses(pPM,
@@ -224,7 +224,7 @@
   case CGFT_OBJFile: {
     assert(Context != 0 && "Failed to get MCContext");
 
-    if (getTM().hasMCSaveTempLabels())
+    if (getTM().Options.MCOptions.MCSaveTempLabels)
       Context->setAllowTemporaryLabels(false);
     if (addAssemblerPasses(pPM,
                            pOutput.formatted_os(),
@@ -302,9 +302,8 @@
   // now, we have MCCodeEmitter and MCAsmBackend, we can create AsmStreamer.
   OwningPtr<MCStreamer> AsmStreamer(
     m_pLLVMTarget->createAsmStreamer(*Context, pOutput,
-                                     getVerboseAsm(),
-                                     getTM().hasMCUseCFI(),
-                                     getTM().hasMCUseDwarfDirectory(),
+                                     getVerboseAsm(getTM()),
+                                     getTM().Options.MCOptions.MCUseDwarfDirectory,
                                      InstPrinter,
                                      MCE, MAB,
                                      ArgShowMCInst));
@@ -340,8 +339,8 @@
 
   // now, we have MCCodeEmitter and MCAsmBackend, we can create AsmStreamer.
   OwningPtr<MCStreamer> AsmStreamer(m_pLLVMTarget->createMCObjectStreamer(
-    m_Triple, *Context, *MAB, pOutput, MCE, STI, getTM().hasMCRelaxAll(),
-    getTM().hasMCNoExecStack()));
+    m_Triple, *Context, *MAB, pOutput, MCE, STI,
+    getTM().Options.MCOptions.MCRelaxAll, getTM().Options.MCOptions.MCNoExecStack));
 
   AsmStreamer.get()->InitSections();
   MachineFunctionPass *funcPass =

lib/Support/ToolOutputFile.cpp

diff --git a/lib/Support/ToolOutputFile.cpp b/lib/Support/ToolOutputFile.cpp
index 92a3fab..3e4844c 100644
--- a/lib/Support/ToolOutputFile.cpp
+++ b/lib/Support/ToolOutputFile.cpp
@@ -15,6 +15,7 @@
 #include <mcld/Support/SystemUtils.h>
 #include <mcld/Support/MsgHandling.h>
 
+#include <llvm/Support/FileUtilities.h>
 #include <llvm/Support/Signals.h>
 #include <llvm/Support/Path.h>
 #include <llvm/Support/FormattedStream.h>