diff options
| author | bors <bors@rust-lang.org> | 2024-09-15 19:35:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-15 19:35:19 +0000 |
| commit | 04a318787b39732e306faf5ef6dc584990f4f417 (patch) | |
| tree | 15224ef779fdf3231183fa1598c12b4a00e5959c /compiler/rustc_codegen_llvm/src | |
| parent | 8c2c9a9ef527edb453bcee638d34beb0e7b4616b (diff) | |
| parent | b3686b56c2b3851f6b807a6d6e8977807830a2df (diff) | |
| download | rust-04a318787b39732e306faf5ef6dc584990f4f417.tar.gz rust-04a318787b39732e306faf5ef6dc584990f4f417.zip | |
Auto merge of #130407 - matthiaskrgr:rollup-vo2gmf4, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #129897 (deprecate -Csoft-float because it is unsound (and not fixable)) - #130339 (Add `core::panic::abort_unwind`) - #130384 (compiler: Document AbiAndPrefAlign) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index a5c27d2282e..b1b692cc027 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -185,7 +185,13 @@ pub(crate) fn target_machine_factory( let reloc_model = to_llvm_relocation_model(sess.relocation_model()); let (opt_level, _) = to_llvm_opt_settings(optlvl); - let use_softfp = sess.opts.cg.soft_float; + let use_softfp = if sess.target.arch == "arm" && sess.target.abi == "eabihf" { + sess.opts.cg.soft_float + } else { + // `validate_commandline_args_with_session_available` has already warned about this being ignored. + // Let's make sure LLVM doesn't suddenly start using this flag on more targets. + false + }; let ffunction_sections = sess.opts.unstable_opts.function_sections.unwrap_or(sess.target.function_sections); |
