Skip to content

Commit 9dccb7b

Browse files
authored
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.
2 parents 0d990a3 + 2f4cbf0 commit 9dccb7b

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Diff for: compiler/rustc_target/src/spec/hermit_kernel_base.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkArgs, LinkerFlavor, LldFlavor, PanicStrategy, TargetOptions, TlsModel};
1+
use crate::spec::{LinkArgs, LinkerFlavor, LldFlavor, PanicStrategy, TargetOptions};
22

33
pub fn opts() -> TargetOptions {
44
let mut pre_link_args = LinkArgs::new();
@@ -13,12 +13,10 @@ pub fn opts() -> TargetOptions {
1313
disable_redzone: true,
1414
linker: Some("rust-lld".to_owned()),
1515
executables: true,
16-
has_elf_tls: true,
1716
pre_link_args,
1817
panic_strategy: PanicStrategy::Abort,
1918
position_independent_executables: true,
2019
static_position_independent_executables: true,
21-
tls_model: TlsModel::InitialExec,
2220
..Default::default()
2321
}
2422
}

Diff for: library/std/src/sys/hermit/net.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl TcpStream {
182182
Ok(self.clone())
183183
}
184184

185-
pub fn set_linger(&self, linger: Option<Duration>) -> io::Result<()> {
185+
pub fn set_linger(&self, _linger: Option<Duration>) -> io::Result<()> {
186186
unsupported()
187187
}
188188

0 commit comments

Comments
 (0)