[Driver] Consolidate tools and toolchains by target platform. (NFC)
Summary:
(This is a move-only refactoring patch. There are no functionality changes.)
This patch splits apart the Clang driver's tool and toolchain implementation
files. Each target platform toolchain is moved to its own file, along with the
closest-related tools. Each target platform toolchain has separate headers and
implementation files, so the hierarchy of classes is unchanged.
There are some remaining shared free functions, mostly from Tools.cpp. Several
of these move to their own architecture-specific files, similar to r296056. Some
of them are only used by a single target platform; since the tools and
toolchains are now together, some helpers now live in a platform-specific file.
The balance are helpers related to manipulating argument lists, so they are now
in a new file pair, CommonArgs.h and .cpp.
I've tried to cluster the code logically, which is fairly straightforward for
most of the target platforms and shared architectures. I think I've made
reasonable choices for these, as well as the various shared helpers; but of
course, I'm happy to hear feedback in the review.
There are some particular things I don't like about this patch, but haven't been
able to find a better overall solution. The first is the proliferation of files:
there are several files that are tiny because the toolchain is not very
different from its base (usually the Gnu tools/toolchain). I think this is
mostly a reflection of the true complexity, though, so it may not be "fixable"
in any reasonable sense. The second thing I don't like are the includes like
"../Something.h". I've avoided this largely by clustering into the current file
structure. However, a few of these includes remain, and in those cases it
doesn't make sense to me to sink an existing file any deeper.
Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar
Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D30372
llvm-svn: 297250
2017-03-08 09:02:16 +08:00
|
|
|
//===--- NaCl.cpp - Native Client ToolChain Implementations -----*- C++ -*-===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "NaCl.h"
|
|
|
|
#include "InputInfo.h"
|
|
|
|
#include "CommonArgs.h"
|
|
|
|
#include "clang/Driver/Compilation.h"
|
|
|
|
#include "clang/Driver/Driver.h"
|
|
|
|
#include "clang/Driver/DriverDiagnostic.h"
|
|
|
|
#include "clang/Driver/Options.h"
|
|
|
|
#include "llvm/Option/ArgList.h"
|
|
|
|
#include "llvm/Support/Path.h"
|
|
|
|
|
|
|
|
using namespace clang::driver;
|
|
|
|
using namespace clang::driver::tools;
|
|
|
|
using namespace clang::driver::toolchains;
|
|
|
|
using namespace clang;
|
|
|
|
using namespace llvm::opt;
|
|
|
|
|
|
|
|
// NaCl ARM assembly (inline or standalone) can be written with a set of macros
|
|
|
|
// for the various SFI requirements like register masking. The assembly tool
|
|
|
|
// inserts the file containing the macros as an input into all the assembly
|
|
|
|
// jobs.
|
|
|
|
void nacltools::AssemblerARM::ConstructJob(Compilation &C, const JobAction &JA,
|
|
|
|
const InputInfo &Output,
|
|
|
|
const InputInfoList &Inputs,
|
|
|
|
const ArgList &Args,
|
|
|
|
const char *LinkingOutput) const {
|
|
|
|
const toolchains::NaClToolChain &ToolChain =
|
|
|
|
static_cast<const toolchains::NaClToolChain &>(getToolChain());
|
|
|
|
InputInfo NaClMacros(types::TY_PP_Asm, ToolChain.GetNaClArmMacrosPath(),
|
|
|
|
"nacl-arm-macros.s");
|
|
|
|
InputInfoList NewInputs;
|
|
|
|
NewInputs.push_back(NaClMacros);
|
|
|
|
NewInputs.append(Inputs.begin(), Inputs.end());
|
|
|
|
gnutools::Assembler::ConstructJob(C, JA, Output, NewInputs, Args,
|
|
|
|
LinkingOutput);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This is quite similar to gnutools::Linker::ConstructJob with changes that
|
|
|
|
// we use static by default, do not yet support sanitizers or LTO, and a few
|
|
|
|
// others. Eventually we can support more of that and hopefully migrate back
|
|
|
|
// to gnutools::Linker.
|
|
|
|
void nacltools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
|
|
|
|
const InputInfo &Output,
|
|
|
|
const InputInfoList &Inputs,
|
|
|
|
const ArgList &Args,
|
|
|
|
const char *LinkingOutput) const {
|
|
|
|
|
|
|
|
const toolchains::NaClToolChain &ToolChain =
|
|
|
|
static_cast<const toolchains::NaClToolChain &>(getToolChain());
|
|
|
|
const Driver &D = ToolChain.getDriver();
|
|
|
|
const llvm::Triple::ArchType Arch = ToolChain.getArch();
|
|
|
|
const bool IsStatic =
|
|
|
|
!Args.hasArg(options::OPT_dynamic) && !Args.hasArg(options::OPT_shared);
|
|
|
|
|
|
|
|
ArgStringList CmdArgs;
|
|
|
|
|
|
|
|
// Silence warning for "clang -g foo.o -o foo"
|
|
|
|
Args.ClaimAllArgs(options::OPT_g_Group);
|
|
|
|
// and "clang -emit-llvm foo.o -o foo"
|
|
|
|
Args.ClaimAllArgs(options::OPT_emit_llvm);
|
|
|
|
// and for "clang -w foo.o -o foo". Other warning options are already
|
|
|
|
// handled somewhere else.
|
|
|
|
Args.ClaimAllArgs(options::OPT_w);
|
|
|
|
|
|
|
|
if (!D.SysRoot.empty())
|
|
|
|
CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
|
|
|
|
|
|
|
|
if (Args.hasArg(options::OPT_rdynamic))
|
|
|
|
CmdArgs.push_back("-export-dynamic");
|
|
|
|
|
|
|
|
if (Args.hasArg(options::OPT_s))
|
|
|
|
CmdArgs.push_back("-s");
|
|
|
|
|
|
|
|
// NaClToolChain doesn't have ExtraOpts like Linux; the only relevant flag
|
|
|
|
// from there is --build-id, which we do want.
|
|
|
|
CmdArgs.push_back("--build-id");
|
|
|
|
|
|
|
|
if (!IsStatic)
|
|
|
|
CmdArgs.push_back("--eh-frame-hdr");
|
|
|
|
|
|
|
|
CmdArgs.push_back("-m");
|
|
|
|
if (Arch == llvm::Triple::x86)
|
|
|
|
CmdArgs.push_back("elf_i386_nacl");
|
|
|
|
else if (Arch == llvm::Triple::arm)
|
|
|
|
CmdArgs.push_back("armelf_nacl");
|
|
|
|
else if (Arch == llvm::Triple::x86_64)
|
|
|
|
CmdArgs.push_back("elf_x86_64_nacl");
|
|
|
|
else if (Arch == llvm::Triple::mipsel)
|
|
|
|
CmdArgs.push_back("mipselelf_nacl");
|
|
|
|
else
|
|
|
|
D.Diag(diag::err_target_unsupported_arch) << ToolChain.getArchName()
|
|
|
|
<< "Native Client";
|
|
|
|
|
|
|
|
if (IsStatic)
|
|
|
|
CmdArgs.push_back("-static");
|
|
|
|
else if (Args.hasArg(options::OPT_shared))
|
|
|
|
CmdArgs.push_back("-shared");
|
|
|
|
|
|
|
|
CmdArgs.push_back("-o");
|
|
|
|
CmdArgs.push_back(Output.getFilename());
|
|
|
|
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
|
|
|
|
if (!Args.hasArg(options::OPT_shared))
|
|
|
|
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
|
|
|
|
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
|
|
|
|
|
|
|
|
const char *crtbegin;
|
|
|
|
if (IsStatic)
|
|
|
|
crtbegin = "crtbeginT.o";
|
|
|
|
else if (Args.hasArg(options::OPT_shared))
|
|
|
|
crtbegin = "crtbeginS.o";
|
|
|
|
else
|
|
|
|
crtbegin = "crtbegin.o";
|
|
|
|
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
|
|
|
|
}
|
|
|
|
|
|
|
|
Args.AddAllArgs(CmdArgs, options::OPT_L);
|
|
|
|
Args.AddAllArgs(CmdArgs, options::OPT_u);
|
|
|
|
|
|
|
|
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
|
|
|
|
|
|
|
|
if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))
|
|
|
|
CmdArgs.push_back("--no-demangle");
|
|
|
|
|
|
|
|
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
|
|
|
|
|
|
|
|
if (D.CCCIsCXX() &&
|
|
|
|
!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
|
2017-07-26 02:02:57 +08:00
|
|
|
if (ToolChain.ShouldLinkCXXStdlib(Args)) {
|
|
|
|
bool OnlyLibstdcxxStatic =
|
|
|
|
Args.hasArg(options::OPT_static_libstdcxx) && !IsStatic;
|
|
|
|
if (OnlyLibstdcxxStatic)
|
|
|
|
CmdArgs.push_back("-Bstatic");
|
|
|
|
ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
|
|
|
|
if (OnlyLibstdcxxStatic)
|
|
|
|
CmdArgs.push_back("-Bdynamic");
|
|
|
|
}
|
[Driver] Consolidate tools and toolchains by target platform. (NFC)
Summary:
(This is a move-only refactoring patch. There are no functionality changes.)
This patch splits apart the Clang driver's tool and toolchain implementation
files. Each target platform toolchain is moved to its own file, along with the
closest-related tools. Each target platform toolchain has separate headers and
implementation files, so the hierarchy of classes is unchanged.
There are some remaining shared free functions, mostly from Tools.cpp. Several
of these move to their own architecture-specific files, similar to r296056. Some
of them are only used by a single target platform; since the tools and
toolchains are now together, some helpers now live in a platform-specific file.
The balance are helpers related to manipulating argument lists, so they are now
in a new file pair, CommonArgs.h and .cpp.
I've tried to cluster the code logically, which is fairly straightforward for
most of the target platforms and shared architectures. I think I've made
reasonable choices for these, as well as the various shared helpers; but of
course, I'm happy to hear feedback in the review.
There are some particular things I don't like about this patch, but haven't been
able to find a better overall solution. The first is the proliferation of files:
there are several files that are tiny because the toolchain is not very
different from its base (usually the Gnu tools/toolchain). I think this is
mostly a reflection of the true complexity, though, so it may not be "fixable"
in any reasonable sense. The second thing I don't like are the includes like
"../Something.h". I've avoided this largely by clustering into the current file
structure. However, a few of these includes remain, and in those cases it
doesn't make sense to me to sink an existing file any deeper.
Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar
Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D30372
llvm-svn: 297250
2017-03-08 09:02:16 +08:00
|
|
|
CmdArgs.push_back("-lm");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!Args.hasArg(options::OPT_nostdlib)) {
|
|
|
|
if (!Args.hasArg(options::OPT_nodefaultlibs)) {
|
|
|
|
// Always use groups, since it has no effect on dynamic libraries.
|
|
|
|
CmdArgs.push_back("--start-group");
|
|
|
|
CmdArgs.push_back("-lc");
|
|
|
|
// NaCl's libc++ currently requires libpthread, so just always include it
|
|
|
|
// in the group for C++.
|
|
|
|
if (Args.hasArg(options::OPT_pthread) ||
|
|
|
|
Args.hasArg(options::OPT_pthreads) || D.CCCIsCXX()) {
|
|
|
|
// Gold, used by Mips, handles nested groups differently than ld, and
|
|
|
|
// without '-lnacl' it prefers symbols from libpthread.a over libnacl.a,
|
|
|
|
// which is not a desired behaviour here.
|
|
|
|
// See https://sourceware.org/ml/binutils/2015-03/msg00034.html
|
|
|
|
if (getToolChain().getArch() == llvm::Triple::mipsel)
|
|
|
|
CmdArgs.push_back("-lnacl");
|
|
|
|
|
|
|
|
CmdArgs.push_back("-lpthread");
|
|
|
|
}
|
|
|
|
|
|
|
|
CmdArgs.push_back("-lgcc");
|
|
|
|
CmdArgs.push_back("--as-needed");
|
|
|
|
if (IsStatic)
|
|
|
|
CmdArgs.push_back("-lgcc_eh");
|
|
|
|
else
|
|
|
|
CmdArgs.push_back("-lgcc_s");
|
|
|
|
CmdArgs.push_back("--no-as-needed");
|
|
|
|
|
|
|
|
// Mips needs to create and use pnacl_legacy library that contains
|
|
|
|
// definitions from bitcode/pnaclmm.c and definitions for
|
|
|
|
// __nacl_tp_tls_offset() and __nacl_tp_tdb_offset().
|
|
|
|
if (getToolChain().getArch() == llvm::Triple::mipsel)
|
|
|
|
CmdArgs.push_back("-lpnacl_legacy");
|
|
|
|
|
|
|
|
CmdArgs.push_back("--end-group");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!Args.hasArg(options::OPT_nostartfiles)) {
|
|
|
|
const char *crtend;
|
|
|
|
if (Args.hasArg(options::OPT_shared))
|
|
|
|
crtend = "crtendS.o";
|
|
|
|
else
|
|
|
|
crtend = "crtend.o";
|
|
|
|
|
|
|
|
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtend)));
|
|
|
|
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath());
|
|
|
|
C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
|
|
|
|
}
|
|
|
|
|
|
|
|
/// NaCl Toolchain
|
|
|
|
NaClToolChain::NaClToolChain(const Driver &D, const llvm::Triple &Triple,
|
|
|
|
const ArgList &Args)
|
|
|
|
: Generic_ELF(D, Triple, Args) {
|
|
|
|
|
|
|
|
// Remove paths added by Generic_GCC. NaCl Toolchain cannot use the
|
|
|
|
// default paths, and must instead only use the paths provided
|
|
|
|
// with this toolchain based on architecture.
|
|
|
|
path_list &file_paths = getFilePaths();
|
|
|
|
path_list &prog_paths = getProgramPaths();
|
|
|
|
|
|
|
|
file_paths.clear();
|
|
|
|
prog_paths.clear();
|
|
|
|
|
|
|
|
// Path for library files (libc.a, ...)
|
|
|
|
std::string FilePath(getDriver().Dir + "/../");
|
|
|
|
|
|
|
|
// Path for tools (clang, ld, etc..)
|
|
|
|
std::string ProgPath(getDriver().Dir + "/../");
|
|
|
|
|
|
|
|
// Path for toolchain libraries (libgcc.a, ...)
|
|
|
|
std::string ToolPath(getDriver().ResourceDir + "/lib/");
|
|
|
|
|
|
|
|
switch (Triple.getArch()) {
|
|
|
|
case llvm::Triple::x86:
|
|
|
|
file_paths.push_back(FilePath + "x86_64-nacl/lib32");
|
|
|
|
file_paths.push_back(FilePath + "i686-nacl/usr/lib");
|
|
|
|
prog_paths.push_back(ProgPath + "x86_64-nacl/bin");
|
|
|
|
file_paths.push_back(ToolPath + "i686-nacl");
|
|
|
|
break;
|
|
|
|
case llvm::Triple::x86_64:
|
|
|
|
file_paths.push_back(FilePath + "x86_64-nacl/lib");
|
|
|
|
file_paths.push_back(FilePath + "x86_64-nacl/usr/lib");
|
|
|
|
prog_paths.push_back(ProgPath + "x86_64-nacl/bin");
|
|
|
|
file_paths.push_back(ToolPath + "x86_64-nacl");
|
|
|
|
break;
|
|
|
|
case llvm::Triple::arm:
|
|
|
|
file_paths.push_back(FilePath + "arm-nacl/lib");
|
|
|
|
file_paths.push_back(FilePath + "arm-nacl/usr/lib");
|
|
|
|
prog_paths.push_back(ProgPath + "arm-nacl/bin");
|
|
|
|
file_paths.push_back(ToolPath + "arm-nacl");
|
|
|
|
break;
|
|
|
|
case llvm::Triple::mipsel:
|
|
|
|
file_paths.push_back(FilePath + "mipsel-nacl/lib");
|
|
|
|
file_paths.push_back(FilePath + "mipsel-nacl/usr/lib");
|
|
|
|
prog_paths.push_back(ProgPath + "bin");
|
|
|
|
file_paths.push_back(ToolPath + "mipsel-nacl");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
NaClArmMacrosPath = GetFilePath("nacl-arm-macros.s");
|
|
|
|
}
|
|
|
|
|
|
|
|
void NaClToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
|
|
|
|
ArgStringList &CC1Args) const {
|
|
|
|
const Driver &D = getDriver();
|
|
|
|
if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
|
|
|
|
SmallString<128> P(D.ResourceDir);
|
|
|
|
llvm::sys::path::append(P, "include");
|
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (DriverArgs.hasArg(options::OPT_nostdlibinc))
|
|
|
|
return;
|
|
|
|
|
|
|
|
SmallString<128> P(D.Dir + "/../");
|
|
|
|
switch (getTriple().getArch()) {
|
|
|
|
case llvm::Triple::x86:
|
|
|
|
// x86 is special because multilib style uses x86_64-nacl/include for libc
|
|
|
|
// headers but the SDK wants i686-nacl/usr/include. The other architectures
|
|
|
|
// have the same substring.
|
|
|
|
llvm::sys::path::append(P, "i686-nacl/usr/include");
|
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
llvm::sys::path::remove_filename(P);
|
|
|
|
llvm::sys::path::remove_filename(P);
|
|
|
|
llvm::sys::path::remove_filename(P);
|
|
|
|
llvm::sys::path::append(P, "x86_64-nacl/include");
|
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
return;
|
|
|
|
case llvm::Triple::arm:
|
|
|
|
llvm::sys::path::append(P, "arm-nacl/usr/include");
|
|
|
|
break;
|
|
|
|
case llvm::Triple::x86_64:
|
|
|
|
llvm::sys::path::append(P, "x86_64-nacl/usr/include");
|
|
|
|
break;
|
|
|
|
case llvm::Triple::mipsel:
|
|
|
|
llvm::sys::path::append(P, "mipsel-nacl/usr/include");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
llvm::sys::path::remove_filename(P);
|
|
|
|
llvm::sys::path::remove_filename(P);
|
|
|
|
llvm::sys::path::append(P, "include");
|
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
void NaClToolChain::AddCXXStdlibLibArgs(const ArgList &Args,
|
|
|
|
ArgStringList &CmdArgs) const {
|
|
|
|
// Check for -stdlib= flags. We only support libc++ but this consumes the arg
|
|
|
|
// if the value is libc++, and emits an error for other values.
|
|
|
|
GetCXXStdlibType(Args);
|
|
|
|
CmdArgs.push_back("-lc++");
|
|
|
|
}
|
|
|
|
|
2018-04-11 03:55:55 +08:00
|
|
|
void NaClToolChain::addLibCxxIncludePaths(
|
|
|
|
const llvm::opt::ArgList &DriverArgs,
|
|
|
|
llvm::opt::ArgStringList &CC1Args) const {
|
[Driver] Consolidate tools and toolchains by target platform. (NFC)
Summary:
(This is a move-only refactoring patch. There are no functionality changes.)
This patch splits apart the Clang driver's tool and toolchain implementation
files. Each target platform toolchain is moved to its own file, along with the
closest-related tools. Each target platform toolchain has separate headers and
implementation files, so the hierarchy of classes is unchanged.
There are some remaining shared free functions, mostly from Tools.cpp. Several
of these move to their own architecture-specific files, similar to r296056. Some
of them are only used by a single target platform; since the tools and
toolchains are now together, some helpers now live in a platform-specific file.
The balance are helpers related to manipulating argument lists, so they are now
in a new file pair, CommonArgs.h and .cpp.
I've tried to cluster the code logically, which is fairly straightforward for
most of the target platforms and shared architectures. I think I've made
reasonable choices for these, as well as the various shared helpers; but of
course, I'm happy to hear feedback in the review.
There are some particular things I don't like about this patch, but haven't been
able to find a better overall solution. The first is the proliferation of files:
there are several files that are tiny because the toolchain is not very
different from its base (usually the Gnu tools/toolchain). I think this is
mostly a reflection of the true complexity, though, so it may not be "fixable"
in any reasonable sense. The second thing I don't like are the includes like
"../Something.h". I've avoided this largely by clustering into the current file
structure. However, a few of these includes remain, and in those cases it
doesn't make sense to me to sink an existing file any deeper.
Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar
Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D30372
llvm-svn: 297250
2017-03-08 09:02:16 +08:00
|
|
|
const Driver &D = getDriver();
|
|
|
|
|
|
|
|
SmallString<128> P(D.Dir + "/../");
|
|
|
|
switch (getTriple().getArch()) {
|
2018-04-11 04:30:16 +08:00
|
|
|
default:
|
|
|
|
break;
|
[Driver] Consolidate tools and toolchains by target platform. (NFC)
Summary:
(This is a move-only refactoring patch. There are no functionality changes.)
This patch splits apart the Clang driver's tool and toolchain implementation
files. Each target platform toolchain is moved to its own file, along with the
closest-related tools. Each target platform toolchain has separate headers and
implementation files, so the hierarchy of classes is unchanged.
There are some remaining shared free functions, mostly from Tools.cpp. Several
of these move to their own architecture-specific files, similar to r296056. Some
of them are only used by a single target platform; since the tools and
toolchains are now together, some helpers now live in a platform-specific file.
The balance are helpers related to manipulating argument lists, so they are now
in a new file pair, CommonArgs.h and .cpp.
I've tried to cluster the code logically, which is fairly straightforward for
most of the target platforms and shared architectures. I think I've made
reasonable choices for these, as well as the various shared helpers; but of
course, I'm happy to hear feedback in the review.
There are some particular things I don't like about this patch, but haven't been
able to find a better overall solution. The first is the proliferation of files:
there are several files that are tiny because the toolchain is not very
different from its base (usually the Gnu tools/toolchain). I think this is
mostly a reflection of the true complexity, though, so it may not be "fixable"
in any reasonable sense. The second thing I don't like are the includes like
"../Something.h". I've avoided this largely by clustering into the current file
structure. However, a few of these includes remain, and in those cases it
doesn't make sense to me to sink an existing file any deeper.
Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar
Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D30372
llvm-svn: 297250
2017-03-08 09:02:16 +08:00
|
|
|
case llvm::Triple::arm:
|
|
|
|
llvm::sys::path::append(P, "arm-nacl/include/c++/v1");
|
2018-04-11 03:55:55 +08:00
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
break;
|
[Driver] Consolidate tools and toolchains by target platform. (NFC)
Summary:
(This is a move-only refactoring patch. There are no functionality changes.)
This patch splits apart the Clang driver's tool and toolchain implementation
files. Each target platform toolchain is moved to its own file, along with the
closest-related tools. Each target platform toolchain has separate headers and
implementation files, so the hierarchy of classes is unchanged.
There are some remaining shared free functions, mostly from Tools.cpp. Several
of these move to their own architecture-specific files, similar to r296056. Some
of them are only used by a single target platform; since the tools and
toolchains are now together, some helpers now live in a platform-specific file.
The balance are helpers related to manipulating argument lists, so they are now
in a new file pair, CommonArgs.h and .cpp.
I've tried to cluster the code logically, which is fairly straightforward for
most of the target platforms and shared architectures. I think I've made
reasonable choices for these, as well as the various shared helpers; but of
course, I'm happy to hear feedback in the review.
There are some particular things I don't like about this patch, but haven't been
able to find a better overall solution. The first is the proliferation of files:
there are several files that are tiny because the toolchain is not very
different from its base (usually the Gnu tools/toolchain). I think this is
mostly a reflection of the true complexity, though, so it may not be "fixable"
in any reasonable sense. The second thing I don't like are the includes like
"../Something.h". I've avoided this largely by clustering into the current file
structure. However, a few of these includes remain, and in those cases it
doesn't make sense to me to sink an existing file any deeper.
Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar
Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D30372
llvm-svn: 297250
2017-03-08 09:02:16 +08:00
|
|
|
case llvm::Triple::x86:
|
|
|
|
llvm::sys::path::append(P, "x86_64-nacl/include/c++/v1");
|
2018-04-11 03:55:55 +08:00
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
break;
|
[Driver] Consolidate tools and toolchains by target platform. (NFC)
Summary:
(This is a move-only refactoring patch. There are no functionality changes.)
This patch splits apart the Clang driver's tool and toolchain implementation
files. Each target platform toolchain is moved to its own file, along with the
closest-related tools. Each target platform toolchain has separate headers and
implementation files, so the hierarchy of classes is unchanged.
There are some remaining shared free functions, mostly from Tools.cpp. Several
of these move to their own architecture-specific files, similar to r296056. Some
of them are only used by a single target platform; since the tools and
toolchains are now together, some helpers now live in a platform-specific file.
The balance are helpers related to manipulating argument lists, so they are now
in a new file pair, CommonArgs.h and .cpp.
I've tried to cluster the code logically, which is fairly straightforward for
most of the target platforms and shared architectures. I think I've made
reasonable choices for these, as well as the various shared helpers; but of
course, I'm happy to hear feedback in the review.
There are some particular things I don't like about this patch, but haven't been
able to find a better overall solution. The first is the proliferation of files:
there are several files that are tiny because the toolchain is not very
different from its base (usually the Gnu tools/toolchain). I think this is
mostly a reflection of the true complexity, though, so it may not be "fixable"
in any reasonable sense. The second thing I don't like are the includes like
"../Something.h". I've avoided this largely by clustering into the current file
structure. However, a few of these includes remain, and in those cases it
doesn't make sense to me to sink an existing file any deeper.
Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar
Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D30372
llvm-svn: 297250
2017-03-08 09:02:16 +08:00
|
|
|
case llvm::Triple::x86_64:
|
|
|
|
llvm::sys::path::append(P, "x86_64-nacl/include/c++/v1");
|
2018-04-11 03:55:55 +08:00
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
break;
|
[Driver] Consolidate tools and toolchains by target platform. (NFC)
Summary:
(This is a move-only refactoring patch. There are no functionality changes.)
This patch splits apart the Clang driver's tool and toolchain implementation
files. Each target platform toolchain is moved to its own file, along with the
closest-related tools. Each target platform toolchain has separate headers and
implementation files, so the hierarchy of classes is unchanged.
There are some remaining shared free functions, mostly from Tools.cpp. Several
of these move to their own architecture-specific files, similar to r296056. Some
of them are only used by a single target platform; since the tools and
toolchains are now together, some helpers now live in a platform-specific file.
The balance are helpers related to manipulating argument lists, so they are now
in a new file pair, CommonArgs.h and .cpp.
I've tried to cluster the code logically, which is fairly straightforward for
most of the target platforms and shared architectures. I think I've made
reasonable choices for these, as well as the various shared helpers; but of
course, I'm happy to hear feedback in the review.
There are some particular things I don't like about this patch, but haven't been
able to find a better overall solution. The first is the proliferation of files:
there are several files that are tiny because the toolchain is not very
different from its base (usually the Gnu tools/toolchain). I think this is
mostly a reflection of the true complexity, though, so it may not be "fixable"
in any reasonable sense. The second thing I don't like are the includes like
"../Something.h". I've avoided this largely by clustering into the current file
structure. However, a few of these includes remain, and in those cases it
doesn't make sense to me to sink an existing file any deeper.
Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar
Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D30372
llvm-svn: 297250
2017-03-08 09:02:16 +08:00
|
|
|
case llvm::Triple::mipsel:
|
|
|
|
llvm::sys::path::append(P, "mipsel-nacl/include/c++/v1");
|
2018-04-11 03:55:55 +08:00
|
|
|
addSystemInclude(DriverArgs, CC1Args, P.str());
|
|
|
|
break;
|
[Driver] Consolidate tools and toolchains by target platform. (NFC)
Summary:
(This is a move-only refactoring patch. There are no functionality changes.)
This patch splits apart the Clang driver's tool and toolchain implementation
files. Each target platform toolchain is moved to its own file, along with the
closest-related tools. Each target platform toolchain has separate headers and
implementation files, so the hierarchy of classes is unchanged.
There are some remaining shared free functions, mostly from Tools.cpp. Several
of these move to their own architecture-specific files, similar to r296056. Some
of them are only used by a single target platform; since the tools and
toolchains are now together, some helpers now live in a platform-specific file.
The balance are helpers related to manipulating argument lists, so they are now
in a new file pair, CommonArgs.h and .cpp.
I've tried to cluster the code logically, which is fairly straightforward for
most of the target platforms and shared architectures. I think I've made
reasonable choices for these, as well as the various shared helpers; but of
course, I'm happy to hear feedback in the review.
There are some particular things I don't like about this patch, but haven't been
able to find a better overall solution. The first is the proliferation of files:
there are several files that are tiny because the toolchain is not very
different from its base (usually the Gnu tools/toolchain). I think this is
mostly a reflection of the true complexity, though, so it may not be "fixable"
in any reasonable sense. The second thing I don't like are the includes like
"../Something.h". I've avoided this largely by clustering into the current file
structure. However, a few of these includes remain, and in those cases it
doesn't make sense to me to sink an existing file any deeper.
Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar
Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D30372
llvm-svn: 297250
2017-03-08 09:02:16 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ToolChain::CXXStdlibType
|
|
|
|
NaClToolChain::GetCXXStdlibType(const ArgList &Args) const {
|
|
|
|
if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
|
|
|
|
StringRef Value = A->getValue();
|
|
|
|
if (Value == "libc++")
|
|
|
|
return ToolChain::CST_Libcxx;
|
|
|
|
getDriver().Diag(clang::diag::err_drv_invalid_stdlib_name)
|
|
|
|
<< A->getAsString(Args);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ToolChain::CST_Libcxx;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::string
|
|
|
|
NaClToolChain::ComputeEffectiveClangTriple(const ArgList &Args,
|
|
|
|
types::ID InputType) const {
|
|
|
|
llvm::Triple TheTriple(ComputeLLVMTriple(Args, InputType));
|
|
|
|
if (TheTriple.getArch() == llvm::Triple::arm &&
|
|
|
|
TheTriple.getEnvironment() == llvm::Triple::UnknownEnvironment)
|
|
|
|
TheTriple.setEnvironment(llvm::Triple::GNUEABIHF);
|
|
|
|
return TheTriple.getTriple();
|
|
|
|
}
|
|
|
|
|
|
|
|
Tool *NaClToolChain::buildLinker() const {
|
|
|
|
return new tools::nacltools::Linker(*this);
|
|
|
|
}
|
|
|
|
|
|
|
|
Tool *NaClToolChain::buildAssembler() const {
|
|
|
|
if (getTriple().getArch() == llvm::Triple::arm)
|
|
|
|
return new tools::nacltools::AssemblerARM(*this);
|
|
|
|
return new tools::gnutools::Assembler(*this);
|
|
|
|
}
|