diff options
Diffstat (limited to 'experimental/mrustc/mrustc-0003-Patches-Add-extra-context-to-1.74-patch-file-hopeful.patch')
-rw-r--r-- | experimental/mrustc/mrustc-0003-Patches-Add-extra-context-to-1.74-patch-file-hopeful.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/experimental/mrustc/mrustc-0003-Patches-Add-extra-context-to-1.74-patch-file-hopeful.patch b/experimental/mrustc/mrustc-0003-Patches-Add-extra-context-to-1.74-patch-file-hopeful.patch new file mode 100644 index 000000000..b4a0adc6e --- /dev/null +++ b/experimental/mrustc/mrustc-0003-Patches-Add-extra-context-to-1.74-patch-file-hopeful.patch @@ -0,0 +1,55 @@ +From 07a942a858b940f2a76e00d88f5c4df084685b33 Mon Sep 17 00:00:00 2001 +From: John Hodge <tpg@mutabah.net> +Date: Mon, 16 Dec 2024 14:21:28 +0800 +Subject: [PATCH 3/6] Patches - Add extra context to 1.74 patch file, hopefully + makes OSX happy. Ref #349 + + +diff --git a/rustc-1.74.0-src.patch b/rustc-1.74.0-src.patch +index cacaa3dc..780afc6d 100644 +--- a/rustc-1.74.0-src.patch ++++ b/rustc-1.74.0-src.patch +@@ -81,13 +81,15 @@ + mod size_asserts { + --- compiler/rustc_middle/src/mir/consts.rs + +++ compiler/rustc_middle/src/mir/consts.rs +-@@ -73,2 +73,2 @@ ++@@ -73,3 +73,3 @@ ++ + -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] + +#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))] + static_assert_size!(ConstValue<'_>, 24); + --- compiler/rustc_middle/src/mir/interpret/value.rs + +++ compiler/rustc_middle/src/mir/interpret/value.rs +-@@ -37,2 +37,2 @@ ++@@ -37,3 +37,3 @@ ++ + -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] + +#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))] + static_assert_size!(Scalar, 24); +@@ -107,7 +109,8 @@ + mod size_asserts { + --- compiler/rustc_middle/src/ty/consts/kind.rs + +++ compiler/rustc_middle/src/ty/consts/kind.rs +-@@ -75,2 +75,2 @@ ++@@ -75,3 +75,3 @@ ++ + -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] + +#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))] + static_assert_size!(Expr<'_>, 24); +@@ -115,7 +118,9 @@ + # MSVC Cannot handle structs larger than 32-bit, so disable this for windows with mrustc + --- vendor/hex/src/lib.rs + +++ vendor/hex/src/lib.rs +-@@ -239,2 +239,2 @@ ++@@ -239,3 +239,3 @@ ++ + -#[cfg(target_pointer_width = "64")] + +#[cfg(all(target_pointer_width = "64", not(rust_compiler = "mrustc")))] +- from_hex_array_impl! { +\ No newline at end of file ++ from_hex_array_impl! { ++ +-- +2.40.0 + |