From 992d1a49699a617ccc8ffb5063b6f2cfb8ffce87 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Mon, 12 Jun 2023 17:36:56 +0100 Subject: [PATCH] ubuntu-disable-ppc64el-asm-tests Gbp-Pq: Name ubuntu-disable-ppc64el-asm-tests.patch --- compiler/rustc_lint/src/builtin.rs | 4 ++++ compiler/rustc_lint_defs/src/builtin.rs | 2 ++ src/test/run-make-fulldeps/intrinsic-unreachable/Makefile | 1 + 3 files changed, 7 insertions(+) diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs index bd58021f78..66e0f01edf 100644 --- a/compiler/rustc_lint/src/builtin.rs +++ b/compiler/rustc_lint/src/builtin.rs @@ -3060,6 +3060,10 @@ declare_lint! { /// ### Example /// /// ```rust,compile_fail + /// #![cfg_attr( + /// not(any(target_arch = "powerpc64", target_arch = "s390x")), + /// feature(asm_experimental_arch) + /// )] /// use std::arch::asm; /// /// fn main() { diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs index f00165cd3b..139a43c561 100644 --- a/compiler/rustc_lint_defs/src/builtin.rs +++ b/compiler/rustc_lint_defs/src/builtin.rs @@ -2913,11 +2913,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)); } diff --git a/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile b/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile index 2037728568..bcf9c075a7 100644 --- 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 -- 2.30.2