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

Revert "Auto merge of #106511 - MaskRay:gotpcrelx, r=nikic"

Browse Source 
This reverts commit 441086879821d554ecdfde391e767d1a954fd5e2, reversing
changes made to 249595b7523fc07a99c1adee90b1947739ca0e5b.

This causes linker failures with the binutils version used by
cross (#115239), as well as miscompilations when using the mold
linker.
This commit is contained in:
Nikita Popov 2023-08-27 11:22:20 +02:00
parent f320f42c59
commit 1b7cf24d80
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

@ -821,7 +821,7 @@ fn test_unstable_options_tracking_hash() {
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 @@ impl Default for 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 {