commit 5fb00e4bd7c8f767a18377c91c99dacc2f74089f
author Vedant Kumar <vsk@apple.com> Wed Jul 27 23:01:55 2016 +0000
committer Vedant Kumar <vsk@apple.com> Wed Jul 27 23:01:55 2016 +0000
tree 9d7d30229e515a2f695d0b0505eca88e0f541abd
parent 436f7d660625d45a306977c31577ac62820df3e3

Revert "[Driver] Compute effective target triples once per job (NFCI)"

This reverts commit r275895 in order to address some post-commit review
feedback from Eric Christopher (see: the list thread for r275895).

llvm-svn: 276936

clang/lib/Driver/ToolChains.h

diff --git a/clang/lib/Driver/ToolChains.h b/clang/lib/Driver/ToolChains.h
index d36a799..e825133 100644
--- a/clang/lib/Driver/ToolChains.h
+++ b/clang/lib/Driver/ToolChains.h
@@ -279,8 +279,7 @@
                               llvm::opt::ArgStringList &CmdArgs) const {}
 
   /// Add the linker arguments to link the compiler runtime library.
-  virtual void AddLinkRuntimeLibArgs(const llvm::Triple &EffectiveTriple,
-                                     const llvm::opt::ArgList &Args,
+  virtual void AddLinkRuntimeLibArgs(const llvm::opt::ArgList &Args,
                                      llvm::opt::ArgStringList &CmdArgs) const;
 
   virtual void addStartObjectFileArgs(const llvm::opt::ArgList &Args,
@@ -304,8 +303,7 @@
 
   /// Add any profiling runtime libraries that are needed. This is essentially a
   /// MachO specific version of addProfileRT in Tools.cpp.
-  void addProfileRTLibs(const llvm::Triple &EffectiveTriple,
-                        const llvm::opt::ArgList &Args,
+  void addProfileRTLibs(const llvm::opt::ArgList &Args,
                         llvm::opt::ArgStringList &CmdArgs) const override {
     // There aren't any profiling libs for embedded targets currently.
   }
@@ -419,8 +417,7 @@
             !isTargetWatchOS());
   }
 
-  void addProfileRTLibs(const llvm::Triple &EffectiveTriple,
-                        const llvm::opt::ArgList &Args,
+  void addProfileRTLibs(const llvm::opt::ArgList &Args,
                         llvm::opt::ArgStringList &CmdArgs) const override;
 
 protected:
@@ -577,8 +574,7 @@
 
   RuntimeLibType GetRuntimeLibType(const llvm::opt::ArgList &Args) const override;
 
-  void AddLinkRuntimeLibArgs(const llvm::Triple &EffectiveTriple,
-                             const llvm::opt::ArgList &Args,
+  void AddLinkRuntimeLibArgs(const llvm::opt::ArgList &Args,
                              llvm::opt::ArgStringList &CmdArgs) const override;
 
   void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args,
@@ -844,8 +840,7 @@
                            llvm::opt::ArgStringList &CC1Args) const override;
   bool isPIEDefault() const override;
   SanitizerMask getSupportedSanitizers() const override;
-  void addProfileRTLibs(const llvm::Triple &EffectiveTriple,
-                        const llvm::opt::ArgList &Args,
+  void addProfileRTLibs(const llvm::opt::ArgList &Args,
                         llvm::opt::ArgStringList &CmdArgs) const override;
   virtual std::string computeSysRoot() const;
 
@@ -909,8 +904,7 @@
   void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args,
                            llvm::opt::ArgStringList &CmdArgs) const override;
 
-  std::string getCompilerRT(const llvm::Triple &EffectiveTriple,
-                            const llvm::opt::ArgList &Args, StringRef Component,
+  std::string getCompilerRT(const llvm::opt::ArgList &Args, StringRef Component,
                             bool Shared = false) const override;
 
   std::string computeSysRoot() const override;