diff options
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Driver/darwin-embedded.c | 15 |
2 files changed, 14 insertions, 8 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 74bfc6ebde5..75424e87006 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -803,7 +803,12 @@ arm::FloatABI arm::getARMFloatABI(const ToolChain &TC, const ArgList &Args) { break; default: // Assume "soft", but warn the user we are guessing. - ABI = FloatABI::Soft; + if (Triple.isOSBinFormatMachO() && + Triple.getSubArch() == llvm::Triple::ARMSubArch_v7em) + ABI = FloatABI::Hard; + else + ABI = FloatABI::Soft; + if (Triple.getOS() != llvm::Triple::UnknownOS || !Triple.isOSBinFormatMachO()) D.Diag(diag::warn_drv_assuming_mfloat_abi_is) << "soft"; diff --git a/clang/test/Driver/darwin-embedded.c b/clang/test/Driver/darwin-embedded.c index 66b7bd9fa7f..beb8b195c42 100644 --- a/clang/test/Driver/darwin-embedded.c +++ b/clang/test/Driver/darwin-embedded.c @@ -1,6 +1,6 @@ // RUN: %clang -target x86_64-apple-darwin -arch armv6m -resource-dir=%S/Inputs/resource_dir %s -### 2> %t // RUN: %clang -target x86_64-apple-darwin -arch armv7em -resource-dir=%S/Inputs/resource_dir %s -### 2>> %t -// RUN: %clang -target x86_64-apple-darwin -arch armv7em -mhard-float -resource-dir=%S/Inputs/resource_dir %s -### 2>> %t +// RUN: %clang -target x86_64-apple-darwin -arch armv7em -mfloat-abi=soft -resource-dir=%S/Inputs/resource_dir %s -### 2>> %t // RUN: %clang -target x86_64-apple-darwin -arch armv7m -fPIC -resource-dir=%S/Inputs/resource_dir %s -### 2>> %t // RUN: %clang -target x86_64-apple-darwin -arch armv7em -fPIC -mfloat-abi=hard -resource-dir=%S/Inputs/resource_dir %s -### 2>> %t @@ -17,17 +17,18 @@ // CHECK: "-mfloat-abi" "soft" // CHECK: libclang_rt.soft_static.a -// ARMv7em does, but defaults to soft +// ARMv7em does // CHECK-LABEL: Target: // CHECK-NOT: warning: unknown platform -// CHECK: "-mfloat-abi" "soft" -// CHECK: libclang_rt.soft_static.a +// CHECK: "-mfloat-abi" "hard" +// CHECK: libclang_rt.hard_static.a -// Which can be overridden +// but the ABI can be overridden // CHECK-LABEL: Target: // CHECK-NOT: warning: unknown platform -// CHECK: "-mfloat-abi" "hard" -// CHECK: libclang_rt.hard_static.a +// CHECK: "-target-feature" "+soft-float" +// CHECK: "-mfloat-abi" "soft" +// CHECK: libclang_rt.soft_static.a // ARMv7m has no float either // CHECK-LABEL: Target: |
