From 6670e002d24e7ccba9caae55c94325c06f1dadc7 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Fri, 24 May 2019 17:36:07 +0000 Subject: [PATCH] [WebAssembly] Use "linker" as linker shortname. This is in line with other platforms. Also, move the single statement methods into the header (also in line with other platform). Differential Revision: https://reviews.llvm.org/D62406 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@361651 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains/WebAssembly.cpp | 7 ------- lib/Driver/ToolChains/WebAssembly.h | 7 ++++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/Driver/ToolChains/WebAssembly.cpp b/lib/Driver/ToolChains/WebAssembly.cpp index 657f686f8a..af6e856b9f 100644 --- a/lib/Driver/ToolChains/WebAssembly.cpp +++ b/lib/Driver/ToolChains/WebAssembly.cpp @@ -22,9 +22,6 @@ using namespace clang::driver::toolchains; using namespace clang; using namespace llvm::opt; -wasm::Linker::Linker(const ToolChain &TC) - : GnuTool("wasm::Linker", "lld", TC) {} - /// Following the conventions in https://wiki.debian.org/Multiarch/Tuples, /// we remove the vendor field to form the multiarch triple. static std::string getMultiarchTriple(const Driver &D, @@ -34,10 +31,6 @@ static std::string getMultiarchTriple(const Driver &D, TargetTriple.getOSAndEnvironmentName()).str(); } -bool wasm::Linker::isLinkJob() const { return true; } - -bool wasm::Linker::hasIntegratedCPP() const { return false; } - std::string wasm::Linker::getLinkerPath(const ArgList &Args) const { const ToolChain &ToolChain = getToolChain(); if (const Arg* A = Args.getLastArg(options::OPT_fuse_ld_EQ)) { diff --git a/lib/Driver/ToolChains/WebAssembly.h b/lib/Driver/ToolChains/WebAssembly.h index 75ae1fc5a0..8e4e545c98 100644 --- a/lib/Driver/ToolChains/WebAssembly.h +++ b/lib/Driver/ToolChains/WebAssembly.h @@ -20,9 +20,10 @@ namespace wasm { class LLVM_LIBRARY_VISIBILITY Linker : public GnuTool { public: - explicit Linker(const ToolChain &TC); - bool isLinkJob() const override; - bool hasIntegratedCPP() const override; + explicit Linker(const ToolChain &TC) + : GnuTool("wasm::Linker", "linker", TC) {} + bool isLinkJob() const override { return true; } + bool hasIntegratedCPP() const override { return false; } std::string getLinkerPath(const llvm::opt::ArgList &Args) const; void ConstructJob(Compilation &C, const JobAction &JA, const InputInfo &Output, const InputInfoList &Inputs, -- 2.40.0