Make it bootstrap! 🎉

Author: bjorn3

Cargo.lock

@@ -677,52 +677,47 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
- "gimli 0.20.0",
+ "gimli",
  "log",
+ "regalloc",
  "smallvec 1.4.0",
  "target-lexicon",
  "thiserror",
 ]
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -732,8 +727,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-module"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -744,8 +738,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 dependencies = [
  "cranelift-codegen",
  "raw-cpuid",
@@ -754,19 +747,18 @@ dependencies = [
 
 [[package]]
 name = "cranelift-object"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 dependencies = [
+ "anyhow",
  "cranelift-codegen",
  "cranelift-module",
- "object 0.18.0",
+ "object",
  "target-lexicon",
 ]
 
 [[package]]
 name = "cranelift-simplejit"
-version = "0.62.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/#9ca3bf532e2ee225b82ad81067e1cf80a8f212de"
+version = "0.65.0"
 dependencies = [
  "cranelift-codegen",
  "cranelift-module",
@@ -1291,16 +1283,6 @@ dependencies = [
  "wasi",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dd6190aad0f05ddbbf3245c54ed14ca4aa6dd32f22312b70d8f168c3e3e633"
-dependencies = [
- "byteorder",
- "indexmap",
-]
-
 [[package]]
 name = "gimli"
 version = "0.21.0"
@@ -2127,17 +2109,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "object"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5666bbb90bc4d1e5bdcb26c0afda1822d25928341e9384ab187a9b37ab69e36"
-dependencies = [
- "crc32fast",
- "indexmap",
- "target-lexicon",
-]
-
 [[package]]
 name = "object"
 version = "0.19.0"
@@ -2836,6 +2807,17 @@ dependencies = [
  "redox_syscall",
 ]
 
+[[package]]
+name = "regalloc"
+version = "0.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c03092d79e0fd610932d89ed53895a38c0dd3bcd317a0046e69940de32f1d95"
+dependencies = [
+ "log",
+ "rustc-hash",
+ "smallvec 1.4.0",
+]
+
 [[package]]
 name = "regex"
 version = "1.3.7"
@@ -3506,10 +3488,10 @@ dependencies = [
  "cranelift-module",
  "cranelift-object",
  "cranelift-simplejit",
- "gimli 0.21.0",
+ "gimli",
  "indexmap",
  "libloading",
- "object 0.19.0",
+ "object",
  "target-lexicon",
 ]
 

Cargo.toml

@@ -82,3 +82,11 @@ rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' }
 
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
+
+[patch."https://github.com/bytecodealliance/wasmtime/"]
+cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
+cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
+cranelift-module = { path = "../wasmtime/cranelift/module" }
+cranelift-simplejit = { path = "../wasmtime/cranelift/simplejit" }
+cranelift-object = { path = "../wasmtime/cranelift/object" }
+

src/libstd/sys/unix/fast_thread_local.rs

@@ -15,28 +15,8 @@
     target_os = "emscripten"
 ))]
 pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
-    use crate::mem;
     use crate::sys_common::thread_local::register_dtor_fallback;
 
-    extern "C" {
-        #[linkage = "extern_weak"]
-        static __dso_handle: *mut u8;
-        #[linkage = "extern_weak"]
-        static __cxa_thread_atexit_impl: *const libc::c_void;
-    }
-    if !__cxa_thread_atexit_impl.is_null() {
-        type F = unsafe extern "C" fn(
-            dtor: unsafe extern "C" fn(*mut u8),
-            arg: *mut u8,
-            dso_handle: *mut u8,
-        ) -> libc::c_int;
-        mem::transmute::<*const libc::c_void, F>(__cxa_thread_atexit_impl)(
-            dtor,
-            t,
-            &__dso_handle as *const _ as *mut _,
-        );
-        return;
-    }
     register_dtor_fallback(t, dtor);
 }
 

src/rustc/rustc.rs

@@ -1,9 +1,5 @@
 extern crate libc;
 
-#[no_mangle]
-#[used]
-pub static mut __cg_clif_global_atomic_mutex: libc::pthread_mutex_t = libc::PTHREAD_MUTEX_INITIALIZER;
-
 fn main() {
     // Pull in jemalloc when enabled.
     //
@@ -32,8 +28,6 @@ fn main() {
         static _F6: unsafe extern "C" fn(*mut c_void) = jemalloc_sys::free;
     }
 
-    unsafe { libc::pthread_mutex_init(&mut __cg_clif_global_atomic_mutex, 0 as *const _); }
-
     rustc_driver::set_sigpipe_handler();
     rustc_driver::main()
 }