This is an archive of the discontinued LLVM Phabricator instance.

Differential D58477

[Driver] Fix float ABI default for Android ARMv8.
ClosedPublic

Authored by danalbert on Feb 20 2019, 2:13 PM.

Details

Reviewers
srhines
pirama
Commits
rG475042d5b1be: [Driver] Fix float ABI default for Android ARMv8.
rC354622: [Driver] Fix float ABI default for Android ARMv8.
rL354622: [Driver] Fix float ABI default for Android ARMv8.
Summary

Android doesn't regress back to soft float after ARMv7 :)

Diff Detail

Event Timeline

danalbert created this revision.Feb 20 2019, 2:13 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 20 2019, 2:13 PM
Herald added subscribers: kristof.beyls, javed.absar. · View Herald Transcript
Harbormaster completed remote builds in B28348: Diff 187673.Feb 20 2019, 2:14 PM
pirama accepted this revision.Feb 20 2019, 4:13 PM
This revision is now accepted and ready to land.Feb 20 2019, 4:13 PM
srhines accepted this revision.Feb 20 2019, 6:03 PM

Dan, this seems pretty important for the NDK. If you submit this, would you want it cherry-picked ASAP?

Closed by commit rL354622: [Driver] Fix float ABI default for Android ARMv8. (authored by danalbert). · Explain WhyFeb 21 2019, 1:13 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 21 2019, 1:13 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
Arch/
2 lines
test/
Driver/
10 lines

Diff 187673

clang/lib/Driver/ToolChains/Arch/ARM.cpp

Show First 20 Lines • Show All 242 Lines • ▼ Show 20 Lines default:
break; break;
case llvm::Triple::GNUEABI: case llvm::Triple::GNUEABI:
case llvm::Triple::MuslEABI: case llvm::Triple::MuslEABI:
case llvm::Triple::EABI: case llvm::Triple::EABI:
// EABI is always AAPCS, and if it was not marked 'hard', it's softfp // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
ABI = FloatABI::SoftFP; ABI = FloatABI::SoftFP;
break; break;
case llvm::Triple::Android: case llvm::Triple::Android:
ABI = (SubArch == 7) ? FloatABI::SoftFP : FloatABI::Soft; ABI = (SubArch >= 7) ? FloatABI::SoftFP : FloatABI::Soft;
break; break;
default: default:
// Assume "soft", but warn the user we are guessing. // Assume "soft", but warn the user we are guessing.
if (Triple.isOSBinFormatMachO() && if (Triple.isOSBinFormatMachO() &&
Triple.getSubArch() == llvm::Triple::ARMSubArch_v7em) Triple.getSubArch() == llvm::Triple::ARMSubArch_v7em)
ABI = FloatABI::Hard; ABI = FloatABI::Hard;
else else
ABI = FloatABI::Soft; ABI = FloatABI::Soft;
▲ Show 20 Lines • Show All 393 Lines • Show Last 20 Lines

clang/test/Driver/arm-float-abi.c

// RUN: not %clang %s -target armv7-apple-ios -mfloat-abi=hard 2>&1 | FileCheck -check-prefix=ARMV7-ERROR %s // RUN: not %clang %s -target armv7-apple-ios -mfloat-abi=hard 2>&1 | FileCheck -check-prefix=ARMV7-ERROR %s
// RUN: %clang %s -target armv7-apple-ios -mfloat-abi=softfp -### 2>&1 | FileCheck -check-prefix=NOERROR %s // RUN: %clang %s -target armv7-apple-ios -mfloat-abi=softfp -### 2>&1 | FileCheck -check-prefix=NOERROR %s
// RUN: %clang %s -arch armv7 -target thumbv7-apple-darwin-eabi -mfloat-abi=hard -### 2>&1 | FileCheck -check-prefix=NOERROR %s // RUN: %clang %s -arch armv7 -target thumbv7-apple-darwin-eabi -mfloat-abi=hard -### 2>&1 | FileCheck -check-prefix=NOERROR %s
// ARMV7-ERROR: unsupported option '-mfloat-abi=hard' for target 'thumbv7' // ARMV7-ERROR: unsupported option '-mfloat-abi=hard' for target 'thumbv7'
// NOERROR-NOT: unsupported option // NOERROR-NOT: unsupported option
// RUN: %clang -target armv7-linux-androideabi21 %s -### -c 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-ARM7-ANDROID %s
// CHECK-ARM7-ANDROID-NOT: "-target-feature" "+soft-float"
// CHECK-ARM7-ANDROID: "-target-feature" "+soft-float-abi"
// RUN: %clang -target armv8-linux-androideabi21 %s -### -c 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-ARM8-ANDROID %s
// CHECK-ARM8-ANDROID-NOT: "-target-feature" "+soft-float"
// CHECK-ARM8-ANDROID: "-target-feature" "+soft-float-abi"