explicitly disable split unpacked debuginfo for now on riscv64,

it's broken and we don't want cargo to auto-enable it..
https://github.com/llvm/llvm-project/issues/56642
https://github.com/rust-lang/rust/issues/110224Z

Gbp-Pq: Name u-riscv-disable-unpacked-split-debuginfo.patch

diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs b/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs
index 8281bac10f88feba01ee04bd28bdbd3858bd34b8..ad1fc624adf6ef0dc3b5796a7099f448beb02e2d 100644 (file)
--- a/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs
+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs
@@ -1,4 +1,5 @@
-use crate::spec::{CodeModel, Target, TargetOptions};
+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions};
+use std::borrow::Cow;
 
 pub fn target() -> Target {
     Target {
@@ -12,6 +13,7 @@ pub fn target() -> Target {
             features: "+m,+a,+f,+d,+c".into(),
             llvm_abiname: "lp64d".into(),
             max_atomic_width: Some(64),
+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
             ..super::freebsd_base::opts()
         },
     }

diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs b/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs
index 0585ed76fe815522fc45deefc245104ac4dc0b7b..69d11081ac07651487c03bc032dafdfd2f874dc5 100644 (file)
--- a/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs
+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs
@@ -1,4 +1,5 @@
-use crate::spec::{CodeModel, SanitizerSet, Target, TargetOptions};
+use crate::spec::{CodeModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions};
+use std::borrow::Cow;
 
 pub fn target() -> Target {
     Target {
@@ -13,6 +14,7 @@ pub fn target() -> Target {
             llvm_abiname: "lp64d".into(),
             max_atomic_width: Some(64),
             supported_sanitizers: SanitizerSet::SHADOWCALLSTACK,
+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
             ..super::fuchsia_base::opts()
         },
     }

diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
index 90dccb28063dc955e7029939ca36d3f1a6429348..8114e024d12d2ea1b16ac9e66d5d6a9af4753718 100644 (file)
--- a/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
@@ -1,4 +1,5 @@
-use crate::spec::{CodeModel, Target, TargetOptions};
+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions};
+use std::borrow::Cow;
 
 pub fn target() -> Target {
     Target {
@@ -12,6 +13,7 @@ pub fn target() -> Target {
             features: "+m,+a,+f,+d,+c".into(),
             llvm_abiname: "lp64d".into(),
             max_atomic_width: Some(64),
+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
             ..super::linux_gnu_base::opts()
         },
     }

diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
index 1a56c78e6852421e6eafd144d1835cccb4ec7edb..67dbd2f740ee47f83c0d31df22e9211faa72a888 100644 (file)
--- a/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
@@ -1,4 +1,5 @@
-use crate::spec::{CodeModel, Target, TargetOptions};
+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions};
+use std::borrow::Cow;
 
 pub fn target() -> Target {
     Target {
@@ -12,6 +13,7 @@ pub fn target() -> Target {
             features: "+m,+a,+f,+d,+c".into(),
             llvm_abiname: "lp64d".into(),
             max_atomic_width: Some(64),
+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
             ..super::linux_musl_base::opts()
         },
     }

diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs b/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
index ab3c14e3fe73dbdee9d0616629bca38a7564dd7e..a47b63dc945816995abae0d3ddbcdf6f3515d269 100644 (file)
--- a/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
@@ -1,5 +1,6 @@
 use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy};
-use crate::spec::{RelocModel, Target, TargetOptions};
+use crate::spec::{RelocModel, SplitDebuginfo, Target, TargetOptions};
+use std::borrow::Cow;
 
 use super::SanitizerSet;
 
@@ -23,6 +24,7 @@ pub fn target() -> Target {
             emit_debug_gdb_scripts: false,
             eh_frame_header: false,
             supported_sanitizers: SanitizerSet::KERNELADDRESS,
+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
             ..Default::default()
         },
     }

diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs b/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs
index ade9d77624bdb4840bff24c6768d54c323bfeaea..b04cea8850459480906588cb132ccb5cacfbd038 100644 (file)
--- a/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs
+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs
@@ -1,4 +1,5 @@
-use crate::spec::{CodeModel, Target, TargetOptions};
+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions};
+use std::borrow::Cow;
 
 pub fn target() -> Target {
     Target {
@@ -12,6 +13,7 @@ pub fn target() -> Target {
             features: "+m,+a,+f,+d,+c".into(),
             llvm_abiname: "lp64d".into(),
             max_atomic_width: Some(64),
+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
             ..super::openbsd_base::opts()
         },
     }

diff --git a/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs b/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
index 0f1821c9985b0f32d1ce7496c7e5971f4ac87f99..1bec356dcd566078b84cbfe134220a218e406b06 100644 (file)
--- a/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
+++ b/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
@@ -1,5 +1,6 @@
 use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy};
-use crate::spec::{RelocModel, SanitizerSet, Target, TargetOptions};
+use crate::spec::{RelocModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions};
+use std::borrow::Cow;
 
 pub fn target() -> Target {
     Target {
@@ -20,6 +21,7 @@ pub fn target() -> Target {
             emit_debug_gdb_scripts: false,
             eh_frame_header: false,
             supported_sanitizers: SanitizerSet::KERNELADDRESS,
+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
             ..Default::default()
         },
     }