summaryrefslogtreecommitdiffstats
path: root/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:13:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:13:01 +0000
commit8eaa44899cb2f756d21ac152935a9cfa65ca2e7b (patch)
tree4561b181d6ffa6c8a16cf2740e43440e86d0bb22 /debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
parentMerging upstream version 1.66.0+dfsg1. (diff)
downloadrustc-8eaa44899cb2f756d21ac152935a9cfa65ca2e7b.tar.xz
rustc-8eaa44899cb2f756d21ac152935a9cfa65ca2e7b.zip
Adding debian version 1.66.0+dfsg1-1.debian/1.66.0+dfsg1-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.patch15
1 files changed, 3 insertions, 12 deletions
diff --git a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
index 001305b6e..4acfdcb2f 100644
--- a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
+++ b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
@@ -1,6 +1,6 @@
--- a/compiler/rustc_lint_defs/src/builtin.rs
+++ b/compiler/rustc_lint_defs/src/builtin.rs
-@@ -2913,11 +2913,13 @@ declare_lint! {
+@@ -2883,11 +2883,13 @@
///
/// use std::arch::asm;
///
@@ -14,22 +14,13 @@
/// #[naked]
/// pub extern "Rust" fn rust_abi() -> u32 {
/// unsafe { asm!("", options(noreturn)); }
---- a/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile
-+++ b/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile
-@@ -1,6 +1,7 @@
- include ../tools.mk
-
- # ignore-windows-msvc
-+# needs-asm-support
- #
- # Because of Windows exception handling, the code is not necessarily any shorter.
- # https://github.com/llvm-mirror/llvm/commit/64b2297786f7fd6f5fa24cdd4db0298fbf211466
--- a/compiler/rustc_lint/src/builtin.rs
+++ b/compiler/rustc_lint/src/builtin.rs
-@@ -3053,6 +3053,10 @@ declare_lint! {
+@@ -3130,7 +3130,10 @@
/// ### Example
///
/// ```rust,compile_fail
+- /// # #![feature(asm_experimental_arch)]
+ /// #![cfg_attr(
+ /// not(any(target_arch = "powerpc64", target_arch = "s390x")),
+ /// feature(asm_experimental_arch)