WIP: Use the in-tree compiler-builtins for the sysroot

Author: tgross35

library/Cargo.lock

@@ -8,7 +8,7 @@ version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "gimli",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
@@ -20,15 +20,15 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-core",
 ]
 
 [[package]]
 name = "alloc"
 version = "0.0.0"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.159",
  "core",
 ]
 
@@ -55,7 +55,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "compiler_builtins"
+version = "0.1.159"
+dependencies = [
+ "cc",
+ "panic-handler",
  "rustc-std-workspace-core",
 ]
 
@@ -65,7 +74,6 @@ version = "0.1.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6376049cfa92c0aa8b9ac95fae22184b981c658208d4ed8a1dc553cd83612895"
 dependencies = [
- "cc",
  "rustc-std-workspace-core",
 ]
 
@@ -88,7 +96,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cff88b751e7a276c4ab0e222c3f355190adc6dde9ce39c851db39da34990df7"
 dependencies = [
  "cfg-if",
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "libc",
  "rustc-std-workspace-core",
  "windows-sys",
@@ -100,7 +108,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57cafc2274c10fab234f176b25903ce17e690fca7597090d50880e047a0389c5"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-core",
 ]
 
@@ -121,7 +129,7 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
@@ -132,7 +140,7 @@ version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
@@ -143,7 +151,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
@@ -163,7 +171,7 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-core",
 ]
 
@@ -174,7 +182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
@@ -185,18 +193,22 @@ version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "memchr",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
 
+[[package]]
+name = "panic-handler"
+version = "0.1.0"
+
 [[package]]
 name = "panic_abort"
 version = "0.0.0"
 dependencies = [
  "alloc",
- "compiler_builtins",
+ "compiler_builtins 0.1.159",
  "core",
  "libc",
 ]
@@ -207,7 +219,7 @@ version = "0.0.0"
 dependencies = [
  "alloc",
  "cfg-if",
- "compiler_builtins",
+ "compiler_builtins 0.1.159",
  "core",
  "libc",
  "unwind",
@@ -235,7 +247,7 @@ version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-core",
 ]
 
@@ -245,7 +257,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43c53ff1a01d423d1cb762fd991de07d32965ff0ca2e4f80444ac7804198203"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "r-efi",
  "rustc-std-workspace-core",
 ]
@@ -280,7 +292,7 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-core",
 ]
 
@@ -327,7 +339,7 @@ dependencies = [
  "addr2line",
  "alloc",
  "cfg-if",
- "compiler_builtins",
+ "compiler_builtins 0.1.159",
  "core",
  "dlmalloc",
  "fortanix-sgx-abi",
@@ -354,7 +366,7 @@ name = "std_detect"
 version = "0.1.5"
 dependencies = [
  "cfg-if",
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "libc",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
@@ -386,7 +398,7 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-core",
  "rustc-std-workspace-std",
 ]
@@ -396,7 +408,7 @@ name = "unwind"
 version = "0.0.0"
 dependencies = [
  "cfg-if",
- "compiler_builtins",
+ "compiler_builtins 0.1.159",
  "core",
  "libc",
  "unwinding",
@@ -408,7 +420,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8393f2782b6060a807337ff353780c1ca15206f9ba2424df18cb6e733bd7b345"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "gimli",
  "rustc-std-workspace-core",
 ]
@@ -419,7 +431,7 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 dependencies = [
- "compiler_builtins",
+ "compiler_builtins 0.1.160",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]

library/alloc/Cargo.toml

@@ -16,7 +16,7 @@ bench = false
 
 [dependencies]
 core = { path = "../core", public = true }
-compiler_builtins = { version = "=0.1.160", features = ['rustc-dep-of-std'] }
+compiler_builtins = { path = "../compiler-builtins/compiler-builtins", features = ['rustc-dep-of-std'] }
 
 [features]
 compiler-builtins-mem = ['compiler_builtins/mem']

library/compiler-builtins/compiler-builtins/Cargo.toml

@@ -9,7 +9,7 @@ homepage = "https://github.com/rust-lang/compiler-builtins"
 documentation = "https://docs.rs/compiler_builtins"
 edition = "2021"
 description = "Compiler intrinsics used by the Rust compiler."
-links = "compiler-rt"
+# links = "compiler-rt"
 
 [lib]
 bench = false

library/panic_abort/Cargo.toml

@@ -13,7 +13,7 @@ doc = false
 
 [dependencies]
 core = { path = "../core" }
-compiler_builtins = "0.1.0"
+compiler_builtins = { path = "../compiler-builtins/compiler-builtins" }
 
 [target.'cfg(target_os = "android")'.dependencies]
 libc = { version = "0.2", default-features = false }

library/panic_unwind/Cargo.toml

@@ -15,7 +15,7 @@ doc = false
 alloc = { path = "../alloc" }
 core = { path = "../core" }
 unwind = { path = "../unwind" }
-compiler_builtins = "0.1.0"
+compiler_builtins = { path = "../compiler-builtins/compiler-builtins" }
 cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
 
 [target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]

library/std/Cargo.toml

@@ -18,7 +18,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
 panic_unwind = { path = "../panic_unwind", optional = true }
 panic_abort = { path = "../panic_abort" }
 core = { path = "../core", public = true }
-compiler_builtins = { version = "=0.1.160" }
+compiler_builtins = { path = "../compiler-builtins/compiler-builtins" }
 unwind = { path = "../unwind" }
 hashbrown = { version = "0.15", default-features = false, features = [
     'rustc-dep-of-std',

library/unwind/Cargo.toml

@@ -15,7 +15,7 @@ doc = false
 
 [dependencies]
 core = { path = "../core" }
-compiler_builtins = "0.1.0"
+compiler_builtins = { path = "../compiler-builtins/compiler-builtins" }
 cfg-if = "1.0"
 
 [target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]