Skip to content

Commit

Permalink
Rollup merge of #89941 - hermitcore:kernel, r=joshtriplett
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
matthiaskrgr committed Oct 19, 2021
2 parents 0d990a3 + 2f4cbf0 commit 9dccb7b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions compiler/rustc_target/src/spec/hermit_kernel_base.rs
Original file line number Diff line number Diff line change
@@ -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();
Expand All @@ -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()
}
}
2 changes: 1 addition & 1 deletion library/std/src/sys/hermit/net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down

0 comments on commit 9dccb7b

Please sign in to comment.