1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
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
|
