Rollup merge of rust-lang#120518 - kxxt:riscv-split-debug-info, r=com…

…piler-errors riscv only supports split_debuginfo=off for now Disable packed/unpacked options for riscv linux/android. Other riscv targets already only have the off option. The packed/unpacked options might be supported in the future. See upstream issue for more details: llvm/llvm-project#56642 Fixes rust-lang#110224
matthiaskrgr · Feb 5, 2024 · 83bc10b · 83bc10b
2 parents e3caa30 471af8c
commit 83bc10b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs
@@ -1,4 1,6 @@
-use crate::spec::{base, CodeModel, Target, TargetOptions};
 use std::borrow::Cow;
 
 use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
 
 pub fn target() -> Target {
  Target {
@@ -12,6 14,7 @@ pub fn target() -> Target {
  features: " m, a, f, d, c".into(),
  llvm_abiname: "ilp32d".into(),
  max_atomic_width: Some(32),
  supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
  ..base::linux_gnu::opts()
  },
  }

diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
@@ -1,4 1,6 @@
-use crate::spec::{base, CodeModel, Target, TargetOptions};
 use std::borrow::Cow;
 
 use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
 
 pub fn target() -> Target {
  Target {
@@ -12,6 14,7 @@ pub fn target() -> Target {
  features: " m, a, f, d, c".into(),
  llvm_abiname: "ilp32d".into(),
  max_atomic_width: Some(32),
  supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
  ..base::linux_musl::opts()
  },
  }

diff --git a/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs b/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs
@@ -1,4 1,6 @@
-use crate::spec::{base, CodeModel, SanitizerSet, Target, TargetOptions};
 use std::borrow::Cow;
 
 use crate::spec::{base, CodeModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions};
 
 pub fn target() -> Target {
  Target {
@@ -13,6 15,7 @@ pub fn target() -> Target {
  llvm_abiname: "lp64d".into(),
  supported_sanitizers: SanitizerSet::ADDRESS,
  max_atomic_width: Some(64),
  supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
  ..base::android::opts()
  },
  }

diff --git a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs
@@ -1,4 1,6 @@
-use crate::spec::{base, CodeModel, Target, TargetOptions};
 use std::borrow::Cow;
 
 use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
 
 pub fn target() -> Target {
  Target {
@@ -12,6 14,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]),
  ..base::linux_gnu::opts()
  },
  }

diff --git a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs
@@ -1,4 1,6 @@
-use crate::spec::{base, CodeModel, Target, TargetOptions};
 use std::borrow::Cow;
 
 use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
 
 pub fn target() -> Target {
  Target {
@@ -12,6 14,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]),
  ..base::linux_musl::opts()
  },
  }