summaryrefslogtreecommitdiff
path: root/experimental/mrustc/mrustc-0004-Patches-Fix-incorrect-line-numbers-in-patches.patch
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/mrustc/mrustc-0004-Patches-Fix-incorrect-line-numbers-in-patches.patch')
-rw-r--r--experimental/mrustc/mrustc-0004-Patches-Fix-incorrect-line-numbers-in-patches.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/experimental/mrustc/mrustc-0004-Patches-Fix-incorrect-line-numbers-in-patches.patch b/experimental/mrustc/mrustc-0004-Patches-Fix-incorrect-line-numbers-in-patches.patch
new file mode 100644
index 000000000..3b7340a30
--- /dev/null
+++ b/experimental/mrustc/mrustc-0004-Patches-Fix-incorrect-line-numbers-in-patches.patch
@@ -0,0 +1,48 @@
+From 012bc633560b5fb7fbaaa2e7733852c1eedbd8d5 Mon Sep 17 00:00:00 2001
+From: John Hodge <tpg@mutabah.net>
+Date: Mon, 16 Dec 2024 15:07:57 +0800
+Subject: [PATCH 4/6] Patches - Fix incorrect line numbers in patches
+
+
+diff --git a/rustc-1.74.0-src.patch b/rustc-1.74.0-src.patch
+index 780afc6d..8d3df778 100644
+--- a/rustc-1.74.0-src.patch
++++ b/rustc-1.74.0-src.patch
+@@ -81,14 +81,14 @@
+ mod size_asserts {
+ --- compiler/rustc_middle/src/mir/consts.rs
+ +++ compiler/rustc_middle/src/mir/consts.rs
+-@@ -73,3 +73,3 @@
++@@ -72,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,3 +37,3 @@
++@@ -36,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")))]
+@@ -109,7 +109,7 @@
+ mod size_asserts {
+ --- compiler/rustc_middle/src/ty/consts/kind.rs
+ +++ compiler/rustc_middle/src/ty/consts/kind.rs
+-@@ -75,3 +75,3 @@
++@@ -74,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")))]
+@@ -118,7 +118,7 @@
+ # 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,3 +239,3 @@
++@@ -238,3 +239,3 @@
+
+ -#[cfg(target_pointer_width = "64")]
+ +#[cfg(all(target_pointer_width = "64", not(rust_compiler = "mrustc")))]
+--
+2.40.0
+