diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-10-19 05:40:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 05:40:52 +0200 |
| commit | 9dccb7bd890e456fe4a1344edd0a8b67c88a901a (patch) | |
| tree | 914836a44927e84201c33428b55241cd9758042a | |
| parent | 0d990a3dbd7733a05c5ccdb99c123fac8938dcc6 (diff) | |
| parent | 2f4cbf003fdfcd9763c24f09bbe8aae829fbd060 (diff) | |
| download | rust-9dccb7bd890e456fe4a1344edd0a8b67c88a901a.tar.gz rust-9dccb7bd890e456fe4a1344edd0a8b67c88a901a.zip | |
Rollup merge of #89941 - hermitcore:kernel, r=joshtriplett
removing TLS support in x86_64-unknown-none-hermitkernel HermitCore's kernel itself doesn't support TLS. Consequently, the entries in x86_64-unknown-none-hermitkernel should be removed. This commit should help to finalize #89062.
| -rw-r--r-- | compiler/rustc_target/src/spec/hermit_kernel_base.rs | 4 | ||||
| -rw-r--r-- | library/std/src/sys/hermit/net.rs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_target/src/spec/hermit_kernel_base.rs b/compiler/rustc_target/src/spec/hermit_kernel_base.rs index c55a46e69a8..414b0f7ff23 100644 --- a/compiler/rustc_target/src/spec/hermit_kernel_base.rs +++ b/compiler/rustc_target/src/spec/hermit_kernel_base.rs @@ -1,4 +1,4 @@ -use crate::spec::{LinkArgs, LinkerFlavor, LldFlavor, PanicStrategy, TargetOptions, TlsModel}; +use crate::spec::{LinkArgs, LinkerFlavor, LldFlavor, PanicStrategy, TargetOptions}; pub fn opts() -> TargetOptions { let mut pre_link_args = LinkArgs::new(); @@ -13,12 +13,10 @@ pub fn opts() -> TargetOptions { disable_redzone: true, linker: Some("rust-lld".to_owned()), executables: true, - has_elf_tls: true, pre_link_args, panic_strategy: PanicStrategy::Abort, position_independent_executables: true, static_position_independent_executables: true, - tls_model: TlsModel::InitialExec, ..Default::default() } } diff --git a/library/std/src/sys/hermit/net.rs b/library/std/src/sys/hermit/net.rs index 880ef678a4f..1a6b3bc63e6 100644 --- a/library/std/src/sys/hermit/net.rs +++ b/library/std/src/sys/hermit/net.rs @@ -182,7 +182,7 @@ impl TcpStream { Ok(self.clone()) } - pub fn set_linger(&self, linger: Option<Duration>) -> io::Result<()> { + pub fn set_linger(&self, _linger: Option<Duration>) -> io::Result<()> { unsupported() } |
