diff options
| author | bors <bors@rust-lang.org> | 2023-08-28 03:30:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-28 03:30:37 +0000 |
| commit | f7dd70c3c9edeecdbedf4d80c83317c50a817756 (patch) | |
| tree | 5e213bab451d00eb3ab4adf4a56ad248496b74da /compiler/rustc_interface/src | |
| parent | 3f8c8f51f777f4fab14074cde975bc4bbce3ca5a (diff) | |
| parent | 1b7cf24d807c3b4aa12ede3718c00c9e52e9aa9f (diff) | |
| download | rust-f7dd70c3c9edeecdbedf4d80c83317c50a817756.tar.gz rust-f7dd70c3c9edeecdbedf4d80c83317c50a817756.zip | |
Auto merge of #115267 - nikic:revert-elf-relaxation, r=compiler-errors
Revert relax_elf_relocations default change This reverts commit 441086879821d554ecdfde391e767d1a954fd5e2 (#106511). The change caused linker failures with the binutils version used by cross (#115239), as well as miscompilations when using the mold linker (https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/SIGILL.20in.20build-script-build.20with.20nightly-2023-08-25/near/387506479).
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs index 448d3503d23..b53ba251bcd 100644 --- a/compiler/rustc_interface/src/tests.rs +++ b/compiler/rustc_interface/src/tests.rs @@ -822,7 +822,7 @@ fn test_unstable_options_tracking_hash() { tracked!(profile_emit, Some(PathBuf::from("abc"))); tracked!(profile_sample_use, Some(PathBuf::from("abc"))); tracked!(profiler_runtime, "abc".to_string()); - tracked!(relax_elf_relocations, Some(false)); + tracked!(relax_elf_relocations, Some(true)); tracked!(relro_level, Some(RelroLevel::Full)); tracked!(remap_cwd_prefix, Some(PathBuf::from("abc"))); tracked!(report_delayed_bugs, true); |