File tree Expand file tree Collapse file tree 3 files changed +1
-19
lines changed
lib/Driver/ToolChains/Arch Expand file tree Collapse file tree 3 files changed +1
-19
lines changed Original file line number Diff line number Diff line change @@ -443,14 +443,13 @@ arm::FloatABI arm::getDefaultFloatABI(const llvm::Triple &Triple) {
443443 case llvm::Triple::MuslEABIHF:
444444 case llvm::Triple::EABIHF:
445445 return FloatABI::Hard;
446+ case llvm::Triple::Android:
446447 case llvm::Triple::GNUEABI:
447448 case llvm::Triple::GNUEABIT64:
448449 case llvm::Triple::MuslEABI:
449450 case llvm::Triple::EABI:
450451 // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
451452 return FloatABI::SoftFP;
452- case llvm::Triple::Android:
453- return (SubArch >= 7 ) ? FloatABI::SoftFP : FloatABI::Soft;
454453 default :
455454 return FloatABI::Invalid;
456455 }
Original file line number Diff line number Diff line change 388388// CHECK-SOFT-ABI-FP-DAG: "-target-feature" "-aes"
389389// CHECK-SOFT-ABI-FP-DAG: "-target-feature" "-fpregs"
390390
391- // RUN: %clang -target arm-linux-androideabi21 %s -### -c 2>&1 \
392- // RUN: | FileCheck --check-prefix=CHECK-ARM5-ANDROID-FP-DEFAULT %s
393- // CHECK-ARM5-ANDROID-FP-DEFAULT-DAG: "-target-feature" "+soft-float"
394- // CHECK-ARM5-ANDROID-FP-DEFAULT-DAG: "-target-feature" "+soft-float-abi"
395- // CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+d32"
396- // CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+vfp3"
397- // CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+vfp4"
398- // CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+fp-armv8"
399- // CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+neon"
400- // CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+sha2"
401- // CHECK-ARM5-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+aes"
402-
403391// RUN: %clang -target armv7-linux-androideabi21 %s -### -c 2>&1 \
404392// RUN: | FileCheck --check-prefix=CHECK-ARM7-ANDROID-FP-DEFAULT %s
405393// CHECK-ARM7-ANDROID-FP-DEFAULT-NOT: "-target-feature" "+soft-float"
Original file line number Diff line number Diff line change 106106// RUN: | FileCheck -check-prefix=CHECK-ARM-MFLOAT-ABI %s
107107// CHECK-ARM-MFLOAT-ABI: as{{(.exe)?}}" "-EL" "-mfloat-abi=hard"
108108//
109- // RUN: %clang -target arm-linux-androideabi -### \
110- // RUN: -no-integrated-as -c %s 2>&1 \
111- // RUN: | FileCheck -check-prefix=CHECK-ARM-ANDROID %s
112- // CHECK-ARM-ANDROID: as{{(.exe)?}}" "-EL" "-mfloat-abi=soft"
113- //
114109// RUN: %clang -target arm-linux-androideabi -march=armv7-a -### \
115110// RUN: -no-integrated-as -c %s 2>&1 \
116111// RUN: | FileCheck -check-prefix=CHECK-ARM-ANDROID-SOFTFP %s
You can’t perform that action at this time.
0 commit comments