Bump to a custom compiler builtins version

tgross35 · tgross35 · commit f6d2f2dedfdc · 2024-07-10T04:29:47.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
@@ -800,9 +800,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
@@ -111,3 +111,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_sysroot/Cargo.toml b/compiler/rustc_codegen_gcc/build_sysroot/Cargo.toml
@@ -20,3 +20,7 @@ rustc-std-workspace-std = { path = "./sysroot_src/library/rustc-std-workspace-st
 [profile.release]
 debug = true
 #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
@@ -108,3 +108,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"}

Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,6 @@ check-cfg = [`
`56`	`56`	`'cfg(no_rc)',`
`57`	`57`	`'cfg(no_sync)',`
`58`	`58`	`]`
	`59`	`+`
	`60`	`+[patch.crates-io]`
	`61`	`+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}`
Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,6 @@ members = [`
`5`	`5`	`"crates/std_float",`
`6`	`6`	`"crates/test_helpers",`
`7`	`7`	`]`
	`8`	`+`
	`9`	`+[patch.crates-io]`
	`10`	`+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}`
Original file line number	Diff line number	Diff line change
`@@ -108,3 +108,6 @@ check-cfg = [`
`108`	`108`	`# of declared features, we therefor expect any feature cfg`
`109`	`109`	`'cfg(feature, values(any()))',`
`110`	`110`	`]`
	`111`	`+`
	`112`	`+[patch.crates-io]`
	`113`	`+compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"}`