ubuntu-disable-ppc64el-asm-tests

Forwarded: not-needed

Gbp-Pq: Topic ubuntu
Gbp-Pq: Name ubuntu-disable-ppc64el-asm-tests.patch

diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs
index 07f127414dbc01b29c615dd96b9ce9fb6f409eb4..b936ff75d2592c65ee4df62990fc039f36d2d5ed 100644 (file)
--- a/compiler/rustc_lint/src/builtin.rs
+++ b/compiler/rustc_lint/src/builtin.rs
@@ -2717,7 +2717,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() {

diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
index c178359cbc874e10df7730a16782dcdc99793309..146d7851fc19d02d6437f28c456c5f28fead4ee6 100644 (file)
--- a/compiler/rustc_lint_defs/src/builtin.rs
+++ b/compiler/rustc_lint_defs/src/builtin.rs
@@ -3126,11 +3126,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)); }