bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #89941 - hermitcore:kernel, r=joshtriplett

Browse source 
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.
This commit is contained in:
Matthias Krüger 2021-10-19 05:40:52 +02:00 • committed by GitHub
commit 9dccb7bd89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_target/src/spec/hermit_kernel_base.rs
View file

@ -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 { pub fn opts() -> TargetOptions {
let mut pre_link_args = LinkArgs::new(); let mut pre_link_args = LinkArgs::new();
@ -13,12 +13,10 @@ pub fn opts() -> TargetOptions {
disable_redzone: true, disable_redzone: true,
linker: Some("rust-lld".to_owned()), linker: Some("rust-lld".to_owned()),
executables: true, executables: true,
has_elf_tls: true,
pre_link_args, pre_link_args,
panic_strategy: PanicStrategy::Abort, panic_strategy: PanicStrategy::Abort,
position_independent_executables: true, position_independent_executables: true,
static_position_independent_executables: true, static_position_independent_executables: true,
tls_model: TlsModel::InitialExec,
..Default::default() ..Default::default()
} }
} }

2
library/std/src/sys/hermit/net.rs
View file

@ -182,7 +182,7 @@ impl TcpStream {
Ok(self.clone()) Ok(self.clone())
} }
pub fn set_linger(&self, linger: Option<Duration>) -> io::Result<()> { pub fn set_linger(&self, _linger: Option<Duration>) -> io::Result<()> {
unsupported() unsupported()
} }