mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #115267 - nikic:revert-elf-relaxation, r=compiler-errors

Browse Source 
Revert relax_elf_relocations default change

This reverts commit 4410868798 (#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).
This commit is contained in:
bors 2023-08-28 03:30:37 +00:00
commit f7dd70c3c9
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_interface/src/tests.rs
View File

@ -822,7 +822,7 @@ macro_rules! tracked {
tracked!(profile_emit, Some(PathBuf::from("abc"))); tracked!(profile_emit, Some(PathBuf::from("abc")));
tracked!(profile_sample_use, Some(PathBuf::from("abc"))); tracked!(profile_sample_use, Some(PathBuf::from("abc")));
tracked!(profiler_runtime, "abc".to_string()); 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!(relro_level, Some(RelroLevel::Full));
tracked!(remap_cwd_prefix, Some(PathBuf::from("abc"))); tracked!(remap_cwd_prefix, Some(PathBuf::from("abc")));
tracked!(report_delayed_bugs, true); tracked!(report_delayed_bugs, true);

2
compiler/rustc_target/src/spec/mod.rs
View File

@ -2216,7 +2216,7 @@ fn default() -> TargetOptions {
mcount: "mcount".into(), mcount: "mcount".into(),
llvm_mcount_intrinsic: None, llvm_mcount_intrinsic: None,
llvm_abiname: "".into(), llvm_abiname: "".into(),
relax_elf_relocations: true, relax_elf_relocations: false,
llvm_args: cvs![], llvm_args: cvs![],
use_ctors_section: false, use_ctors_section: false,
eh_frame_header: true, eh_frame_header: true,

1
compiler/rustc_target/src/spec/x86_64_fortanix_unknown_sgx.rs
View File

@ -69,6 +69,7 @@ pub fn target() -> Target {
position_independent_executables: true, position_independent_executables: true,
pre_link_args, pre_link_args,
override_export_symbols: Some(EXPORT_SYMBOLS.iter().cloned().map(Cow::from).collect()), override_export_symbols: Some(EXPORT_SYMBOLS.iter().cloned().map(Cow::from).collect()),
relax_elf_relocations: true,
..Default::default() ..Default::default()
}; };
Target { Target {