averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19476 from drodriguez/android-aarch64-compiler

Browse Source
This commit is contained in:
swift-ci
2018-10-14 19:02:23 -07:00
committed by GitHub
parent d480362835 02e26d2810
commit cb5d34e7c7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Driver/UnixToolChains.cpp
View File

@@ -340,13 +340,13 @@ toolchains::GenericUnix::constructInvocation(const LinkJobAction &job,
}
std::string toolchains::Android::getTargetForLinker() const {
// Explicitly set the linker target to "androideabi", as opposed to the
// llvm::Triple representation of "armv7-none-linux-android".
// This is the only ABI we currently support for Android.
assert(getTriple().getArch() == llvm::Triple::arm &&
getTriple().getSubArch() == llvm::Triple::SubArchType::ARMSubArch_v7 &&
"Only armv7 targets are supported for Android");
return "armv7-none-linux-androideabi";
const llvm::Triple &T = getTriple();
if (T.getArch() == llvm::Triple::arm &&
T.getSubArch() == llvm::Triple::SubArchType::ARMSubArch_v7)
// Explicitly set the linker target to "androideabi", as opposed to the
// llvm::Triple representation of "armv7-none-linux-android".
return "armv7-none-linux-androideabi";
return T.str();
}
bool toolchains::Android::shouldProvideRPathToLinker() const { return false; }