Save getArch() in a local var instead of calling it 20 times, etc.
Differential Revision: http://reviews.llvm.org/D10224 llvm-svn: 238992
This commit is contained in:
Douglas Katzman
parent
094c04ec81
commit
fe77e0dcfc
|
|
@ -1656,9 +1656,10 @@ static void getX86TargetFeatures(const Driver &D, const llvm::Triple &Triple,
|
|||
Features.push_back("-fsgsbase");
|
||||
}
|
||||
|
||||
const llvm::Triple::ArchType ArchType = Triple.getArch();
|
||||
// Add features to be compatible with gcc for Android.
|
||||
if (Triple.getEnvironment() == llvm::Triple::Android) {
|
||||
if (Triple.getArch() == llvm::Triple::x86_64) {
|
||||
if (ArchType == llvm::Triple::x86_64) {
|
||||
Features.push_back("+sse4.2");
|
||||
Features.push_back("+popcnt");
|
||||
} else
|
||||
|
|
@ -1670,15 +1671,14 @@ static void getX86TargetFeatures(const Driver &D, const llvm::Triple &Triple,
|
|||
StringRef Arch = A->getValue();
|
||||
bool ArchUsed = false;
|
||||
// First, look for flags that are shared in x86 and x86-64.
|
||||
if (Triple.getArch() == llvm::Triple::x86_64 ||
|
||||
Triple.getArch() == llvm::Triple::x86) {
|
||||
if (ArchType == llvm::Triple::x86_64 || ArchType == llvm::Triple::x86) {
|
||||
if (Arch == "AVX" || Arch == "AVX2") {
|
||||
ArchUsed = true;
|
||||
Features.push_back(Args.MakeArgString("+" + Arch.lower()));
|
||||
}
|
||||
}
|
||||
// Then, look for x86-specific flags.
|
||||
if (Triple.getArch() == llvm::Triple::x86) {
|
||||
if (ArchType == llvm::Triple::x86) {
|
||||
if (Arch == "IA32") {
|
||||
ArchUsed = true;
|
||||
} else if (Arch == "SSE" || Arch == "SSE2") {
|
||||
|
|
@ -2854,7 +2854,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
|
||||
// Android-specific defaults for PIC/PIE
|
||||
if (getToolChain().getTriple().getEnvironment() == llvm::Triple::Android) {
|
||||
switch (getToolChain().getTriple().getArch()) {
|
||||
switch (getToolChain().getArch()) {
|
||||
case llvm::Triple::arm:
|
||||
case llvm::Triple::armeb:
|
||||
case llvm::Triple::thumb:
|
||||
|
|
@ -2880,7 +2880,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
|
||||
// OpenBSD-specific defaults for PIE
|
||||
if (getToolChain().getTriple().getOS() == llvm::Triple::OpenBSD) {
|
||||
switch (getToolChain().getTriple().getArch()) {
|
||||
switch (getToolChain().getArch()) {
|
||||
case llvm::Triple::mips64:
|
||||
case llvm::Triple::mips64el:
|
||||
case llvm::Triple::sparc:
|
||||
|
|
@ -3876,12 +3876,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
Sanitize.addArgs(Args, CmdArgs);
|
||||
|
||||
// Report an error for -faltivec on anything other than PowerPC.
|
||||
if (const Arg *A = Args.getLastArg(options::OPT_faltivec))
|
||||
if (!(getToolChain().getArch() == llvm::Triple::ppc ||
|
||||
getToolChain().getArch() == llvm::Triple::ppc64 ||
|
||||
getToolChain().getArch() == llvm::Triple::ppc64le))
|
||||
D.Diag(diag::err_drv_argument_only_allowed_with)
|
||||
<< A->getAsString(Args) << "ppc/ppc64/ppc64le";
|
||||
if (const Arg *A = Args.getLastArg(options::OPT_faltivec)) {
|
||||
const llvm::Triple::ArchType Arch = getToolChain().getArch();
|
||||
if (!(Arch == llvm::Triple::ppc || Arch == llvm::Triple::ppc64 ||
|
||||
Arch == llvm::Triple::ppc64le))
|
||||
D.Diag(diag::err_drv_argument_only_allowed_with) << A->getAsString(Args)
|
||||
<< "ppc/ppc64/ppc64le";
|
||||
}
|
||||
|
||||
if (getToolChain().SupportsProfiling())
|
||||
Args.AddLastArg(CmdArgs, options::OPT_pg);
|
||||
|
|
@ -3992,8 +3993,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
CmdArgs.push_back("-mstack-probe-size=0");
|
||||
}
|
||||
|
||||
if (getToolChain().getTriple().getArch() == llvm::Triple::aarch64 ||
|
||||
getToolChain().getTriple().getArch() == llvm::Triple::aarch64_be)
|
||||
if (getToolChain().getArch() == llvm::Triple::aarch64 ||
|
||||
getToolChain().getArch() == llvm::Triple::aarch64_be)
|
||||
CmdArgs.push_back("-fallow-half-arguments-and-returns");
|
||||
|
||||
if (Arg *A = Args.getLastArg(options::OPT_mrestrict_it,
|
||||
|
|
@ -4350,7 +4351,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
// When ObjectiveC legacy runtime is in effect on MacOSX,
|
||||
// turn on the option to do Array/Dictionary subscripting
|
||||
// by default.
|
||||
if (getToolChain().getTriple().getArch() == llvm::Triple::x86 &&
|
||||
if (getToolChain().getArch() == llvm::Triple::x86 &&
|
||||
getToolChain().getTriple().isMacOSX() &&
|
||||
!getToolChain().getTriple().isMacOSXVersionLT(10, 7) &&
|
||||
objcRuntime.getKind() == ObjCRuntime::FragileMacOSX &&
|
||||
|
|
@ -5079,8 +5080,8 @@ void Clang::AddClangCLArgs(const ArgList &Args, ArgStringList &CmdArgs) const {
|
|||
}
|
||||
|
||||
unsigned VolatileOptionID;
|
||||
if (getToolChain().getTriple().getArch() == llvm::Triple::x86_64 ||
|
||||
getToolChain().getTriple().getArch() == llvm::Triple::x86)
|
||||
if (getToolChain().getArch() == llvm::Triple::x86_64 ||
|
||||
getToolChain().getArch() == llvm::Triple::x86)
|
||||
VolatileOptionID = options::OPT__SLASH_volatile_ms;
|
||||
else
|
||||
VolatileOptionID = options::OPT__SLASH_volatile_iso;
|
||||
|
|
@ -5345,7 +5346,7 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
//
|
||||
// FIXME: The triple class should directly provide the information we want
|
||||
// here.
|
||||
llvm::Triple::ArchType Arch = getToolChain().getArch();
|
||||
const llvm::Triple::ArchType Arch = getToolChain().getArch();
|
||||
if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::ppc)
|
||||
CmdArgs.push_back("-m32");
|
||||
else if (Arch == llvm::Triple::x86_64 || Arch == llvm::Triple::ppc64 ||
|
||||
|
|
@ -5888,7 +5889,7 @@ llvm::Triple::ArchType darwin::getArchTypeForMachOArchName(StringRef Str) {
|
|||
}
|
||||
|
||||
void darwin::setTripleTypeForMachOArchName(llvm::Triple &T, StringRef Str) {
|
||||
llvm::Triple::ArchType Arch = getArchTypeForMachOArchName(Str);
|
||||
const llvm::Triple::ArchType Arch = getArchTypeForMachOArchName(Str);
|
||||
T.setArch(Arch);
|
||||
|
||||
if (Str == "x86_64h")
|
||||
|
|
@ -6532,7 +6533,7 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
std::string GCCLibPath = "/usr/gcc/4.5/lib/gcc/";
|
||||
const llvm::Triple &T = getToolChain().getTriple();
|
||||
std::string LibPath = "/usr/lib/";
|
||||
llvm::Triple::ArchType Arch = T.getArch();
|
||||
const llvm::Triple::ArchType Arch = T.getArch();
|
||||
switch (Arch) {
|
||||
case llvm::Triple::x86:
|
||||
GCCLibPath +=
|
||||
|
|
@ -6938,7 +6939,7 @@ void bitrig::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
}
|
||||
|
||||
StringRef MyArch;
|
||||
switch (getToolChain().getTriple().getArch()) {
|
||||
switch (getToolChain().getArch()) {
|
||||
case llvm::Triple::arm:
|
||||
MyArch = "arm";
|
||||
break;
|
||||
|
|
@ -7057,12 +7058,13 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
const InputInfoList &Inputs,
|
||||
const ArgList &Args,
|
||||
const char *LinkingOutput) const {
|
||||
const toolchains::FreeBSD& ToolChain =
|
||||
static_cast<const toolchains::FreeBSD&>(getToolChain());
|
||||
const toolchains::FreeBSD &ToolChain =
|
||||
static_cast<const toolchains::FreeBSD &>(getToolChain());
|
||||
const Driver &D = ToolChain.getDriver();
|
||||
const llvm::Triple::ArchType Arch = ToolChain.getArch();
|
||||
const bool IsPIE =
|
||||
!Args.hasArg(options::OPT_shared) &&
|
||||
(Args.hasArg(options::OPT_pie) || ToolChain.isPIEDefault());
|
||||
!Args.hasArg(options::OPT_shared) &&
|
||||
(Args.hasArg(options::OPT_pie) || ToolChain.isPIEDefault());
|
||||
ArgStringList CmdArgs;
|
||||
|
||||
// Silence warning for "clang -g foo.o -o foo"
|
||||
|
|
@ -7092,7 +7094,6 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
CmdArgs.push_back("/libexec/ld-elf.so.1");
|
||||
}
|
||||
if (ToolChain.getTriple().getOSMajorVersion() >= 9) {
|
||||
llvm::Triple::ArchType Arch = ToolChain.getArch();
|
||||
if (Arch == llvm::Triple::arm || Arch == llvm::Triple::sparc ||
|
||||
Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64) {
|
||||
CmdArgs.push_back("--hash-style=both");
|
||||
|
|
@ -7103,12 +7104,12 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
|
||||
// When building 32-bit code on FreeBSD/amd64, we have to explicitly
|
||||
// instruct ld in the base system to link 32-bit code.
|
||||
if (ToolChain.getArch() == llvm::Triple::x86) {
|
||||
if (Arch == llvm::Triple::x86) {
|
||||
CmdArgs.push_back("-m");
|
||||
CmdArgs.push_back("elf_i386_fbsd");
|
||||
}
|
||||
|
||||
if (ToolChain.getArch() == llvm::Triple::ppc) {
|
||||
if (Arch == llvm::Triple::ppc) {
|
||||
CmdArgs.push_back("-m");
|
||||
CmdArgs.push_back("elf32ppc_fbsd");
|
||||
}
|
||||
|
|
@ -7765,35 +7766,33 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
|
|||
|
||||
static std::string getLinuxDynamicLinker(const ArgList &Args,
|
||||
const toolchains::Linux &ToolChain) {
|
||||
const llvm::Triple::ArchType Arch = ToolChain.getArch();
|
||||
|
||||
if (ToolChain.getTriple().getEnvironment() == llvm::Triple::Android) {
|
||||
if (ToolChain.getTriple().isArch64Bit())
|
||||
return "/system/bin/linker64";
|
||||
else
|
||||
return "/system/bin/linker";
|
||||
} else if (ToolChain.getArch() == llvm::Triple::x86 ||
|
||||
ToolChain.getArch() == llvm::Triple::sparc ||
|
||||
ToolChain.getArch() == llvm::Triple::sparcel)
|
||||
} else if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::sparc ||
|
||||
Arch == llvm::Triple::sparcel)
|
||||
return "/lib/ld-linux.so.2";
|
||||
else if (ToolChain.getArch() == llvm::Triple::aarch64)
|
||||
else if (Arch == llvm::Triple::aarch64)
|
||||
return "/lib/ld-linux-aarch64.so.1";
|
||||
else if (ToolChain.getArch() == llvm::Triple::aarch64_be)
|
||||
else if (Arch == llvm::Triple::aarch64_be)
|
||||
return "/lib/ld-linux-aarch64_be.so.1";
|
||||
else if (ToolChain.getArch() == llvm::Triple::arm ||
|
||||
ToolChain.getArch() == llvm::Triple::thumb) {
|
||||
else if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb) {
|
||||
if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
|
||||
return "/lib/ld-linux-armhf.so.3";
|
||||
else
|
||||
return "/lib/ld-linux.so.3";
|
||||
} else if (ToolChain.getArch() == llvm::Triple::armeb ||
|
||||
ToolChain.getArch() == llvm::Triple::thumbeb) {
|
||||
} else if (Arch == llvm::Triple::armeb || Arch == llvm::Triple::thumbeb) {
|
||||
// TODO: check which dynamic linker name.
|
||||
if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
|
||||
return "/lib/ld-linux-armhf.so.3"; /* TODO: check which dynamic linker name. */
|
||||
return "/lib/ld-linux-armhf.so.3";
|
||||
else
|
||||
return "/lib/ld-linux.so.3"; /* TODO: check which dynamic linker name. */
|
||||
} else if (ToolChain.getArch() == llvm::Triple::mips ||
|
||||
ToolChain.getArch() == llvm::Triple::mipsel ||
|
||||
ToolChain.getArch() == llvm::Triple::mips64 ||
|
||||
ToolChain.getArch() == llvm::Triple::mips64el) {
|
||||
return "/lib/ld-linux.so.3";
|
||||
} else if (Arch == llvm::Triple::mips || Arch == llvm::Triple::mipsel ||
|
||||
Arch == llvm::Triple::mips64 || Arch == llvm::Triple::mips64el) {
|
||||
StringRef CPUName;
|
||||
StringRef ABIName;
|
||||
mips::getMipsCPUAndABI(Args, ToolChain.getTriple(), CPUName, ABIName);
|
||||
|
|
@ -7811,21 +7810,21 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
|
|||
LibName = IsNaN2008 ? "ld-linux-mipsn8.so.1" : "ld.so.1";
|
||||
|
||||
return (LibDir + "/" + LibName).str();
|
||||
} else if (ToolChain.getArch() == llvm::Triple::ppc)
|
||||
} else if (Arch == llvm::Triple::ppc)
|
||||
return "/lib/ld.so.1";
|
||||
else if (ToolChain.getArch() == llvm::Triple::ppc64) {
|
||||
else if (Arch == llvm::Triple::ppc64) {
|
||||
if (ppc::hasPPCAbiArg(Args, "elfv2"))
|
||||
return "/lib64/ld64.so.2";
|
||||
return "/lib64/ld64.so.1";
|
||||
} else if (ToolChain.getArch() == llvm::Triple::ppc64le) {
|
||||
} else if (Arch == llvm::Triple::ppc64le) {
|
||||
if (ppc::hasPPCAbiArg(Args, "elfv1"))
|
||||
return "/lib64/ld64.so.1";
|
||||
return "/lib64/ld64.so.2";
|
||||
} else if (ToolChain.getArch() == llvm::Triple::systemz)
|
||||
} else if (Arch == llvm::Triple::systemz)
|
||||
return "/lib64/ld64.so.1";
|
||||
else if (ToolChain.getArch() == llvm::Triple::sparcv9)
|
||||
else if (Arch == llvm::Triple::sparcv9)
|
||||
return "/lib64/ld-linux.so.2";
|
||||
else if (ToolChain.getArch() == llvm::Triple::x86_64 &&
|
||||
else if (Arch == llvm::Triple::x86_64 &&
|
||||
ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUX32)
|
||||
return "/libx32/ld-linux-x32.so.2";
|
||||
else
|
||||
|
|
@ -7906,15 +7905,15 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
const InputInfoList &Inputs,
|
||||
const ArgList &Args,
|
||||
const char *LinkingOutput) const {
|
||||
const toolchains::Linux& ToolChain =
|
||||
static_cast<const toolchains::Linux&>(getToolChain());
|
||||
const toolchains::Linux &ToolChain =
|
||||
static_cast<const toolchains::Linux &>(getToolChain());
|
||||
const Driver &D = ToolChain.getDriver();
|
||||
const llvm::Triple::ArchType Arch = ToolChain.getArch();
|
||||
const bool isAndroid =
|
||||
ToolChain.getTriple().getEnvironment() == llvm::Triple::Android;
|
||||
ToolChain.getTriple().getEnvironment() == llvm::Triple::Android;
|
||||
const bool IsPIE =
|
||||
!Args.hasArg(options::OPT_shared) &&
|
||||
!Args.hasArg(options::OPT_static) &&
|
||||
(Args.hasArg(options::OPT_pie) || ToolChain.isPIEDefault());
|
||||
!Args.hasArg(options::OPT_shared) && !Args.hasArg(options::OPT_static) &&
|
||||
(Args.hasArg(options::OPT_pie) || ToolChain.isPIEDefault());
|
||||
|
||||
ArgStringList CmdArgs;
|
||||
|
||||
|
|
@ -7938,9 +7937,9 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
if (Args.hasArg(options::OPT_s))
|
||||
CmdArgs.push_back("-s");
|
||||
|
||||
if (ToolChain.getArch() == llvm::Triple::armeb ||
|
||||
ToolChain.getArch() == llvm::Triple::thumbeb)
|
||||
arm::appendEBLinkFlags(Args, CmdArgs,
|
||||
if (Arch == llvm::Triple::armeb || Arch == llvm::Triple::thumbeb)
|
||||
arm::appendEBLinkFlags(
|
||||
Args, CmdArgs,
|
||||
llvm::Triple(getToolChain().ComputeEffectiveClangTriple(Args)));
|
||||
|
||||
for (const auto &Opt : ToolChain.ExtraOpts)
|
||||
|
|
@ -7954,10 +7953,8 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
CmdArgs.push_back(getLDMOption(ToolChain.getTriple(), Args));
|
||||
|
||||
if (Args.hasArg(options::OPT_static)) {
|
||||
if (ToolChain.getArch() == llvm::Triple::arm ||
|
||||
ToolChain.getArch() == llvm::Triple::armeb ||
|
||||
ToolChain.getArch() == llvm::Triple::thumb ||
|
||||
ToolChain.getArch() == llvm::Triple::thumbeb)
|
||||
if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
|
||||
Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb)
|
||||
CmdArgs.push_back("-Bstatic");
|
||||
else
|
||||
CmdArgs.push_back("-static");
|
||||
|
|
@ -7965,10 +7962,8 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
CmdArgs.push_back("-shared");
|
||||
}
|
||||
|
||||
if (ToolChain.getArch() == llvm::Triple::arm ||
|
||||
ToolChain.getArch() == llvm::Triple::armeb ||
|
||||
ToolChain.getArch() == llvm::Triple::thumb ||
|
||||
ToolChain.getArch() == llvm::Triple::thumbeb ||
|
||||
if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
|
||||
Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb ||
|
||||
(!Args.hasArg(options::OPT_static) &&
|
||||
!Args.hasArg(options::OPT_shared))) {
|
||||
CmdArgs.push_back("-dynamic-linker");
|
||||
|
|
@ -8143,17 +8138,17 @@ void nacltools::AssembleARM::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
// others. Eventually we can support more of that and hopefully migrate back
|
||||
// to gnutools::link.
|
||||
void nacltools::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
||||
const InputInfo &Output,
|
||||
const InputInfoList &Inputs,
|
||||
const ArgList &Args,
|
||||
const char *LinkingOutput) const {
|
||||
const InputInfo &Output,
|
||||
const InputInfoList &Inputs,
|
||||
const ArgList &Args,
|
||||
const char *LinkingOutput) const {
|
||||
|
||||
const toolchains::NaCl_TC& ToolChain =
|
||||
static_cast<const toolchains::NaCl_TC&>(getToolChain());
|
||||
const toolchains::NaCl_TC &ToolChain =
|
||||
static_cast<const toolchains::NaCl_TC &>(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);
|
||||
!Args.hasArg(options::OPT_dynamic) && !Args.hasArg(options::OPT_shared);
|
||||
|
||||
ArgStringList CmdArgs;
|
||||
|
||||
|
|
@ -8182,16 +8177,15 @@ void nacltools::Link::ConstructJob(Compilation &C, const JobAction &JA,
|
|||
CmdArgs.push_back("--eh-frame-hdr");
|
||||
|
||||
CmdArgs.push_back("-m");
|
||||
if (ToolChain.getArch() == llvm::Triple::x86)
|
||||
if (Arch == llvm::Triple::x86)
|
||||
CmdArgs.push_back("elf_i386_nacl");
|
||||
else if (ToolChain.getArch() == llvm::Triple::arm)
|
||||
else if (Arch == llvm::Triple::arm)
|
||||
CmdArgs.push_back("armelf_nacl");
|
||||
else if (ToolChain.getArch() == llvm::Triple::x86_64)
|
||||
else if (Arch == llvm::Triple::x86_64)
|
||||
CmdArgs.push_back("elf_x86_64_nacl");
|
||||
else
|
||||
D.Diag(diag::err_target_unsupported_arch) << ToolChain.getArchName() <<
|
||||
"Native Client";
|
||||
|
||||
D.Diag(diag::err_target_unsupported_arch) << ToolChain.getArchName()
|
||||
<< "Native Client";
|
||||
|
||||
if (IsStatic)
|
||||
CmdArgs.push_back("-static");
|
||||
|
|
|
|||
Loading…
Reference in New Issue