| 1 | diff -u -r ../llvm-3.8.0.src/tools/clang/lib/Driver/Tools.cpp ./tools/clang/lib/Driver/Tools.cpp |
| 2 | --- ../llvm-3.8.0.src/tools/clang/lib/Driver/Tools.cpp 2016-02-12 17:51:41.000000000 -0500 |
| 3 | +++ ./tools/clang/lib/Driver/Tools.cpp 2016-05-01 23:01:30.148998957 -0400 |
| 4 | @@ -733,11 +733,11 @@ |
| 5 | ABI = FloatABI::SoftFP; |
| 6 | break; |
| 7 | case llvm::Triple::Android: |
| 8 | - ABI = (SubArch == 7) ? FloatABI::SoftFP : FloatABI::Soft; |
| 9 | + ABI = FloatABI::SoftFP; |
| 10 | break; |
| 11 | default: |
| 12 | // Assume "soft", but warn the user we are guessing. |
| 13 | - ABI = FloatABI::Soft; |
| 14 | + ABI = FloatABI::SoftFP; |
| 15 | if (Triple.getOS() != llvm::Triple::UnknownOS || |
| 16 | !Triple.isOSBinFormatMachO()) |
| 17 | D.Diag(diag::warn_drv_assuming_mfloat_abi_is) << "soft"; |