[PATCH] Rename clang::driver::tools::linuxtools to clang::driver::tools::gnutools.

Thomas Schwinge thomas at codesourcery.com
Mon Mar 25 09:14:11 PDT 2013


This is about the GNU Binutils' assembler and linker, so reflect that in the
name.
---
 lib/Driver/ToolChains.cpp |    4 ++--
 lib/Driver/Tools.cpp      |   20 ++++++++++----------
 lib/Driver/Tools.h        |    9 ++++-----
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git lib/Driver/ToolChains.cpp lib/Driver/ToolChains.cpp
index eec3845..bcfe51e 100644
--- lib/Driver/ToolChains.cpp
+++ lib/Driver/ToolChains.cpp
@@ -2204,11 +2204,11 @@ bool Linux::HasNativeLLVMSupport() const {
 }
 
 Tool *Linux::buildLinker() const {
-  return new tools::linuxtools::Link(*this);
+  return new tools::gnutools::Link(*this);
 }
 
 Tool *Linux::buildAssembler() const {
-  return new tools::linuxtools::Assemble(*this);
+  return new tools::gnutools::Assemble(*this);
 }
 
 void Linux::addClangTargetOptions(const ArgList &DriverArgs,
diff --git lib/Driver/Tools.cpp lib/Driver/Tools.cpp
index 2581ae3..37e6abb 100644
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -5580,11 +5580,11 @@ void netbsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
 }
 
-void linuxtools::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
-                                        const InputInfo &Output,
-                                        const InputInfoList &Inputs,
-                                        const ArgList &Args,
-                                        const char *LinkingOutput) const {
+void gnutools::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+                                      const InputInfo &Output,
+                                      const InputInfoList &Inputs,
+                                      const ArgList &Args,
+                                      const char *LinkingOutput) const {
   ArgStringList CmdArgs;
 
   // Add --32/--64 to make sure we get the format we want.
@@ -5701,11 +5701,11 @@ static bool hasMipsN32ABIArg(const ArgList &Args) {
   return A && (A->getValue() == StringRef("n32"));
 }
 
-void linuxtools::Link::ConstructJob(Compilation &C, const JobAction &JA,
-                                    const InputInfo &Output,
-                                    const InputInfoList &Inputs,
-                                    const ArgList &Args,
-                                    const char *LinkingOutput) const {
+void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
+                                  const InputInfo &Output,
+                                  const InputInfoList &Inputs,
+                                  const ArgList &Args,
+                                  const char *LinkingOutput) const {
   const toolchains::Linux& ToolChain =
     static_cast<const toolchains::Linux&>(getToolChain());
   const Driver &D = ToolChain.getDriver();
diff --git lib/Driver/Tools.h lib/Driver/Tools.h
index 846c834..0d215ea 100644
--- lib/Driver/Tools.h
+++ lib/Driver/Tools.h
@@ -427,12 +427,11 @@ namespace netbsd {
   };
 } // end namespace netbsd
 
-  /// linux -- Directly call GNU Binutils assembler and linker
-namespace linuxtools {
+  /// Directly call GNU Binutils' assembler and linker.
+namespace gnutools {
   class LLVM_LIBRARY_VISIBILITY Assemble : public Tool  {
   public:
-    Assemble(const ToolChain &TC) : Tool("linux::Assemble", "assembler",
-                                         TC) {}
+    Assemble(const ToolChain &TC) : Tool("GNU::Assemble", "assembler", TC) {}
 
     virtual bool hasIntegratedCPP() const { return false; }
 
@@ -444,7 +443,7 @@ namespace linuxtools {
   };
   class LLVM_LIBRARY_VISIBILITY Link : public Tool  {
   public:
-    Link(const ToolChain &TC) : Tool("linux::Link", "linker", TC) {}
+    Link(const ToolChain &TC) : Tool("GNU::Link", "linker", TC) {}
 
     virtual bool hasIntegratedCPP() const { return false; }
     virtual bool isLinkJob() const { return true; }
-- 
1.7.9.5




More information about the cfe-commits mailing list