From c0cac34fd488c87b02727ef7416444ca221e461f Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Mon, 3 Sep 2012 18:25:49 +0800 Subject: [PATCH] Split Android to two cases. Split llvm::Triple::Android into llvm::Triple::Android and llvm::Triple::AndroidEABI, so that the result of isEABI("i686-linux-android") won't be true. --- lib/Basic/Targets.cpp | 2 +- lib/CodeGen/TargetInfo.cpp | 3 +-- lib/Driver/ToolChains.cpp | 2 +- lib/Driver/Tools.cpp | 11 ++++++----- test/Driver/linux-ld.c | 14 -------------- 5 files changed, 9 insertions(+), 23 deletions(-) diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index fa1948e..9512bf7 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -316,7 +316,7 @@ protected: DefineStd(Builder, "linux", Opts); Builder.defineMacro("__gnu_linux__"); Builder.defineMacro("__ELF__"); - if (Triple.getEnvironment() == llvm::Triple::Android) + if (Triple.isEnvironmentAndroid()) Builder.defineMacro("__ANDROID__", "1"); if (Opts.POSIXThreads) Builder.defineMacro("_REENTRANT"); diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index bbffc9e..9c23ed9 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -2576,8 +2576,7 @@ public: bool isEABI() const { StringRef Env = getContext().getTargetInfo().getTriple().getEnvironmentName(); - return (Env == "gnueabi" || Env == "eabi" || - Env == "android" || Env == "androideabi"); + return (Env == "gnueabi" || Env == "eabi" || Env == "androideabi"); } private: diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 8876d95..36235f7 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -2064,7 +2064,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) Arch == llvm::Triple::mips64 || Arch == llvm::Triple::mips64el; - const bool IsAndroid = Triple.getEnvironment() == llvm::Triple::Android; + const bool IsAndroid = Triple.isEnvironmentAndroid(); // Do not use 'gnu' hash style for Mips targets because .gnu.hash // and the MIPS ABI require .dynsym to be sorted in different ways. diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 348d120..3f990b1 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -643,7 +643,8 @@ 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::Android: { + case llvm::Triple::Android: + case llvm::Triple::AndroidEABI: { std::string ArchName = getLLVMArchSuffixForARM(getARMTargetCPU(Args, Triple)); if (StringRef(ArchName).startswith("v7")) @@ -681,6 +682,7 @@ void Clang::AddARMTargetArgs(const ArgList &Args, // Select the default based on the platform. switch(Triple.getEnvironment()) { case llvm::Triple::Android: + case llvm::Triple::AndroidEABI: case llvm::Triple::GNUEABI: case llvm::Triple::GNUEABIHF: ABIName = "aapcs-linux"; @@ -1406,7 +1408,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::Android) { + if(TC.getTriple().isEnvironmentAndroid()) { if (!Args.hasArg(options::OPT_shared)) { if (!Args.hasArg(options::OPT_pie)) TC.getDriver().Diag(diag::err_drv_asan_android_requires_pie); @@ -5576,7 +5578,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::Android; + bool isAndroid = Triple.isEnvironmentAndroid(); bool StaticLibgcc = isAndroid || Args.hasArg(options::OPT_static) || Args.hasArg(options::OPT_static_libgcc); if (!D.CCCIsCXX) @@ -5607,8 +5609,7 @@ void linuxtools::Link::ConstructJob(Compilation &C, const JobAction &JA, const toolchains::Linux& ToolChain = static_cast(getToolChain()); const Driver &D = ToolChain.getDriver(); - const bool isAndroid = ToolChain.getTriple().getEnvironment() == - llvm::Triple::Android; + const bool isAndroid = ToolChain.getTriple().isEnvironmentAndroid(); ArgStringList CmdArgs; diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c index 003bc9f..4c9498e 100644 --- a/test/Driver/linux-ld.c +++ b/test/Driver/linux-ld.c @@ -367,10 +367,6 @@ // RUN: -target arm-linux-androideabi \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s -// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -// RUN: -target arm-linux-android \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s // CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" // CHECK-ANDROID: "{{.*}}/crtbegin_dynamic.o" // CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib" @@ -383,11 +379,6 @@ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ // RUN: -shared \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s -// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -// RUN: -target arm-linux-android \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -shared \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s // CHECK-ANDROID-SO: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" // CHECK-ANDROID-SO: "{{.*}}/crtbegin_so.o" // CHECK-ANDROID-SO: "-L[[SYSROOT]]/usr/lib" @@ -400,11 +391,6 @@ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ // RUN: -static \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s -// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -// RUN: -target arm-linux-android \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -static \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s // CHECK-ANDROID-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" // CHECK-ANDROID-STATIC: "{{.*}}/crtbegin_static.o" // CHECK-ANDROID-STATIC: "-L[[SYSROOT]]/usr/lib" -- 1.7.7.3