From c29d7c1ba10d6debd11f9d8aad5d069a6491e60e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:01 +0200 Subject: Adding debian version 1.76.0+dfsg1-1. Signed-off-by: Daniel Baumann --- .../ubuntu/ubuntu-disable-ppc64el-asm-tests.patch | 44 ++++++++++++++++++++ .../patches/ubuntu/ubuntu-ignore-arm-doctest.patch | 48 ++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 debian/patches/ubuntu/ubuntu-disable-ppc64el-asm-tests.patch create mode 100644 debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch (limited to 'debian/patches/ubuntu') diff --git a/debian/patches/ubuntu/ubuntu-disable-ppc64el-asm-tests.patch b/debian/patches/ubuntu/ubuntu-disable-ppc64el-asm-tests.patch new file mode 100644 index 000000000..8049a1806 --- /dev/null +++ b/debian/patches/ubuntu/ubuntu-disable-ppc64el-asm-tests.patch @@ -0,0 +1,44 @@ +From: Debian Rust Maintainers +Date: Thu, 13 Jun 2024 11:16:41 +0200 +Subject: ubuntu-disable-ppc64el-asm-tests + +Forwarded: not-needed +--- + compiler/rustc_lint/src/builtin.rs | 5 ++++- + compiler/rustc_lint_defs/src/builtin.rs | 2 ++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs +index 045ff38..3472290 100644 +--- a/compiler/rustc_lint/src/builtin.rs ++++ b/compiler/rustc_lint/src/builtin.rs +@@ -2700,7 +2700,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 f9b6623..b4f5c7b 100644 +--- a/compiler/rustc_lint_defs/src/builtin.rs ++++ b/compiler/rustc_lint_defs/src/builtin.rs +@@ -3046,11 +3046,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/debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch b/debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch new file mode 100644 index 000000000..4249b18e6 --- /dev/null +++ b/debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch @@ -0,0 +1,48 @@ +From: Simon Chopin +Date: Thu, 13 Jun 2024 11:16:41 +0200 +Subject: Disable the doctests for the instruction_set errors + +Bug: https://github.com/rust-lang/rust/issues/83453 +Last-Update: 2022-02-23 + +The fix is as described in the upstream issue. +--- + compiler/rustc_error_codes/src/error_codes/E0778.md | 4 ++-- + compiler/rustc_error_codes/src/error_codes/E0779.md | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_error_codes/src/error_codes/E0778.md b/compiler/rustc_error_codes/src/error_codes/E0778.md +index 467362d..d5688c2 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0778.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0778.md +@@ -16,7 +16,7 @@ specified: + ``` + #![feature(isa_attribute)] + +-#[cfg_attr(target_arch="arm", instruction_set(arm::a32))] ++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::a32))] + fn something() {} + ``` + +@@ -25,7 +25,7 @@ or: + ``` + #![feature(isa_attribute)] + +-#[cfg_attr(target_arch="arm", instruction_set(arm::t32))] ++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::t32))] + fn something() {} + ``` + +diff --git a/compiler/rustc_error_codes/src/error_codes/E0779.md b/compiler/rustc_error_codes/src/error_codes/E0779.md +index 146e20c..9d23322 100644 +--- a/compiler/rustc_error_codes/src/error_codes/E0779.md ++++ b/compiler/rustc_error_codes/src/error_codes/E0779.md +@@ -21,7 +21,7 @@ error. Example: + ``` + #![feature(isa_attribute)] + +-#[cfg_attr(target_arch="arm", instruction_set(arm::a32))] // ok! ++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::a32))] // ok! + pub fn something() {} + fn main() {} + ``` -- cgit v1.2.3