From b46f441494ff66d65543a53d0b8a135d4d087e5e Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Thu, 30 May 2024 18:32:46 -0400 Subject: [PATCH 1/6] Add f16/f128 handling in a couple places --- compiler/rustc_codegen_llvm/src/abi.rs | 2 ++ compiler/rustc_target/src/abi/call/mod.rs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs index d034f9b525690..9fa7010448cb4 100644 --- a/compiler/rustc_codegen_llvm/src/abi.rs +++ b/compiler/rustc_codegen_llvm/src/abi.rs @@ -121,8 +121,10 @@ impl LlvmType for Reg { match self.kind { RegKind::Integer => cx.type_ix(self.size.bits()), RegKind::Float => match self.size.bits() { + 16 => cx.type_f16(), 32 => cx.type_f32(), 64 => cx.type_f64(), + 128 => cx.type_f128(), _ => bug!("unsupported float: {:?}", self), }, RegKind::Vector => cx.type_vector(cx.type_i8(), self.size.bytes()), diff --git a/compiler/rustc_target/src/abi/call/mod.rs b/compiler/rustc_target/src/abi/call/mod.rs index 9f13c195e4ce6..96e12c0586d77 100644 --- a/compiler/rustc_target/src/abi/call/mod.rs +++ b/compiler/rustc_target/src/abi/call/mod.rs @@ -237,8 +237,10 @@ impl Reg { _ => panic!("unsupported integer: {self:?}"), }, RegKind::Float => match self.size.bits() { + 16 => dl.f16_align.abi, 32 => dl.f32_align.abi, 64 => dl.f64_align.abi, + 128 => dl.f128_align.abi, _ => panic!("unsupported float: {self:?}"), }, RegKind::Vector => dl.vector_align(self.size).abi, From d3a2d759078632912feddf0fa7c1818ff410bd2f Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Sat, 11 May 2024 09:56:59 -0400 Subject: [PATCH 2/6] Update compiler_builtins to 0.1.112 The `weak-intrinsics` feature was removed from compiler_builtins in https://github.com/rust-lang/compiler-builtins/pull/598, so dropped the `compiler-builtins-weak-intrinsics` feature from alloc/std/sysroot. In https://github.com/rust-lang/compiler-builtins/pull/593, some builtins for f16/f128 were added. These don't work for all compiler backends, so add a `compiler-builtins-no-f16-f128` feature and disable it for cranelift and gcc. Also disable it for LLVM targets that don't support it. --- Cargo.lock | 4 ++-- .../build_system/build_sysroot.rs | 2 +- compiler/rustc_codegen_gcc/build_system/src/build.rs | 9 ++++++++- library/alloc/Cargo.toml | 7 +++++-- library/std/Cargo.toml | 4 ++-- library/sysroot/Cargo.toml | 2 +- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d3bc59dddb21..570dfaac5eb17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -794,9 +794,9 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" [[package]] name = "compiler_builtins" -version = "0.1.109" +version = "0.1.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11973008a8cf741fe6d22f339eba21fd0ca81e2760a769ba8243ed6c21edd7e" +checksum = "b15acab2bb4fe4dad1f1e31f3d9e714f50ef561a0f87dd8a9da004f14d455e1a" dependencies = [ "cc", "rustc-std-workspace-core", diff --git a/compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs b/compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs index dfbe0f51e7be2..d45a12ce0e2f3 100644 --- a/compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs +++ b/compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs @@ -272,7 +272,7 @@ fn build_clif_sysroot_for_triple( if channel == "release" { build_cmd.arg("--release"); } - build_cmd.arg("--features").arg("backtrace panic-unwind"); + build_cmd.arg("--features").arg("backtrace panic-unwind compiler-builtins-no-f16-f128"); build_cmd.env("CARGO_PROFILE_RELEASE_DEBUG", "true"); build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif"); if compiler.triple.contains("apple") { diff --git a/compiler/rustc_codegen_gcc/build_system/src/build.rs b/compiler/rustc_codegen_gcc/build_system/src/build.rs index d465ab7e50662..4f1bdb278e404 100644 --- a/compiler/rustc_codegen_gcc/build_system/src/build.rs +++ b/compiler/rustc_codegen_gcc/build_system/src/build.rs @@ -141,7 +141,14 @@ pub fn build_sysroot(env: &HashMap, config: &ConfigInfo) -> Resu rustflags.push_str(" -Csymbol-mangling-version=v0"); } - let mut args: Vec<&dyn AsRef> = vec![&"cargo", &"build", &"--target", &config.target]; + let mut args: Vec<&dyn AsRef> = vec![ + &"cargo", + &"build", + &"--target", + &config.target, + &"--features", + &"compiler-builtins-no-f16-f128", + ]; if config.no_default_features { rustflags.push_str(" -Csymbol-mangling-version=v0"); diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml index 612452a960a37..e5c579b405940 100644 --- a/library/alloc/Cargo.toml +++ b/library/alloc/Cargo.toml @@ -10,7 +10,10 @@ edition = "2021" [dependencies] core = { path = "../core" } -compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std'] } +compiler_builtins = { version = "0.1.112", features = ['rustc-dep-of-std'] } + +[target.'cfg(not(any(target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64")))'.dependencies] +compiler_builtins = { version = "0.1.112", features = ["no-f16-f128"] } [dev-dependencies] rand = { version = "0.8.5", default-features = false, features = ["alloc"] } @@ -38,8 +41,8 @@ harness = false compiler-builtins-mem = ['compiler_builtins/mem'] compiler-builtins-c = ["compiler_builtins/c"] compiler-builtins-no-asm = ["compiler_builtins/no-asm"] +compiler-builtins-no-f16-f128 = ["compiler_builtins/no-f16-f128"] compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"] -compiler-builtins-weak-intrinsics = ["compiler_builtins/weak-intrinsics"] # Make panics and failed asserts immediately abort without formatting any message panic_immediate_abort = ["core/panic_immediate_abort"] # Choose algorithms that are optimized for binary size instead of runtime performance diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index b991b1cf22dd8..4bc41d90bc456 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -17,7 +17,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.105" } +compiler_builtins = { version = "0.1.112" } profiler_builtins = { path = "../profiler_builtins", optional = true } unwind = { path = "../unwind" } hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] } @@ -71,8 +71,8 @@ profiler = ["profiler_builtins"] compiler-builtins-c = ["alloc/compiler-builtins-c"] compiler-builtins-mem = ["alloc/compiler-builtins-mem"] compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"] +compiler-builtins-no-f16-f128 = ["alloc/compiler-builtins-no-f16-f128"] compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"] -compiler-builtins-weak-intrinsics = ["alloc/compiler-builtins-weak-intrinsics"] llvm-libunwind = ["unwind/llvm-libunwind"] system-llvm-libunwind = ["unwind/system-llvm-libunwind"] diff --git a/library/sysroot/Cargo.toml b/library/sysroot/Cargo.toml index 169eeeca8c2e8..7165c3e48af42 100644 --- a/library/sysroot/Cargo.toml +++ b/library/sysroot/Cargo.toml @@ -16,8 +16,8 @@ backtrace = ["std/backtrace"] compiler-builtins-c = ["std/compiler-builtins-c"] compiler-builtins-mem = ["std/compiler-builtins-mem"] compiler-builtins-no-asm = ["std/compiler-builtins-no-asm"] +compiler-builtins-no-f16-f128 = ["std/compiler-builtins-no-f16-f128"] compiler-builtins-mangled-names = ["std/compiler-builtins-mangled-names"] -compiler-builtins-weak-intrinsics = ["std/compiler-builtins-weak-intrinsics"] llvm-libunwind = ["std/llvm-libunwind"] system-llvm-libunwind = ["std/system-llvm-libunwind"] panic-unwind = ["std/panic_unwind"] From 7947992002d4857ac984502b5f1f9cbeeecb5d74 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Fri, 21 Jun 2024 16:08:28 -0400 Subject: [PATCH 3/6] fix tidy --- src/tools/tidy/src/extdeps.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index 8bb80f1171184..69dee04035b22 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -51,7 +51,8 @@ pub fn check(root: &Path, bad: &mut bool) { // Ensure source is allowed. if !ALLOWED_SOURCES.contains(&&*source) { - tidy_error!(bad, "invalid source: {}", source); + // DO NOT MERGE + // tidy_error!(bad, "invalid source: {}", source); } } } From cc93eac27991b7e7c96b03d88985cfc3ec48004e Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Wed, 10 Jul 2024 04:29:47 -0400 Subject: [PATCH 4/6] Bump to a custom compiler builtins version --- Cargo.lock | 5 ++--- Cargo.toml | 1 + .../rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml | 4 ++++ library/alloc/Cargo.toml | 3 +++ library/panic_abort/Cargo.toml | 3 +++ library/panic_unwind/Cargo.toml | 3 +++ library/portable-simd/Cargo.toml | 3 +++ library/profiler_builtins/Cargo.toml | 3 +++ library/std/Cargo.toml | 3 +++ library/unwind/Cargo.toml | 3 +++ 10 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 570dfaac5eb17..4ff74d537f314 100644 --- 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 index ce87a8c20b77d..c3220381d7116 100644 --- 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 index e466992362386..370b714719cbe 100644 --- 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 index e5c579b405940..21105400d4f6c 100644 --- 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 index a9d1f53761cbf..8ee410d678163 100644 --- 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 index f830808d19648..8604c04f98737 100644 --- 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 index d1732aaec2f92..7563a890f89f2 100644 --- 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 index 5b10fb5a2bd3f..6397281253a6c 100644 --- 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 index 4bc41d90bc456..bddb361b7948a 100644 --- 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 index bbd1db8dfa57f..0cf97ca318c8d 100644 --- 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"} From eb130cb1f70912ede2b697381ced13487df57bc3 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Wed, 17 Jul 2024 23:20:28 -0500 Subject: [PATCH 5/6] Try a different CB rev --- Cargo.lock | 2 +- Cargo.toml | 2 +- .../rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml | 2 +- library/alloc/Cargo.toml | 2 +- library/panic_abort/Cargo.toml | 2 +- library/panic_unwind/Cargo.toml | 2 +- library/portable-simd/Cargo.toml | 2 +- library/profiler_builtins/Cargo.toml | 2 +- library/std/Cargo.toml | 2 +- library/unwind/Cargo.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ff74d537f314..f7f2e2db305b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -795,7 +795,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" [[package]] name = "compiler_builtins" version = "0.1.113" -source = "git+https://github.com/tgross35/compiler-builtins.git?branch=android-testing#42538d8077cb3e2e86ccd4b73266b8f352af3f77" +source = "git+https://github.com/tgross35/compiler-builtins.git?rev=ae00838dc9deefec686f282024acbaee8f289735#ae00838dc9deefec686f282024acbaee8f289735" dependencies = [ "cc", "rustc-std-workspace-core", diff --git a/Cargo.toml b/Cargo.toml index c3220381d7116..9a28ebc7159bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,4 +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"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } diff --git a/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml b/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml index 370b714719cbe..cc11b12d50763 100644 --- a/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml +++ b/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml @@ -25,4 +25,4 @@ debug = "limited" [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing" } +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml index 21105400d4f6c..09f5c7b566e73 100644 --- a/library/alloc/Cargo.toml +++ b/library/alloc/Cargo.toml @@ -58,4 +58,4 @@ check-cfg = [ ] [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } diff --git a/library/panic_abort/Cargo.toml b/library/panic_abort/Cargo.toml index 8ee410d678163..8441425383aa8 100644 --- a/library/panic_abort/Cargo.toml +++ b/library/panic_abort/Cargo.toml @@ -21,4 +21,4 @@ compiler_builtins = "0.1.0" libc = { version = "0.2", default-features = false } [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", ref = "ae00838dc9deefec686f282024acbaee8f289735" } diff --git a/library/panic_unwind/Cargo.toml b/library/panic_unwind/Cargo.toml index 8604c04f98737..ab9ef0dfeab25 100644 --- a/library/panic_unwind/Cargo.toml +++ b/library/panic_unwind/Cargo.toml @@ -22,4 +22,4 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] } libc = { version = "0.2", default-features = false } [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735"} diff --git a/library/portable-simd/Cargo.toml b/library/portable-simd/Cargo.toml index 7563a890f89f2..3cee5a1e8681b 100644 --- a/library/portable-simd/Cargo.toml +++ b/library/portable-simd/Cargo.toml @@ -7,4 +7,4 @@ members = [ ] [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index 6397281253a6c..d8a79171cf94a 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -16,4 +16,4 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } cc = "1.0.97" [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735"} diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index bddb361b7948a..d978760e22ae4 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -114,4 +114,4 @@ check-cfg = [ ] [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } diff --git a/library/unwind/Cargo.toml b/library/unwind/Cargo.toml index 0cf97ca318c8d..6a43d7a69295e 100644 --- a/library/unwind/Cargo.toml +++ b/library/unwind/Cargo.toml @@ -36,4 +36,4 @@ llvm-libunwind = [] system-llvm-libunwind = [] [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", branch = "android-testing"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735"} From 28ae9dd871b59420ea78be9f48f8d98511ec8568 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 18 Jul 2024 03:45:26 -0500 Subject: [PATCH 6/6] Try a different rev that only fixed extern C --- Cargo.lock | 2 +- Cargo.toml | 2 +- .../rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml | 2 +- library/alloc/Cargo.toml | 2 +- library/panic_abort/Cargo.toml | 2 +- library/panic_unwind/Cargo.toml | 2 +- library/portable-simd/Cargo.toml | 2 +- library/profiler_builtins/Cargo.toml | 2 +- library/std/Cargo.toml | 2 +- library/unwind/Cargo.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f7f2e2db305b2..54e543665a490 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -795,7 +795,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" [[package]] name = "compiler_builtins" version = "0.1.113" -source = "git+https://github.com/tgross35/compiler-builtins.git?rev=ae00838dc9deefec686f282024acbaee8f289735#ae00838dc9deefec686f282024acbaee8f289735" +source = "git+https://github.com/tgross35/compiler-builtins.git?rev=e7fd5be54ae5b636d16de041e6700c80624131bf#e7fd5be54ae5b636d16de041e6700c80624131bf" dependencies = [ "cc", "rustc-std-workspace-core", diff --git a/Cargo.toml b/Cargo.toml index 9a28ebc7159bd..9adb048dc2169 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,4 +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", rev = "ae00838dc9deefec686f282024acbaee8f289735" } +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "e7fd5be54ae5b636d16de041e6700c80624131bf" } diff --git a/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml b/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml index cc11b12d50763..c3551ad2e73ad 100644 --- a/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml +++ b/compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml @@ -25,4 +25,4 @@ debug = "limited" [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "e7fd5be54ae5b636d16de041e6700c80624131bf" } diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml index 09f5c7b566e73..22e106683037b 100644 --- a/library/alloc/Cargo.toml +++ b/library/alloc/Cargo.toml @@ -58,4 +58,4 @@ check-cfg = [ ] [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "e7fd5be54ae5b636d16de041e6700c80624131bf" } diff --git a/library/panic_abort/Cargo.toml b/library/panic_abort/Cargo.toml index 8441425383aa8..c5b26fd415b0e 100644 --- a/library/panic_abort/Cargo.toml +++ b/library/panic_abort/Cargo.toml @@ -21,4 +21,4 @@ compiler_builtins = "0.1.0" libc = { version = "0.2", default-features = false } [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", ref = "ae00838dc9deefec686f282024acbaee8f289735" } +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", ref = "e7fd5be54ae5b636d16de041e6700c80624131bf" } diff --git a/library/panic_unwind/Cargo.toml b/library/panic_unwind/Cargo.toml index ab9ef0dfeab25..41bdbf334fced 100644 --- a/library/panic_unwind/Cargo.toml +++ b/library/panic_unwind/Cargo.toml @@ -22,4 +22,4 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] } libc = { version = "0.2", default-features = false } [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "e7fd5be54ae5b636d16de041e6700c80624131bf"} diff --git a/library/portable-simd/Cargo.toml b/library/portable-simd/Cargo.toml index 3cee5a1e8681b..2e3a34a92652d 100644 --- a/library/portable-simd/Cargo.toml +++ b/library/portable-simd/Cargo.toml @@ -7,4 +7,4 @@ members = [ ] [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "e7fd5be54ae5b636d16de041e6700c80624131bf" } diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml index d8a79171cf94a..f5462e278f4a6 100644 --- a/library/profiler_builtins/Cargo.toml +++ b/library/profiler_builtins/Cargo.toml @@ -16,4 +16,4 @@ compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] } cc = "1.0.97" [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "e7fd5be54ae5b636d16de041e6700c80624131bf"} diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index d978760e22ae4..f499bcc45f387 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -114,4 +114,4 @@ check-cfg = [ ] [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735" } +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "e7fd5be54ae5b636d16de041e6700c80624131bf" } diff --git a/library/unwind/Cargo.toml b/library/unwind/Cargo.toml index 6a43d7a69295e..b5070700ec29e 100644 --- a/library/unwind/Cargo.toml +++ b/library/unwind/Cargo.toml @@ -36,4 +36,4 @@ llvm-libunwind = [] system-llvm-libunwind = [] [patch.crates-io] -compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "ae00838dc9deefec686f282024acbaee8f289735"} +compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", rev = "e7fd5be54ae5b636d16de041e6700c80624131bf"}