Skip to content

Commit 96f1c73

Browse files
committed
Update patches for 1.48.0
Bug: 173721343 Change-Id: Ice543a2f02e1c77e059d2a81d7b367f4eef4eb79
1 parent ee6a38f commit 96f1c73

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

patches/rustc-0008-Revert-Change-opt-level-from-2-back-to-3.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ index be15e50e2..41e69ed86 100644
2828
[profile.release.package.compiler_builtins]
2929
# The compiler-builtins crate cannot reference libcore, and it's own CI will
3030
# verify that this is the case. This requires, however, that the crate is built
31-
diff --git a/src/librustc_mir/interpret/step.rs b/src/librustc_mir/interpret/step.rs
31+
diff --git a/compiler/rustc_mir/src/interpret/step.rs b/compiler/rustc_mir/src/interpret/step.rs
3232
index 18f9bbd2e..fea7e50f9 100644
33-
--- a/src/librustc_mir/interpret/step.rs
34-
+++ b/src/librustc_mir/interpret/step.rs
33+
--- a/compiler/rustc_mir/src/interpret/step.rs
34+
+++ b/compiler/rustc_mir/src/interpret/step.rs
3535
@@ -38,9 +38,6 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
3636
/// Returns `true` as long as there are more things to do.
3737
///

patches/rustc-0009-Add-Android-ARM64-to-supported-list-of-sanitize-targ.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Change-Id: I3c8210a0d7d1553a537d6a66b1ca96a75632070d
88
src/librustc_session/session.rs | 1 +
99
1 file changed, 1 insertion(+)
1010

11-
diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs
11+
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
1212
index fcd5dab94..19364f6a8 100644
13-
--- a/src/librustc_session/session.rs
14-
+++ b/src/librustc_session/session.rs
13+
--- a/compiler/rustc_session/src/session.rs
14+
+++ b/compiler/rustc_session/src/session.rs
1515
@@ -1359,6 +1359,7 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
1616

1717
const ASAN_SUPPORTED_TARGETS: &[&str] = &[

0 commit comments

Comments
 (0)