diff options
Diffstat (limited to 'lib/Driver')
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 5 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 3034ede2ae..3dcdf13f00 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -1164,7 +1164,10 @@ Generic_GCC::GCCInstallationDetector::GCCInstallationDetector(const Driver &D) SmallVectorImpl<StringRef> &Triples) { if (HostArch == llvm::Triple::arm || HostArch == llvm::Triple::thumb) { static const char *const ARMLibDirs[] = { "/lib" }; - static const char *const ARMTriples[] = { "arm-linux-gnueabi" }; + static const char *const ARMTriples[] = { + "arm-linux-gnueabi", + "arm-linux-androideabi" + }; LibDirs.append(ARMLibDirs, ARMLibDirs + llvm::array_lengthof(ARMLibDirs)); Triples.append(ARMTriples, ARMTriples + llvm::array_lengthof(ARMTriples)); } else if (HostArch == llvm::Triple::x86_64) { diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index bd3d638afd..a241712da9 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -517,6 +517,7 @@ void Clang::AddARMTargetArgs(const ArgList &Args, } else { // Select the default based on the platform. switch(Triple.getEnvironment()) { + case llvm::Triple::ANDROIDEABI: case llvm::Triple::GNUEABI: ABIName = "aapcs-linux"; break; @@ -589,6 +590,15 @@ void Clang::AddARMTargetArgs(const ArgList &Args, // EABI is always AAPCS, and if it was not marked 'hard', it's softfp FloatABI = "softfp"; break; + case llvm::Triple::ANDROIDEABI: { + StringRef ArchName = + getLLVMArchSuffixForARM(getARMTargetCPU(Args, Triple)); + if (ArchName.startswith("v7")) + FloatABI = "softfp"; + else + FloatABI = "soft"; + break; + } default: // Assume "soft", but warn the user we are guessing. FloatABI = "soft"; |