Extract target triplet from optimized module.

Untabify.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30123 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/LinkTimeOptimizer.h b/include/llvm/LinkTimeOptimizer.h
index 8c38fe5ecfbff8d301422cc99d4ad3d8499fcd3d..d20d21e4c025adbf3a86aa5ec2c887bb128d8fd0 100644 (file)
--- a/include/llvm/LinkTimeOptimizer.h
+++ b/include/llvm/LinkTimeOptimizer.h
@@ -56,8 +56,8 @@ namespace llvm {
     void mayBeNotUsed();
 
     LLVMSymbol (enum LTOLinkageTypes lt, GlobalValue *g, const std::string &n, 
-               const std::string &m) : linkage(lt), gv(g), name(n), 
-                                       mangledName(m) {}
+                const std::string &m) : linkage(lt), gv(g), name(n), 
+                                        mangledName(m) {}
 
     const char *getName() { return name.c_str(); }
     const char *getMangledName() { return mangledName.c_str(); }
@@ -82,13 +82,14 @@ namespace llvm {
 
   public:
     typedef hash_map<const char*, LLVMSymbol*, hash<const char*>, 
-                    string_compare> NameToSymbolMap;
+                     string_compare> NameToSymbolMap;
 
     enum LTOStatus readLLVMObjectFile(const std::string &InputFilename,
-                                     NameToSymbolMap &symbols,
-                                     std::set<std::string> &references);
+                                      NameToSymbolMap &symbols,
+                                      std::set<std::string> &references);
     enum LTOStatus optimizeModules(const std::string &OutputFilename,
-                                  std::vector<const char*> &exportList);
+                                   std::vector<const char*> &exportList,
+                                   std::string &targetTriple);
 
   private:
     std::vector<Module *> modules;

diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp
index a73795391671f442484e9e8cb89707396ec5f40c..df9634e5a2a444eb3938391f5e346ffa213000b3 100644 (file)
--- a/tools/lto/lto.cpp
+++ b/tools/lto/lto.cpp
@@ -266,7 +266,8 @@ static enum LTOStatus lto_optimize(Module *M, std::ostream &Out,
 /// Return appropriate LTOStatus.
 enum LTOStatus
 LinkTimeOptimizer::optimizeModules(const std::string &OutputFilename,
-                                   std::vector<const char *> &exportList)
+                                   std::vector<const char *> &exportList,
+                                   std::string &targetTriple)
 {
   if (modules.empty())
     return LTO_NO_WORK;
@@ -316,6 +317,8 @@ LinkTimeOptimizer::optimizeModules(const std::string &OutputFilename,
     return status;
   }
 
+  targetTriple = bigOne->getTargetTriple();
+
   // Run GCC to assemble and link the program into native code.
   //
   // Note: