Skip to content

Commit 7e67edf

Browse files
committed
DROPME patch builtins
1 parent 5f00d80 commit 7e67edf

File tree

7 files changed

+15
-5
lines changed

7 files changed

+15
-5
lines changed

compiler/rustc_codegen_cranelift/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ libloading = { version = "0.8.0", optional = true }
2323
smallvec = "1.8.1"
2424

2525
[patch.crates-io]
26-
# Uncomment to use local checkout of cranelift
26+
# todo: remove patch
27+
compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "overflowing-c-safe-ret" }
2728
#cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
2829
#cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
2930
#cranelift-module = { path = "../wasmtime/cranelift/module" }

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 = "overflowing-c-safe-ret" }
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

+5
Original file line numberDiff line numberDiff line change
@@ -488,3 +488,8 @@ name = "windows_x86_64_msvc"
488488
version = "0.52.6"
489489
source = "registry+https://github.com/rust-lang/crates.io-index"
490490
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
491+
492+
[[patch.unused]]
493+
name = "compiler_builtins"
494+
version = "0.1.139"
495+
source = "git+https://github.com/tgross35/compiler-builtins.git?branch=overflowing-c-safe-ret#8cb74d05a80a5782a5377a825d2ddd7b950bf220"

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 = "overflowing-c-safe-ret" }

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)