MCLinker upstream commit c27f2593f4e3.

Change-Id: I41325b6622594ebecd0a494a8d6d298c1c474ac1

1 files changed, 7 insertions, 8 deletions

diff --git a/include/mcld/LinkerConfig.h b/include/mcld/LinkerConfig.h
index 7d52819..9e70ecf 100644
--- a/include/mcld/LinkerConfig.h
+++ b/include/mcld/LinkerConfig.h
@@ -16,6 +16,7 @@
 
 #include <mcld/GeneralOptions.h>
 #include <mcld/ScriptOptions.h>
+#include <mcld/TargetOptions.h>
 #include <mcld/BitcodeOption.h>
 #include <mcld/AttributeOption.h>
 #include <mcld/Support/Path.h>
@@ -39,7 +40,8 @@ public:
     Object,
     DynObj,
     Exec,
-    External
+    External,
+    Binary
   };
 
 public:
@@ -55,6 +57,9 @@ public:
   const ScriptOptions&  scripts() const { return m_Scripts; }
   ScriptOptions&        scripts()       { return m_Scripts; }
 
+  const TargetOptions&  targets() const { return m_Targets; }
+  TargetOptions&        targets()       { return m_Targets; }
+
   const BitcodeOption&  bitcode() const { return m_Bitcode; }
   BitcodeOption&        bitcode()       { return m_Bitcode; }
 
@@ -65,22 +70,16 @@ public:
 
   void setCodeGenType(CodeGenType pType) { m_CodeGenType = pType; }
 
-  const llvm::Triple& triple() const { return m_Triple; }
-
-  void setTriple(const std::string& pTriple);
-
-  void setTriple(const llvm::Triple& pTriple);
-
   static const char* version();
 
 private:
   // -----  General Options  ----- //
   GeneralOptions m_Options;
   ScriptOptions m_Scripts;
+  TargetOptions m_Targets;
   BitcodeOption m_Bitcode;
   AttributeOption m_Attribute;
 
-  llvm::Triple m_Triple;
   CodeGenType m_CodeGenType;
 };