Skip to content

Commit fa73f0d

Browse files
committed
DROPME patch builtins
1 parent 5d77191 commit fa73f0d

File tree

8 files changed

+24
-13
lines changed

8 files changed

+24
-13
lines changed

compiler/rustc_codegen_cranelift/Cargo.lock

+11-6
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,9 @@ dependencies = [
269269

270270
[[package]]
271271
name = "log"
272-
version = "0.4.22"
272+
version = "0.4.24"
273273
source = "registry+https://github.com/rust-lang/crates.io-index"
274-
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
274+
checksum = "3d6ea2a48c204030ee31a7d7fc72c93294c92fe87ecb1789881c9543516e1a0d"
275275

276276
[[package]]
277277
name = "mach2"
@@ -302,9 +302,9 @@ dependencies = [
302302

303303
[[package]]
304304
name = "proc-macro2"
305-
version = "1.0.92"
305+
version = "1.0.93"
306306
source = "registry+https://github.com/rust-lang/crates.io-index"
307-
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
307+
checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
308308
dependencies = [
309309
"unicode-ident",
310310
]
@@ -402,9 +402,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
402402

403403
[[package]]
404404
name = "syn"
405-
version = "2.0.95"
405+
version = "2.0.96"
406406
source = "registry+https://github.com/rust-lang/crates.io-index"
407-
checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
407+
checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
408408
dependencies = [
409409
"proc-macro2",
410410
"quote",
@@ -516,3 +516,8 @@ name = "windows_x86_64_msvc"
516516
version = "0.52.6"
517517
source = "registry+https://github.com/rust-lang/crates.io-index"
518518
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
519+
520+
[[patch.unused]]
521+
name = "compiler_builtins"
522+
version = "0.1.999"
523+
source = "git+https://github.com/tgross35/compiler-builtins.git?branch=NOMERGE-overflowing-c-safe-ret-version#fbdf922da9710c01698d7b42f7e40dcb1ac66d2d"

compiler/rustc_codegen_cranelift/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ libloading = { version = "0.8.0", optional = true }
2323
smallvec = "1.8.1"
2424

2525
[patch.crates-io]
26+
# todo: remove patch
27+
compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "NOMERGE-overflowing-c-safe-ret-version" }
28+
2629
# Uncomment to use an unreleased version of cranelift
2730
#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-28.0.0", version = "0.115.0" }
2831
#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-28.0.0", version = "0.115.0" }

compiler/rustc_codegen_cranelift/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ index 7165c3e48af..968552ad435 100644
1616

1717
[dependencies]
1818
core = { path = "../core" }
19-
-compiler_builtins = { version = "=0.1.140", features = ['rustc-dep-of-std'] }
20-
+compiler_builtins = { version = "=0.1.140", features = ['rustc-dep-of-std', 'no-f16-f128'] }
19+
-compiler_builtins = { version = "0.1.140", features = ['rustc-dep-of-std'] }
20+
+compiler_builtins = { version = "0.1.140", features = ['rustc-dep-of-std', 'no-f16-f128'] }
2121

2222
[dev-dependencies]
2323
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ test = { path = "./sysroot_src/library/test" }
1313
proc_macro = { path = "./sysroot_src/library/proc_macro" }
1414

1515
[patch.crates-io]
16+
# todo: remove patch
17+
compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "NOMERGE-overflowing-c-safe-ret-version" }
1618
rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }
1719
rustc-std-workspace-alloc = { path = "./sysroot_src/library/rustc-std-workspace-alloc" }
1820
rustc-std-workspace-std = { path = "./sysroot_src/library/rustc-std-workspace-std" }

library/Cargo.lock

+2-3
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ dependencies = [
6161

6262
[[package]]
6363
name = "compiler_builtins"
64-
version = "0.1.140"
65-
source = "registry+https://github.com/rust-lang/crates.io-index"
66-
checksum = "df14d41c5d172a886df3753d54238eefb0f61c96cbd8b363c33ccc92c457bee3"
64+
version = "0.1.999"
65+
source = "git+https://github.com/tgross35/compiler-builtins.git?branch=NOMERGE-overflowing-c-safe-ret-version#fbdf922da9710c01698d7b42f7e40dcb1ac66d2d"
6766
dependencies = [
6867
"cc",
6968
"rustc-std-workspace-core",

library/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ rustc-demangle.debug = 0
4545
rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
4646
rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
4747
rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
48+
# todo: remove patch
49+
compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "NOMERGE-overflowing-c-safe-ret-version" }

library/alloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010

1111
[dependencies]
1212
core = { path = "../core" }
13-
compiler_builtins = { version = "=0.1.140", features = ['rustc-dep-of-std'] }
13+
compiler_builtins = { version = "0.1.140", features = ['rustc-dep-of-std'] }
1414

1515
[dev-dependencies]
1616
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
1717
panic_unwind = { path = "../panic_unwind", optional = true }
1818
panic_abort = { path = "../panic_abort" }
1919
core = { path = "../core", public = true }
20-
compiler_builtins = { version = "=0.1.140" }
20+
compiler_builtins = { version = "0.1.140" }
2121
unwind = { path = "../unwind" }
2222
hashbrown = { version = "0.15", default-features = false, features = [
2323
'rustc-dep-of-std',

0 commit comments

Comments
 (0)