diff options
| author | bors <bors@rust-lang.org> | 2020-08-26 03:47:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-26 03:47:07 +0000 |
| commit | 2fe9a33659641d062c1fe3577327147b4d9943a2 (patch) | |
| tree | d0aca13da4395d3e24b36ca55b24c8f0d59df99f | |
| parent | 3e98860425447e30e967e83a738f7c54b7fe8273 (diff) | |
| parent | 3bad65d6c04c9bfe9ed1f0d889f81560ee418f1c (diff) | |
| download | rust-2fe9a33659641d062c1fe3577327147b4d9943a2.tar.gz rust-2fe9a33659641d062c1fe3577327147b4d9943a2.zip | |
Auto merge of #75843 - hermitcore:devel, r=nagisa
HermitCore switchs to relocatable binaries - switch to relocatbale binaries to realize ASLR - remove all dependencies to gcc
| -rw-r--r-- | src/librustc_target/spec/aarch64_unknown_hermit.rs | 6 | ||||
| -rw-r--r-- | src/librustc_target/spec/hermit_base.rs | 3 | ||||
| -rw-r--r-- | src/librustc_target/spec/hermit_kernel_base.rs | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/librustc_target/spec/aarch64_unknown_hermit.rs b/src/librustc_target/spec/aarch64_unknown_hermit.rs index 5f978c03248..e07b8f7a756 100644 --- a/src/librustc_target/spec/aarch64_unknown_hermit.rs +++ b/src/librustc_target/spec/aarch64_unknown_hermit.rs @@ -1,10 +1,8 @@ -use crate::spec::{LinkerFlavor, Target, TargetResult}; +use crate::spec::{LinkerFlavor, LldFlavor, Target, TargetResult}; pub fn target() -> TargetResult { let mut base = super::hermit_base::opts(); base.max_atomic_width = Some(128); - base.unsupported_abis = super::arm_base::unsupported_abis(); - base.linker = Some("aarch64-hermit-gcc".to_string()); Ok(Target { llvm_target: "aarch64-unknown-hermit".to_string(), @@ -16,7 +14,7 @@ pub fn target() -> TargetResult { target_os: "hermit".to_string(), target_env: String::new(), target_vendor: "unknown".to_string(), - linker_flavor: LinkerFlavor::Gcc, + linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld), options: base, }) } diff --git a/src/librustc_target/spec/hermit_base.rs b/src/librustc_target/spec/hermit_base.rs index 18fb2aa3d56..e063c94cf2c 100644 --- a/src/librustc_target/spec/hermit_base.rs +++ b/src/librustc_target/spec/hermit_base.rs @@ -16,7 +16,8 @@ pub fn opts() -> TargetOptions { pre_link_args, panic_strategy: PanicStrategy::Abort, position_independent_executables: true, - relocation_model: RelocModel::Static, + static_position_independent_executables: true, + relocation_model: RelocModel::Pic, target_family: None, tls_model: TlsModel::InitialExec, ..Default::default() diff --git a/src/librustc_target/spec/hermit_kernel_base.rs b/src/librustc_target/spec/hermit_kernel_base.rs index 7f2dada714d..01b9f75637f 100644 --- a/src/librustc_target/spec/hermit_kernel_base.rs +++ b/src/librustc_target/spec/hermit_kernel_base.rs @@ -17,7 +17,8 @@ pub fn opts() -> TargetOptions { pre_link_args, panic_strategy: PanicStrategy::Abort, position_independent_executables: true, - relocation_model: RelocModel::Static, + static_position_independent_executables: true, + relocation_model: RelocModel::Pic, target_family: None, tls_model: TlsModel::InitialExec, ..Default::default() |