Bump to a custom compiler builtins version

tgross35 · Jul 18, 2024 · cc93eac · cc93eac
1 parent 7947992
commit cc93eac
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -794,9 +794,8 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.112"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15acab2bb4fe4dad1f1e31f3d9e714f50ef561a0f87dd8a9da004f14d455e1a"
+version = "0.1.113"
+source = "git+https://github.com/tgross35/compiler-builtins.git?branch=android-testing#42538d8077cb3e2e86ccd4b73266b8f352af3f77"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",

diff --git a/Cargo.toml b/Cargo.toml
@@ -115,3 +115,4 @@ strip = true
 rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}
diff --git a/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml b/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml
@@ -22,3 +22,7 @@ rustc-std-workspace-std = { path = "./sysroot_src/library/rustc-std-workspace-st
 [profile.release]
 debug = "limited"
 #lto = "fat" # TODO(antoyo): re-enable when the failing LTO tests regarding proc-macros are fixed.
+
+
+[patch.crates-io]
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing" }
diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
@@ -56,3 +56,6 @@ check-cfg = [
     'cfg(no_rc)',
     'cfg(no_sync)',
 ]
+
+[patch.crates-io]
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}
diff --git a/library/panic_abort/Cargo.toml b/library/panic_abort/Cargo.toml
@@ -19,3 +19,6 @@ compiler_builtins = "0.1.0"
 
 [target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
 libc = { version = "0.2", default-features = false }
+
+[patch.crates-io]
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}
diff --git a/library/panic_unwind/Cargo.toml b/library/panic_unwind/Cargo.toml
@@ -20,3 +20,6 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
 
 [target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
 libc = { version = "0.2", default-features = false }
+
+[patch.crates-io]
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}
diff --git a/library/portable-simd/Cargo.toml b/library/portable-simd/Cargo.toml
@@ -5,3 +5,6 @@ members = [
     "crates/std_float",
     "crates/test_helpers",
 ]
+
+[patch.crates-io]
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}
diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml
@@ -14,3 +14,6 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] }
 
 [build-dependencies]
 cc = "1.0.97"
+
+[patch.crates-io]
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
@@ -112,3 +112,6 @@ check-cfg = [
     # of declared features, we therefor expect any feature cfg
     'cfg(feature, values(any()))',
 ]
+
+[patch.crates-io]
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}
diff --git a/library/unwind/Cargo.toml b/library/unwind/Cargo.toml
@@ -34,3 +34,6 @@ llvm-libunwind = []
 # If crt-static is enabled, static link to `libunwind.a` provided by system
 # If crt-static is disabled, dynamic link to `libunwind.so` provided by system
 system-llvm-libunwind = []
+
+[patch.crates-io]
+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}