Skip to content

Commit 540936c

Browse files
authored
Rollup merge of rust-lang#120518 - kxxt:riscv-split-debug-info, r=compiler-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
2 parents 2624bfb + 471af8c commit 540936c

5 files changed

+20
-5
lines changed

compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::spec::{base, CodeModel, Target, TargetOptions};
1+
use std::borrow::Cow;
2+
3+
use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
24

35
pub fn target() -> Target {
46
Target {
@@ -12,6 +14,7 @@ pub fn target() -> Target {
1214
features: "+m,+a,+f,+d,+c".into(),
1315
llvm_abiname: "ilp32d".into(),
1416
max_atomic_width: Some(32),
17+
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
1518
..base::linux_gnu::opts()
1619
},
1720
}

compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::spec::{base, CodeModel, Target, TargetOptions};
1+
use std::borrow::Cow;
2+
3+
use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
24

35
pub fn target() -> Target {
46
Target {
@@ -12,6 +14,7 @@ pub fn target() -> Target {
1214
features: "+m,+a,+f,+d,+c".into(),
1315
llvm_abiname: "ilp32d".into(),
1416
max_atomic_width: Some(32),
17+
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
1518
..base::linux_musl::opts()
1619
},
1720
}

compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::spec::{base, CodeModel, SanitizerSet, Target, TargetOptions};
1+
use std::borrow::Cow;
2+
3+
use crate::spec::{base, CodeModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions};
24

35
pub fn target() -> Target {
46
Target {
@@ -13,6 +15,7 @@ pub fn target() -> Target {
1315
llvm_abiname: "lp64d".into(),
1416
supported_sanitizers: SanitizerSet::ADDRESS,
1517
max_atomic_width: Some(64),
18+
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
1619
..base::android::opts()
1720
},
1821
}

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::spec::{base, CodeModel, Target, TargetOptions};
1+
use std::borrow::Cow;
2+
3+
use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
24

35
pub fn target() -> Target {
46
Target {
@@ -12,6 +14,7 @@ pub fn target() -> Target {
1214
features: "+m,+a,+f,+d,+c".into(),
1315
llvm_abiname: "lp64d".into(),
1416
max_atomic_width: Some(64),
17+
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
1518
..base::linux_gnu::opts()
1619
},
1720
}

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::spec::{base, CodeModel, Target, TargetOptions};
1+
use std::borrow::Cow;
2+
3+
use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
24

35
pub fn target() -> Target {
46
Target {
@@ -12,6 +14,7 @@ pub fn target() -> Target {
1214
features: "+m,+a,+f,+d,+c".into(),
1315
llvm_abiname: "lp64d".into(),
1416
max_atomic_width: Some(64),
17+
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
1518
..base::linux_musl::opts()
1619
},
1720
}

0 commit comments

Comments
 (0)