bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #120518 - kxxt:riscv-split-debug-info, r=compiler-errors

Browse source 
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:
https://github.com/llvm/llvm-project/issues/56642

Fixes #110224
This commit is contained in:
Matthias Krüger 2024-02-05 11:07:27 +01:00 • committed by GitHub
commit 540936ca99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs
View file

@ -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 { pub fn target() -> Target {
Target { Target {
@ -12,6 +14,7 @@ pub fn target() -> Target {
features: "+m,+a,+f,+d,+c".into(), features: "+m,+a,+f,+d,+c".into(),
llvm_abiname: "ilp32d".into(), llvm_abiname: "ilp32d".into(),
max_atomic_width: Some(32), max_atomic_width: Some(32),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_gnu::opts() ..base::linux_gnu::opts()
}, },
} }

5
compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
View file

@ -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 { pub fn target() -> Target {
Target { Target {
@ -12,6 +14,7 @@ pub fn target() -> Target {
features: "+m,+a,+f,+d,+c".into(), features: "+m,+a,+f,+d,+c".into(),
llvm_abiname: "ilp32d".into(), llvm_abiname: "ilp32d".into(),
max_atomic_width: Some(32), max_atomic_width: Some(32),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_musl::opts() ..base::linux_musl::opts()
}, },
} }

5
compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs
View file

@ -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 { pub fn target() -> Target {
Target { Target {
@ -13,6 +15,7 @@ pub fn target() -> Target {
llvm_abiname: "lp64d".into(), llvm_abiname: "lp64d".into(),
supported_sanitizers: SanitizerSet::ADDRESS, supported_sanitizers: SanitizerSet::ADDRESS,
max_atomic_width: Some(64), max_atomic_width: Some(64),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::android::opts() ..base::android::opts()
}, },
} }

5
compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs
View file

@ -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 { pub fn target() -> Target {
Target { Target {
@ -12,6 +14,7 @@ pub fn target() -> Target {
features: "+m,+a,+f,+d,+c".into(), features: "+m,+a,+f,+d,+c".into(),
llvm_abiname: "lp64d".into(), llvm_abiname: "lp64d".into(),
max_atomic_width: Some(64), max_atomic_width: Some(64),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_gnu::opts() ..base::linux_gnu::opts()
}, },
} }

5
compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs
View file

@ -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 { pub fn target() -> Target {
Target { Target {
@ -12,6 +14,7 @@ pub fn target() -> Target {
features: "+m,+a,+f,+d,+c".into(), features: "+m,+a,+f,+d,+c".into(),
llvm_abiname: "lp64d".into(), llvm_abiname: "lp64d".into(),
max_atomic_width: Some(64), max_atomic_width: Some(64),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_musl::opts() ..base::linux_musl::opts()
}, },
} }