diff options
| author | bors <bors@rust-lang.org> | 2023-12-09 05:32:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-09 05:32:35 +0000 |
| commit | 608f32435afd5b61f61c593e70df1a2b8ada6a79 (patch) | |
| tree | 672f56a68deda4892e4be82161d2be6048f9cb14 /library/std/src/sys/unix | |
| parent | 1a3aa4ad149438a9b11f758c16df9e222de51f91 (diff) | |
| parent | e5b76892cc5e6fbfb495bf6a7339962a287849a7 (diff) | |
| download | rust-608f32435afd5b61f61c593e70df1a2b8ada6a79.tar.gz rust-608f32435afd5b61f61c593e70df1a2b8ada6a79.zip | |
Auto merge of #117873 - quininer:android-emutls, r=Amanieu
Add emulated TLS support This is a reopen of https://github.com/rust-lang/rust/pull/96317 . many android devices still only use 128 pthread keys, so using emutls can be helpful. Currently LLVM uses emutls by default for some targets (such as android, openbsd), but rust does not use it, because `has_thread_local` is false. This commit has some changes to allow users to enable emutls: 1. add `-Zhas-thread-local` flag to specify that std uses `#[thread_local]` instead of pthread key. 2. when using emutls, decorate symbol names to find thread local symbol correctly. 3. change `-Zforce-emulated-tls` to `-Ztls-model=emulated` to explicitly specify whether to generate emutls. r? `@Amanieu`
Diffstat (limited to 'library/std/src/sys/unix')
| -rw-r--r-- | library/std/src/sys/unix/thread_local_dtor.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/library/std/src/sys/unix/thread_local_dtor.rs b/library/std/src/sys/unix/thread_local_dtor.rs index 667fd516962..ac85531c372 100644 --- a/library/std/src/sys/unix/thread_local_dtor.rs +++ b/library/std/src/sys/unix/thread_local_dtor.rs @@ -12,7 +12,13 @@ // compiling from a newer linux to an older linux, so we also have a // fallback implementation to use as well. #[allow(unexpected_cfgs)] -#[cfg(any(target_os = "linux", target_os = "fuchsia", target_os = "redox", target_os = "hurd"))] +#[cfg(any( + target_os = "linux", + target_os = "android", + target_os = "fuchsia", + target_os = "redox", + target_os = "hurd" +))] // FIXME: The Rust compiler currently omits weakly function definitions (i.e., // __cxa_thread_atexit_impl) and its metadata from LLVM IR. #[no_sanitize(cfi, kcfi)] |