From 88bd37043490061ee3e87ea4c6621c602568dce3 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Mon, 10 Oct 2022 19:19:05 +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 d43c661dd..8829adb3d 100644 --- a/compiler/rustc_lint/src/builtin.rs +++ b/compiler/rustc_lint/src/builtin.rs @@ -3166,6 +3166,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 5704c6ed3..862f177d3 100644 --- a/compiler/rustc_lint_defs/src/builtin.rs +++ b/compiler/rustc_lint_defs/src/builtin.rs @@ -2782,11 +2782,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 203772856..bcf9c075a 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