summaryrefslogtreecommitdiffstats
path: root/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:41:39 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:41:39 +0000
commita5cb27bed2202818ee204db23f8488a7794d6ec3 (patch)
tree4a38fb6c257e5031269038e525d11a7c2f0fdb1b /debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
parentMerging upstream version 1.70.0+dfsg2. (diff)
downloadrustc-a5cb27bed2202818ee204db23f8488a7794d6ec3.tar.xz
rustc-a5cb27bed2202818ee204db23f8488a7794d6ec3.zip
Adding debian version 1.70.0+dfsg2-1.debian/1.70.0+dfsg2-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/ubuntu-disable-ppc64el-asm-tests.patch')
-rw-r--r--debian/patches/ubuntu-disable-ppc64el-asm-tests.patch16
1 files changed, 10 insertions, 6 deletions
diff --git a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
index 7cb501e76..d947a6950 100644
--- a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
+++ b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
@@ -1,6 +1,8 @@
---- a/compiler/rustc_lint_defs/src/builtin.rs
-+++ b/compiler/rustc_lint_defs/src/builtin.rs
-@@ -2883,11 +2883,13 @@
+Index: rust/compiler/rustc_lint_defs/src/builtin.rs
+===================================================================
+--- rust.orig/compiler/rustc_lint_defs/src/builtin.rs
++++ rust/compiler/rustc_lint_defs/src/builtin.rs
+@@ -2880,11 +2880,13 @@ declare_lint! {
///
/// use std::arch::asm;
///
@@ -14,9 +16,11 @@
/// #[naked]
/// pub extern "Rust" fn rust_abi() -> u32 {
/// unsafe { asm!("", options(noreturn)); }
---- a/compiler/rustc_lint/src/builtin.rs
-+++ b/compiler/rustc_lint/src/builtin.rs
-@@ -3238,7 +3238,10 @@
+Index: rust/compiler/rustc_lint/src/builtin.rs
+===================================================================
+--- rust.orig/compiler/rustc_lint/src/builtin.rs
++++ rust/compiler/rustc_lint/src/builtin.rs
+@@ -3110,7 +3110,10 @@ declare_lint! {
/// ### Example
///
/// ```rust,compile_fail