Skip to content

Enable split_debuginfo=packed/unpacked for RISC-V #155135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kxxt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enable split_debuginfo=packed/unpacked for RISC-V #155135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
use std::borrow::Cow;

use crate::spec::{
Arch, CodeModel, LlvmAbi, SplitDebuginfo, Target, TargetMetadata, TargetOptions, base,
};
use crate::spec::{Arch, CodeModel, LlvmAbi, Target, TargetMetadata, TargetOptions, base};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -22,7 +18,6 @@ pub(crate) fn target() -> Target {
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
llvm_abiname: LlvmAbi::Ilp32d,
max_atomic_width: Some(32),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_gnu::opts()
},
}
Expand Down
7 changes: 1 addition & 6 deletions compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
use std::borrow::Cow;

use crate::spec::{
Arch, CodeModel, LlvmAbi, SplitDebuginfo, Target, TargetMetadata, TargetOptions, base,
};
use crate::spec::{Arch, CodeModel, LlvmAbi, Target, TargetMetadata, TargetOptions, base};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -22,7 +18,6 @@ pub(crate) fn target() -> Target {
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
llvm_abiname: LlvmAbi::Ilp32d,
max_atomic_width: Some(32),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_musl::opts()
},
}
Expand Down
6 changes: 1 addition & 5 deletions compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
use std::borrow::Cow;

use crate::spec::{
Arch, CodeModel, LlvmAbi, SanitizerSet, SplitDebuginfo, Target, TargetMetadata, TargetOptions,
base,
Arch, CodeModel, LlvmAbi, SanitizerSet, Target, TargetMetadata, TargetOptions, base,
};

pub(crate) fn target() -> Target {
Expand All @@ -24,7 +21,6 @@ pub(crate) fn target() -> Target {
llvm_abiname: LlvmAbi::Lp64d,
supported_sanitizers: SanitizerSet::ADDRESS,
max_atomic_width: Some(64),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::android::opts()
},
}
Expand Down
7 changes: 1 addition & 6 deletions compiler/rustc_target/src/spec/targets/riscv64a23_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
use std::borrow::Cow;

use crate::spec::{
Arch, CodeModel, LlvmAbi, SplitDebuginfo, Target, TargetMetadata, TargetOptions, base,
};
use crate::spec::{Arch, CodeModel, LlvmAbi, Target, TargetMetadata, TargetOptions, base};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -22,7 +18,6 @@ pub(crate) fn target() -> Target {
features: "+rva23u64".into(),
llvm_abiname: LlvmAbi::Lp64d,
max_atomic_width: Some(64),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_gnu::opts()
},
}
Expand Down
7 changes: 1 addition & 6 deletions compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
use std::borrow::Cow;

use crate::spec::{
Arch, CodeModel, LlvmAbi, SplitDebuginfo, Target, TargetMetadata, TargetOptions, base,
};
use crate::spec::{Arch, CodeModel, LlvmAbi, Target, TargetMetadata, TargetOptions, base};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -22,7 +18,6 @@ pub(crate) fn target() -> Target {
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
llvm_abiname: LlvmAbi::Lp64d,
max_atomic_width: Some(64),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_gnu::opts()
},
}
Expand Down
7 changes: 1 addition & 6 deletions compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
use std::borrow::Cow;

use crate::spec::{
Arch, CodeModel, LlvmAbi, SplitDebuginfo, Target, TargetMetadata, TargetOptions, base,
};
use crate::spec::{Arch, CodeModel, LlvmAbi, Target, TargetMetadata, TargetOptions, base};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -22,7 +18,6 @@ pub(crate) fn target() -> Target {
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
llvm_abiname: LlvmAbi::Lp64d,
max_atomic_width: Some(64),
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..base::linux_musl::opts()
},
}
Expand Down
7 changes: 0 additions & 7 deletions tests/run-make/split-debuginfo/rmake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@
// NOTE: this is a host test
//@ ignore-cross-compile

// NOTE: this seems to be a host test, and testing on host `riscv64-gc-unknown-linux-gnu` reveals
// that this test is failing because of [MC: "error: A dwo section may not contain relocations" when
// building with fission + RISCV64 #56642](https://github.com/llvm/llvm-project/issues/56642). This
// test is ignored for now to unblock efforts to bring riscv64 targets to be exercised in CI, cf.
// [Enable riscv64gc-gnu testing #126641](https://github.com/rust-lang/rust/pull/126641).
//@ ignore-riscv64 (https://github.com/llvm/llvm-project/issues/56642)

// FIXME(#135531): the `Makefile` version practically didn't test `-C split-debuginfo` on Windows
// at all, and lumped windows-msvc and windows-gnu together at that.
//@ ignore-windows-gnu
Expand Down
1 change: 0 additions & 1 deletion tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ build-pass
//@ only-linux
//@ ignore-riscv64 On this platform `-Csplit-debuginfo=unpacked` is unstable, see #120518
//
//@ compile-flags: -g --emit=llvm-ir -Csplit-debuginfo=unpacked
//
Expand Down
Loading