rename DefaultHostTriple into DefaultTargetTriple
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148137 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index ec344e0..ce4a89e 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -47,13 +47,13 @@
using namespace clang;
Driver::Driver(StringRef ClangExecutable,
- StringRef DefaultHostTriple,
+ StringRef DefaultTargetTriple,
StringRef DefaultImageName,
bool IsProduction,
DiagnosticsEngine &Diags)
: Opts(createDriverOptTable()), Diags(Diags),
ClangExecutable(ClangExecutable), UseStdLib(true),
- DefaultHostTriple(DefaultHostTriple), DefaultImageName(DefaultImageName),
+ DefaultTargetTriple(DefaultTargetTriple), DefaultImageName(DefaultImageName),
DriverTitle("clang \"gcc-compatible\" driver"),
Host(0),
CCPrintOptionsFilename(0), CCPrintHeadersFilename(0),
@@ -306,7 +306,7 @@
// FIXME: We shouldn't overwrite the default host triple here, but we have
// nowhere else to put this currently.
if (const Arg *A = Args->getLastArg(options::OPT_ccc_host_triple))
- DefaultHostTriple = A->getValue(*Args);
+ DefaultTargetTriple = A->getValue(*Args);
if (const Arg *A = Args->getLastArg(options::OPT_ccc_install_dir))
Dir = InstalledDir = A->getValue(*Args);
for (arg_iterator it = Args->filtered_begin(options::OPT_B),
@@ -320,7 +320,7 @@
if (Args->hasArg(options::OPT_nostdlib))
UseStdLib = false;
- Host = GetHostInfo(DefaultHostTriple.c_str());
+ Host = GetHostInfo(DefaultTargetTriple.c_str());
// Perform the default argument translations.
DerivedArgList *TranslatedArgs = TranslateInputArgs(*Args);
@@ -1507,7 +1507,7 @@
std::string Driver::GetProgramPath(const char *Name, const ToolChain &TC,
bool WantFile) const {
- std::string TargetSpecificExecutable(DefaultHostTriple + "-" + Name);
+ std::string TargetSpecificExecutable(DefaultTargetTriple + "-" + Name);
// Respect a limited subset of the '-Bprefix' functionality in GCC by
// attempting to use this prefix when lokup up program paths.
for (Driver::prefix_list::const_iterator it = PrefixDirs.begin(),
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 0ae91a8..5a1cd16 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -1096,7 +1096,7 @@
/// Once constructed, a GCCInstallation is esentially immutable.
Generic_GCC::GCCInstallationDetector::GCCInstallationDetector(const Driver &D)
: IsValid(false),
- GccTriple(D.DefaultHostTriple) {
+ GccTriple(D.DefaultTargetTriple) {
// FIXME: Using CXX_INCLUDE_ROOT is here is a bit of a hack, but
// avoids adding yet another option to configure/cmake.
// It would probably be cleaner to break it in two variables
@@ -1134,7 +1134,7 @@
// Always include the default host triple as the final fallback if no
// specific triple is detected.
- CandidateTriples.push_back(D.DefaultHostTriple);
+ CandidateTriples.push_back(D.DefaultTargetTriple);
// Compute the set of prefixes for our search.
SmallVector<std::string, 8> Prefixes(D.PrefixDirs.begin(),
@@ -1541,12 +1541,12 @@
// Determine if we are compiling 32-bit code on an x86_64 platform.
bool Lib32 = false;
if (Triple.getArch() == llvm::Triple::x86 &&
- llvm::Triple(getDriver().DefaultHostTriple).getArch() ==
+ llvm::Triple(getDriver().DefaultTargetTriple).getArch() ==
llvm::Triple::x86_64)
Lib32 = true;
if (Triple.getArch() == llvm::Triple::ppc &&
- llvm::Triple(getDriver().DefaultHostTriple).getArch() ==
+ llvm::Triple(getDriver().DefaultTargetTriple).getArch() ==
llvm::Triple::ppc64)
Lib32 = true;
@@ -1892,7 +1892,7 @@
Linux::Linux(const HostInfo &Host, const llvm::Triple &Triple)
: Generic_ELF(Host, Triple) {
llvm::Triple::ArchType Arch =
- llvm::Triple(getDriver().DefaultHostTriple).getArch();
+ llvm::Triple(getDriver().DefaultTargetTriple).getArch();
const std::string &SysRoot = getDriver().SysRoot;
// OpenSuse stores the linker with the compiler, add that to the search
@@ -2184,7 +2184,7 @@
// only support the suffix-based bi-arch-like header scheme for host/target
// mismatches of just bit width.
llvm::Triple::ArchType HostArch =
- llvm::Triple(getDriver().DefaultHostTriple).getArch();
+ llvm::Triple(getDriver().DefaultTargetTriple).getArch();
llvm::Triple::ArchType TargetArch = TargetTriple.getArch();
StringRef Suffix;
if ((HostArch == llvm::Triple::x86 && TargetArch == llvm::Triple::x86_64) ||