diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2014-05-11 18:26:10 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2014-05-11 18:26:10 +0000 |
commit | f73d5f23a889b93d89ddef61ac0995df40286bb8 (patch) | |
tree | c89fa0adefb99f464eba263b447f84c2ceb663ce /lib/Driver/ToolChains.cpp | |
parent | 33fa48314f06936f83859852feb3c0ce68b08c0c (diff) | |
download | src-f73d5f23a889b93d89ddef61ac0995df40286bb8.tar.gz src-f73d5f23a889b93d89ddef61ac0995df40286bb8.zip |
Vendor import of clang RELEASE_34/dot1-final tag r208032 (effectively, 3.4.1 release):vendor/clang/clang-release_34-r208032
Notes
Notes:
svn path=/vendor/clang/dist/; revision=265891
svn path=/vendor/clang/clang-release_34-r208032/; revision=265892; tag=vendor/clang/clang-release_34-r208032
Diffstat (limited to 'lib/Driver/ToolChains.cpp')
-rw-r--r-- | lib/Driver/ToolChains.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index e5528f0a646b..46883357e229 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -1622,6 +1622,21 @@ bool Generic_GCC::isPICDefaultForced() const { return false; } +void Generic_GCC::addClangTargetOptions(const ArgList &DriverArgs, + ArgStringList &CC1Args) const { + const Generic_GCC::GCCVersion &V = GCCInstallation.getVersion(); + bool UseInitArrayDefault = + getTriple().getArch() == llvm::Triple::aarch64 || + (getTriple().getOS() == llvm::Triple::Linux && ( + !V.isOlderThan(4, 7, 0) || + getTriple().getEnvironment() == llvm::Triple::Android)); + + if (DriverArgs.hasFlag(options::OPT_fuse_init_array, + options::OPT_fno_use_init_array, + UseInitArrayDefault)) + CC1Args.push_back("-fuse-init-array"); +} + /// Hexagon Toolchain std::string Hexagon_TC::GetGnuDir(const std::string &InstalledDir) { @@ -2536,19 +2551,6 @@ Tool *Linux::buildAssembler() const { return new tools::gnutools::Assemble(*this); } -void Linux::addClangTargetOptions(const ArgList &DriverArgs, - ArgStringList &CC1Args) const { - const Generic_GCC::GCCVersion &V = GCCInstallation.getVersion(); - bool UseInitArrayDefault = - !V.isOlderThan(4, 7, 0) || - getTriple().getArch() == llvm::Triple::aarch64 || - getTriple().getEnvironment() == llvm::Triple::Android; - if (DriverArgs.hasFlag(options::OPT_fuse_init_array, - options::OPT_fno_use_init_array, - UseInitArrayDefault)) - CC1Args.push_back("-fuse-init-array"); -} - std::string Linux::computeSysRoot() const { if (!getDriver().SysRoot.empty()) return getDriver().SysRoot; |