Author: AdityaK Date: 2025-01-22T23:29:35-08:00 New Revision: 2b67eceeef6e04ae5a4093bec9a0f0b048c70958
URL: https://github.com/llvm/llvm-project/commit/2b67eceeef6e04ae5a4093bec9a0f0b048c70958 DIFF: https://github.com/llvm/llvm-project/commit/2b67eceeef6e04ae5a4093bec9a0f0b048c70958.diff LOG: Android no longer supports arm < 7 (#123952) Added: Modified: clang/lib/Driver/ToolChains/Arch/ARM.cpp clang/test/Driver/arm-mfpu.c clang/test/Driver/linux-as.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp index f9d8aacaad234d..3aee540d501bef 100644 --- a/clang/lib/Driver/ToolChains/Arch/ARM.cpp +++ b/clang/lib/Driver/ToolChains/Arch/ARM.cpp @@ -443,14 +443,13 @@ arm::FloatABI arm::getDefaultFloatABI(const llvm::Triple &Triple) { case llvm::Triple::MuslEABIHF: case llvm::Triple::EABIHF: return FloatABI::Hard; + case llvm::Triple::Android: case llvm::Triple::GNUEABI: case llvm::Triple::GNUEABIT64: case llvm::Triple::MuslEABI: case llvm::Triple::EABI: // EABI is always AAPCS, and if it was not marked 'hard', it's softfp return FloatABI::SoftFP; - case llvm::Triple::Android: - return (SubArch >= 7) ? FloatABI::SoftFP : FloatABI::Soft; default: return FloatABI::Invalid; } diff --git a/clang/test/Driver/arm-mfpu.c b/clang/test/Driver/arm-mfpu.c index 5ea2230044dfbb..640e1b35c84b89 100644 --- a/clang/test/Driver/arm-mfpu.c +++ b/clang/test/Driver/arm-mfpu.c @@ -388,18 +388,6 @@ // CHECK-SOFT-ABI-FP-DAG: "-target-feature" "-aes" // CHECK-SOFT-ABI-FP-DAG: "-target-feature" "-fpregs" -// RUN: %clang -target arm-linux-androideabi21 %s -### -c 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-ARM5-ANDROID-FP-DEFAULT %s -// CHECK-ARM5-ANDROID-FP-DEFAULT-DAG: "-target-feature" "+soft-float" -// CHECK-ARM5-ANDROID-FP-DEFAULT-DAG: "-target-feature" "+soft-float-abi" -// CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+d32" -// CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+vfp3" -// CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+vfp4" -// CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+fp-armv8" -// CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+neon" -// CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+sha2" -// CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+aes" - // RUN: %clang -target armv7-linux-androideabi21 %s -### -c 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-ARM7-ANDROID-FP-DEFAULT %s // CHECK-ARM7-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+soft-float" diff --git a/clang/test/Driver/linux-as.c b/clang/test/Driver/linux-as.c index fb6de85ba105b0..2b394b7cd3d412 100644 --- a/clang/test/Driver/linux-as.c +++ b/clang/test/Driver/linux-as.c @@ -106,11 +106,6 @@ // RUN: | FileCheck -check-prefix=CHECK-ARM-MFLOAT-ABI %s // CHECK-ARM-MFLOAT-ABI: as{{(.exe)?}}" "-EL" "-mfloat-abi=hard" // -// RUN: %clang -target arm-linux-androideabi -### \ -// RUN: -no-integrated-as -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix=CHECK-ARM-ANDROID %s -// CHECK-ARM-ANDROID: as{{(.exe)?}}" "-EL" "-mfloat-abi=soft" -// // RUN: %clang -target arm-linux-androideabi -march=armv7-a -### \ // RUN: -no-integrated-as -c %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK-ARM-ANDROID-SOFTFP %s _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
