diff options
| author | Logan Chien <tzuhsiang.chien@gmail.com> | 2012-09-02 09:30:11 +0000 |
|---|---|---|
| committer | Logan Chien <tzuhsiang.chien@gmail.com> | 2012-09-02 09:30:11 +0000 |
| commit | 94a7142f74bb4a9daa53c22087b19d4568073109 (patch) | |
| tree | e8fcfbe7d9069cf5702255804d89a49dab05d4ec /lib/Driver/Tools.cpp | |
| parent | ca0d10edcf1192ab8546a75e8be5bab7ef32e488 (diff) | |
Rename ANDROIDEABI to Android.
Most of the code guarded with ANDROIDEABI are not
ARM-specific, and having no relation with arm-eabi.
Thus, it will be more natural to call this
environment "Android" instead of "ANDROIDEABI".
Note: We are not using ANDROID because several projects
are using "-DANDROID" as the conditional compilation
flag.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163088 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 3c46e34ac7..348d12089e 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -643,7 +643,7 @@ static StringRef getARMFloatABI(const Driver &D, // EABI is always AAPCS, and if it was not marked 'hard', it's softfp FloatABI = "softfp"; break; - case llvm::Triple::ANDROIDEABI: { + case llvm::Triple::Android: { std::string ArchName = getLLVMArchSuffixForARM(getARMTargetCPU(Args, Triple)); if (StringRef(ArchName).startswith("v7")) @@ -680,7 +680,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::Android: case llvm::Triple::GNUEABI: case llvm::Triple::GNUEABIHF: ABIName = "aapcs-linux"; @@ -1406,7 +1406,7 @@ static void addAsanRTLinux(const ToolChain &TC, const ArgList &Args, if (!Args.hasFlag(options::OPT_faddress_sanitizer, options::OPT_fno_address_sanitizer, false)) return; - if(TC.getTriple().getEnvironment() == llvm::Triple::ANDROIDEABI) { + if(TC.getTriple().getEnvironment() == llvm::Triple::Android) { if (!Args.hasArg(options::OPT_shared)) { if (!Args.hasArg(options::OPT_pie)) TC.getDriver().Diag(diag::err_drv_asan_android_requires_pie); @@ -5576,7 +5576,7 @@ void linuxtools::Assemble::ConstructJob(Compilation &C, const JobAction &JA, static void AddLibgcc(llvm::Triple Triple, const Driver &D, ArgStringList &CmdArgs, const ArgList &Args) { - bool isAndroid = Triple.getEnvironment() == llvm::Triple::ANDROIDEABI; + bool isAndroid = Triple.getEnvironment() == llvm::Triple::Android; bool StaticLibgcc = isAndroid || Args.hasArg(options::OPT_static) || Args.hasArg(options::OPT_static_libgcc); if (!D.CCCIsCXX) @@ -5608,7 +5608,7 @@ void linuxtools::Link::ConstructJob(Compilation &C, const JobAction &JA, static_cast<const toolchains::Linux&>(getToolChain()); const Driver &D = ToolChain.getDriver(); const bool isAndroid = ToolChain.getTriple().getEnvironment() == - llvm::Triple::ANDROIDEABI; + llvm::Triple::Android; ArgStringList CmdArgs; |