diff options
| author | bors <bors@rust-lang.org> | 2021-10-25 21:33:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-25 21:33:13 +0000 |
| commit | ffba4309241a7a21df4ec7b16f1357cbcd327d6e (patch) | |
| tree | 362af1c0e72c6feb18d6e700f322b25c0bb32e09 /compiler/rustc_codegen_llvm/src | |
| parent | 29b1248025b19bd132c8047fc710ea9314b9b76b (diff) | |
| parent | 26e9a719f230815b2c535777c466030c696c9d89 (diff) | |
| download | rust-ffba4309241a7a21df4ec7b16f1357cbcd327d6e.tar.gz rust-ffba4309241a7a21df4ec7b16f1357cbcd327d6e.zip | |
Auto merge of #90282 - matthiaskrgr:rollup-c6trbff, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #89581 (Add -Z no-unique-section-names to reduce ELF header bloat.) - #90196 (Fix and extent ControlFlow `traverse_inorder` example) - #90255 (:arrow_up: rust-analyzer) - #90266 (Prevent duplicate caller bounds candidates by exposing default substs in Unevaluated) Failed merges: 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 | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index 380dfd38723..82c3c2006eb 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -161,6 +161,7 @@ pub fn target_machine_factory( let ffunction_sections = sess.opts.debugging_opts.function_sections.unwrap_or(sess.target.function_sections); let fdata_sections = ffunction_sections; + let funique_section_names = !sess.opts.debugging_opts.no_unique_section_names; let code_model = to_llvm_code_model(sess.code_model()); @@ -205,6 +206,7 @@ pub fn target_machine_factory( use_softfp, ffunction_sections, fdata_sections, + funique_section_names, trap_unreachable, singlethread, asm_comments, diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index 45fb638e3b4..d57573558da 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -2187,6 +2187,7 @@ extern "C" { UseSoftFP: bool, FunctionSections: bool, DataSections: bool, + UniqueSectionNames: bool, TrapUnreachable: bool, Singlethread: bool, AsmComments: bool, |
