[WIP] Tls support

Author: bjorn3

Cargo.lock

@@ -40,15 +40,16 @@ default-features = false
 features = ["compression", "read", "std"] # We don't need WASM support
 
 # Uncomment to use local checkout of cranelift
-#[patch."https://github.com/bytecodealliance/cranelift/"]
-#cranelift = { path = "../cranelift/cranelift-umbrella", default-features = false, features = ["std"] }
-#cranelift-module = { path = "../cranelift/cranelift-module" }
-#cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
-#cranelift-faerie = { path = "../cranelift/cranelift-faerie" }
-#cranelift-object = { path = "../cranelift/cranelift-object" }
-
-#[patch.crates-io]
+[patch."https://github.com/bytecodealliance/cranelift/"]
+cranelift = { path = "../cranelift/cranelift-umbrella", default-features = false, features = ["std"] }
+cranelift-module = { path = "../cranelift/cranelift-module" }
+cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
+cranelift-faerie = { path = "../cranelift/cranelift-faerie" }
+cranelift-object = { path = "../cranelift/cranelift-object" }
+
+[patch.crates-io]
 #gimli = { path = "../" }
+object = { path = "./object" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cranelift-simplejit = { git = "https://github.com/bytecodealliance/cranelift/" }

Cargo.toml

@@ -1,6 +1,6 @@
 #![feature(
     no_core, lang_items, intrinsics, unboxed_closures, type_ascription, extern_types,
-    untagged_unions, decl_macro, rustc_attrs, transparent_unions
+    untagged_unions, decl_macro, rustc_attrs, transparent_unions, thread_local,
 )]
 #![no_core]
 #![allow(dead_code)]
@@ -538,3 +538,11 @@ pub macro line() { /* compiler built-in */ }
 pub macro cfg() { /* compiler built-in */ }
 
 pub static A_STATIC: u8 = 42;
+
+#[no_mangle]
+pub fn get_tls() -> u8 {
+    #[thread_local]
+    static A: u8 = 42;
+
+    A
+}

crate_patches/regex.patch

@@ -12,6 +12,10 @@ fn main() {
     let stderr = ::std::io::stderr();
     let mut stderr = stderr.lock();
 
+    std::thread::spawn(move || {
+        println!("Hello from another thread!");
+    });
+
     writeln!(stderr, "some {} text", "<unknown>").unwrap();
 
     let _ = std::process::Command::new("true").env("c", "d").spawn();

example/mini_core.rs

@@ -44,53 +44,16 @@ index f6dee7c..0c6a8c0 100644
  #[unstable(feature = "coerce_unsized", issue = "27732")]
  impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Box<U>> for Box<T> {}
 
-diff --git a/src/libstd/sys_common/at_exit_imp.rs b/src/libstd/sys_common/at_exit_imp.rs
-index 1181b86..20f9251 100644
---- a/src/libstd/sys_common/at_exit_imp.rs
-+++ b/src/libstd/sys_common/at_exit_imp.rs
-@@ -38,6 +38,7 @@ unsafe fn init() -> bool {
-     true
- }
- 
-+/*
- pub fn cleanup() {
-     for i in 1..=ITERS {
-         unsafe {
-@@ -60,6 +61,7 @@ pub fn cleanup() {
-         }
-     }
- }
-+*/
- 
- pub fn push(f: Box<dyn FnOnce()>) -> bool {
-     unsafe {
-diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs
-index 6260c3b..611ed7e 100644
---- a/src/libstd/sys_common/mod.rs
-+++ b/src/libstd/sys_common/mod.rs
-@@ -127,7 +127,6 @@ pub fn cleanup() {
-     CLEANUP.call_once(|| unsafe {
-         sys::args::cleanup();
-         sys::stack_overflow::cleanup();
--        at_exit_imp::cleanup();
-     });
- }
- 
 diff --git a/src/libstd/sys_common/thread.rs b/src/libstd/sys_common/thread.rs
 index b2142e7..718bb1c 100644
 --- a/src/libstd/sys_common/thread.rs
 +++ b/src/libstd/sys_common/thread.rs
-@@ -6,12 +6,7 @@ use crate::sys::thread as imp;
+@@ -6,7 +6,7 @@ pub unsafe fn start_thread(main: *mut u8) {
+     let _handler = stack_overflow::Handler::new();
 
- #[allow(dead_code)]
- pub unsafe fn start_thread(main: *mut u8) {
--    // Next, set up our stack overflow handler which may get triggered if we run
--    // out of stack.
--    let _handler = stack_overflow::Handler::new();
--
--    // Finally, let's run some code.
+     // Finally, let's run some code.
 -    Box::from_raw(main as *mut Box<dyn FnOnce()>)()
-+    panic!("Threads are not yet supported, because cranelift doesn't support atomics.");
++    Box::from_raw(main as *mut Box<dyn FnBox()>)()
  }
 
  pub fn min_stack() -> usize {
@@ -102,7 +65,7 @@ index f4a1783..362b537 100644
      // unsafe: see thread::Builder::spawn_unchecked for safety requirements
      pub unsafe fn new(stack: usize, p: Box<dyn FnOnce()>)
                            -> io::Result<Thread> {
-+        panic!("Threads are not yet supported, because cranelift doesn't support atomics.");
++        panic!("Warning: Threads are not yet fully supported, because cranelift doesn't support atomics.");
 +
          let p = box p;
          let mut native: libc::pthread_t = mem::zeroed();