Author: AdityaK Date: 2023-03-23T13:52:38-07:00 New Revision: 156d966ec47041a071022460d68d94717460fa5a
URL: https://github.com/llvm/llvm-project/commit/156d966ec47041a071022460d68d94717460fa5a DIFF: https://github.com/llvm/llvm-project/commit/156d966ec47041a071022460d68d94717460fa5a.diff LOG: Remove mips target triple for Android Reviewers: enh, phosek, srhines, MaskRay thanks to @enh for pointing these out. Differential Revision: https://reviews.llvm.org/D146565 Added: Modified: clang/lib/Driver/ToolChains/Gnu.cpp clang/lib/Driver/ToolChains/Linux.cpp clang/test/Driver/android-ndk-standalone.cpp clang/test/Driver/android-pie.c clang/test/Driver/android-standalone.cpp clang/test/Driver/clang-translation.c clang/test/Driver/linux-ld.c clang/test/Driver/pic.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 7e72a1d1433da..0c8868109f7ee 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2431,9 +2431,6 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( static const char *const AArch64AndroidTriples[] = { "aarch64-linux-android"}; static const char *const ARMAndroidTriples[] = {"arm-linux-androideabi"}; - static const char *const MIPSELAndroidTriples[] = {"mipsel-linux-android"}; - static const char *const MIPS64ELAndroidTriples[] = { - "mips64el-linux-android"}; static const char *const X86AndroidTriples[] = {"i686-linux-android"}; static const char *const X86_64AndroidTriples[] = {"x86_64-linux-android"}; @@ -2448,22 +2445,6 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs)); TripleAliases.append(begin(ARMAndroidTriples), end(ARMAndroidTriples)); break; - case llvm::Triple::mipsel: - LibDirs.append(begin(MIPSELLibDirs), end(MIPSELLibDirs)); - TripleAliases.append(begin(MIPSELAndroidTriples), - end(MIPSELAndroidTriples)); - BiarchLibDirs.append(begin(MIPS64ELLibDirs), end(MIPS64ELLibDirs)); - BiarchTripleAliases.append(begin(MIPS64ELAndroidTriples), - end(MIPS64ELAndroidTriples)); - break; - case llvm::Triple::mips64el: - LibDirs.append(begin(MIPS64ELLibDirs), end(MIPS64ELLibDirs)); - TripleAliases.append(begin(MIPS64ELAndroidTriples), - end(MIPS64ELAndroidTriples)); - BiarchLibDirs.append(begin(MIPSELLibDirs), end(MIPSELLibDirs)); - BiarchTripleAliases.append(begin(MIPSELAndroidTriples), - end(MIPSELAndroidTriples)); - break; case llvm::Triple::x86_64: LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); TripleAliases.append(begin(X86_64AndroidTriples), diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index e25895fd0b636..77ad9605addab 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -92,8 +92,6 @@ std::string Linux::getMultiarchTriple(const Driver &D, case llvm::Triple::mips: return IsMipsR6 ? "mipsisa32r6-linux-gnu" : "mips-linux-gnu"; case llvm::Triple::mipsel: - if (IsAndroid) - return "mipsel-linux-android"; return IsMipsR6 ? "mipsisa32r6el-linux-gnu" : "mipsel-linux-gnu"; case llvm::Triple::mips64: { std::string MT = std::string(IsMipsR6 ? "mipsisa64r6" : "mips64") + @@ -105,8 +103,6 @@ std::string Linux::getMultiarchTriple(const Driver &D, break; } case llvm::Triple::mips64el: { - if (IsAndroid) - return "mips64el-linux-android"; std::string MT = std::string(IsMipsR6 ? "mipsisa64r6el" : "mips64el") + "-linux-" + (IsMipsN32Abi ? "gnuabin32" : "gnuabi64"); if (D.getVFS().exists(concat(SysRoot, "/lib", MT))) diff --git a/clang/test/Driver/android-ndk-standalone.cpp b/clang/test/Driver/android-ndk-standalone.cpp index aeb2678c9caae..397460dbd7803 100644 --- a/clang/test/Driver/android-ndk-standalone.cpp +++ b/clang/test/Driver/android-ndk-standalone.cpp @@ -246,22 +246,6 @@ // CHECK-ARM64: "-L{{.*}}/lib/gcc/aarch64-linux-android/4.9/../../../../aarch64-linux-android/lib" // // RUN: %clang -### %s 2>&1 \ -// RUN: --target=mipsel-linux-android21 \ -// RUN: -mips32 \ -// RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \ -// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-MIPS %s -// CHECK-MIPS: "-cc1" -// CHECK-MIPS: "-internal-isystem" "{{.*}}/include/c++/v1" -// CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/include" -// CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" -// CHECK-MIPS: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" -// CHECK-MIPS: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.9" -// CHECK-MIPS: "-L{{.*}}/sysroot/usr/lib/mipsel-linux-android/21" -// CHECK-MIPS: "-L{{.*}}/sysroot/usr/lib/mipsel-linux-android" -// CHECK-MIPS: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.9/../../../../mipsel-linux-android/lib" -// -// RUN: %clang -### %s 2>&1 \ // RUN: --target=i686-linux-android21 \ // RUN: --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \ // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ diff --git a/clang/test/Driver/android-pie.c b/clang/test/Driver/android-pie.c index c006b90891e89..8620e18565458 100644 --- a/clang/test/Driver/android-pie.c +++ b/clang/test/Driver/android-pie.c @@ -8,11 +8,6 @@ // RUN: %clang %s -### -o %t.o 2>&1 --target=arm-linux-android24 \ // RUN: | FileCheck --check-prefix=PIE %s -// RUN: %clang %s -### -o %t.o 2>&1 --target=mipsel-linux-android \ -// RUN: | FileCheck --check-prefix=PIE %s -// RUN: %clang %s -### -o %t.o 2>&1 --target=mipsel-linux-android24 \ -// RUN: | FileCheck --check-prefix=PIE %s - // RUN: %clang %s -### -o %t.o 2>&1 --target=i686-linux-android \ // RUN: | FileCheck --check-prefix=PIE %s // RUN: %clang %s -### -o %t.o 2>&1 --target=i686-linux-android24 \ @@ -28,11 +23,6 @@ // RUN: %clang %s -### -o %t.o 2>&1 --target=arm64-linux-android24 \ // RUN: | FileCheck --check-prefix=PIE %s -// RUN: %clang %s -### -o %t.o 2>&1 --target=mips64el-linux-android \ -// RUN: | FileCheck --check-prefix=PIE %s -// RUN: %clang %s -### -o %t.o 2>&1 --target=mips64el-linux-android24 \ -// RUN: | FileCheck --check-prefix=PIE %s - // RUN: %clang %s -### -o %t.o 2>&1 --target=x86_64-linux-android \ // RUN: | FileCheck --check-prefix=PIE %s // RUN: %clang %s -### -o %t.o 2>&1 --target=x86_64-linux-android24 \ diff --git a/clang/test/Driver/android-standalone.cpp b/clang/test/Driver/android-standalone.cpp index 7363497c880a5..0246d1371deb9 100644 --- a/clang/test/Driver/android-standalone.cpp +++ b/clang/test/Driver/android-standalone.cpp @@ -45,51 +45,3 @@ // CHECK-ARM64: "-L{{.*}}/lib/gcc/aarch64-linux-android/4.8" // CHECK-ARM64: "-L{{.*}}/lib/gcc/aarch64-linux-android/4.8/../../../../aarch64-linux-android/lib" // CHECK-ARM64: "-L{{.*}}/sysroot/usr/lib" -// -// RUN: %clang -### %s 2>&1 \ -// RUN: --target=mipsel-linux-android \ -// RUN: -mips32 -stdlib=libstdc++ \ -// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-MIPS %s -// CHECK-MIPS: "-cc1" -// CHECK-MIPS: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3" -// CHECK-MIPS: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3/mipsel-linux-android" -// CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/include" -// CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" -// CHECK-MIPS: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" -// CHECK-MIPS: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.4.3" -// CHECK-MIPS: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.4.3/../../../../mipsel-linux-android/lib" -// CHECK-MIPS: "-L{{.*}}/sysroot/usr/lib" -// -// RUN: %clang -### %s 2>&1 \ -// RUN: --target=mipsel-linux-android \ -// RUN: -march=mips32 -mips32r2 -stdlib=libstdc++ \ -// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-MIPSR2 %s -// CHECK-MIPSR2: "-cc1" -// CHECK-MIPSR2: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3" -// CHECK-MIPSR2: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3/mipsel-linux-android" -// CHECK-MIPSR2: "-internal-externc-isystem" "{{.*}}/sysroot/include" -// CHECK-MIPSR2: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" -// CHECK-MIPSR2: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" -// CHECK-MIPSR2: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.4.3/mips-r2" -// CHECK-MIPSR2: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.4.3/../../../../mipsel-linux-android/lib" -// CHECK-MIPSR2: "-L{{.*}}/sysroot/usr/lib" -// -// RUN: %clang -### %s 2>&1 \ -// RUN: --target=mipsel-linux-android \ -// RUN: -mips32 -march=mips32r2 -stdlib=libstdc++ \ -// RUN: --gcc-toolchain=%S/Inputs/basic_android_tree \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-MIPSR2-A %s -// CHECK-MIPSR2-A: "-cc1" -// CHECK-MIPSR2-A: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3" -// CHECK-MIPSR2-A: "-internal-isystem" "{{.*}}/mipsel-linux-android/include/c++/4.4.3/mipsel-linux-android" -// CHECK-MIPSR2-A: "-internal-externc-isystem" "{{.*}}/sysroot/include" -// CHECK-MIPSR2-A: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" -// CHECK-MIPSR2-A: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" -// CHECK-MIPSR2-A: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.4.3/mips-r2" -// CHECK-MIPSR2-A: "-L{{.*}}/lib/gcc/mipsel-linux-android/4.4.3/../../../../mipsel-linux-android/lib" -// CHECK-MIPSR2-A: "-L{{.*}}/sysroot/usr/lib" diff --git a/clang/test/Driver/clang-translation.c b/clang/test/Driver/clang-translation.c index ca98ca5e8228d..058ac32bbdb50 100644 --- a/clang/test/Driver/clang-translation.c +++ b/clang/test/Driver/clang-translation.c @@ -392,24 +392,6 @@ // MIPSR6EL: "-target-cpu" "mips32r6" // MIPSR6EL: "-mfloat-abi" "hard" -// RUN: %clang -target mipsel-linux-android -### -S %s 2>&1 | \ -// RUN: FileCheck -check-prefix=MIPSEL-ANDROID %s -// MIPSEL-ANDROID: clang -// MIPSEL-ANDROID: "-cc1" -// MIPSEL-ANDROID: "-target-cpu" "mips32" -// MIPSEL-ANDROID: "-target-feature" "+fpxx" -// MIPSEL-ANDROID: "-target-feature" "+nooddspreg" -// MIPSEL-ANDROID: "-mfloat-abi" "hard" - -// RUN: %clang -target mipsel-linux-android -### -S %s -mcpu=mips32r6 2>&1 | \ -// RUN: FileCheck -check-prefix=MIPSEL-ANDROID-R6 %s -// MIPSEL-ANDROID-R6: clang -// MIPSEL-ANDROID-R6: "-cc1" -// MIPSEL-ANDROID-R6: "-target-cpu" "mips32r6" -// MIPSEL-ANDROID-R6: "-target-feature" "+fp64" -// MIPSEL-ANDROID-R6: "-target-feature" "+nooddspreg" -// MIPSEL-ANDROID-R6: "-mfloat-abi" "hard" - // RUN: %clang -target mips64-linux-gnu -### -S %s 2>&1 | \ // RUN: FileCheck -check-prefix=MIPS64 %s // MIPS64: clang diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c index 10e6bee183050..be1230ac0ab63 100644 --- a/clang/test/Driver/linux-ld.c +++ b/clang/test/Driver/linux-ld.c @@ -1046,16 +1046,6 @@ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s // RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mipsel-linux-android -rtlib=platform --unwindlib=platform \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s -// RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mips64el-linux-android -rtlib=platform --unwindlib=platform \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s -// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: --target=i686-linux-android -rtlib=platform --unwindlib=platform \ // RUN: --gcc-toolchain="" \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ @@ -1101,18 +1091,6 @@ // RUN: -shared \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s // RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mipsel-linux-android -rtlib=platform --unwindlib=platform \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -shared \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s -// RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mips64el-linux-android -rtlib=platform --unwindlib=platform \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -shared \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s -// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: --target=i686-linux-android -rtlib=platform --unwindlib=platform \ // RUN: --gcc-toolchain="" \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ @@ -1158,18 +1136,6 @@ // RUN: -static \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s // RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mipsel-linux-android -rtlib=platform --unwindlib=platform \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -static \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s -// RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mips64el-linux-android -rtlib=platform --unwindlib=platform \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -static \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s -// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: --target=i686-linux-android -rtlib=platform --unwindlib=platform \ // RUN: --gcc-toolchain="" \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ @@ -1216,18 +1182,6 @@ // RUN: -pie \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s // RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mipsel-linux-android -rtlib=platform --unwindlib=platform \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -pie \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s -// RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mips64el-linux-android -rtlib=platform --unwindlib=platform \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -pie \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s -// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: --target=i686-linux-android -rtlib=platform --unwindlib=platform \ // RUN: --gcc-toolchain="" \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ @@ -1259,11 +1213,6 @@ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-32 %s // RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mipsel-linux-android \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-32 %s -// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: --target=aarch64-linux-android \ // RUN: --gcc-toolchain="" \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ @@ -1313,15 +1262,6 @@ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD %s // RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mipsel-linux-android -pthread \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD %s -// RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mips64el-linux-android -pthread \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD %s -// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: --target=i686-linux-android -pthread \ // RUN: --gcc-toolchain="" \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ @@ -1356,18 +1296,6 @@ // RUN: -shared \ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD %s // RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mipsel-linux-android -pthread \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -shared \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD %s -// RUN: %clang -### %s -no-pie 2>&1 \ -// RUN: --target=mips64el-linux-android -pthread \ -// RUN: --gcc-toolchain="" \ -// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -// RUN: -shared \ -// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD %s -// RUN: %clang -### %s -no-pie 2>&1 \ // RUN: --target=i686-linux-android -pthread \ // RUN: --gcc-toolchain="" \ // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ diff --git a/clang/test/Driver/pic.c b/clang/test/Driver/pic.c index b05f363603a2a..daa3a55430068 100644 --- a/clang/test/Driver/pic.c +++ b/clang/test/Driver/pic.c @@ -280,9 +280,6 @@ // RUN: %clang -c %s -target arm-linux-androideabi24 -### 2>&1 \ // RUN: | FileCheck %s --check-prefix=CHECK-PIE2 // -// RUN: %clang -c %s -target mipsel-linux-android24 -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIE1 -// // 64-bit Android targets are always PIE. // RUN: %clang -c %s -target aarch64-linux-android -### 2>&1 \ // RUN: | FileCheck %s --check-prefix=CHECK-PIE2 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
