summaryrefslogtreecommitdiffstats
path: root/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:37 +0000
commit1c69ecb2dd463a5cd922e872386381e1cc17147e (patch)
treed49e9c5086b704151975474cb9ae68509ffa4787 /debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
parentMerging upstream version 1.76.0+dfsg1. (diff)
downloadrustc-1c69ecb2dd463a5cd922e872386381e1cc17147e.tar.xz
rustc-1c69ecb2dd463a5cd922e872386381e1cc17147e.zip
Merging debian version 1.76.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.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
deleted file mode 100644
index 341d5f0af..000000000
--- a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-@@ -2883,11 +2883,13 @@ declare_lint! {
- ///
- /// use std::arch::asm;
- ///
-+ /// #[cfg(not(any(target_arch = "powerpc64", target_arch = "s390x")))]
- /// #[naked]
- /// pub fn default_abi() -> u32 {
- /// unsafe { asm!("", options(noreturn)); }
- /// }
- ///
-+ /// #[cfg(not(any(target_arch = "powerpc64", target_arch = "s390x")))]
- /// #[naked]
- /// pub extern "Rust" fn rust_abi() -> u32 {
- /// unsafe { asm!("", options(noreturn)); }
-Index: rust/compiler/rustc_lint/src/builtin.rs
-===================================================================
---- rust.orig/compiler/rustc_lint/src/builtin.rs
-+++ rust/compiler/rustc_lint/src/builtin.rs
-@@ -3112,7 +3112,10 @@ declare_lint! {
- /// ### Example
- ///
- /// ```rust,compile_fail
-- /// # #![feature(asm_experimental_arch)]
-+ /// #![cfg_attr(
-+ /// not(any(target_arch = "powerpc64", target_arch = "s390x")),
-+ /// feature(asm_experimental_arch)
-+ /// )]
- /// use std::arch::asm;
- ///
- /// fn main() {