Skip to content

RISC-V: add RISCV_ATTRIBUTE program segment #1166

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

Merged
marxin merged 1 commit into from
Oct 7, 2025
Merged

RISC-V: add RISCV_ATTRIBUTE program segment #1166

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
26 changes: 15 additions & 11 deletions libwild/src/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,18 +2062,22 @@ fn compute_segment_layout(
output_sections.section_debug(section_id)
);
} else {
// All segments should only cover sections that are allocated and have a non-zero address.
ensure!(
section_layout.mem_offset != 0 || merge_target == FILE_HEADER,
"Missing memory offset for section {} present in a program segment.",
output_sections.section_debug(section_id),
);
ensure!(
section_flags.contains(shf::ALLOC),
"Missing SHF_ALLOC section flag for section {} present in a program \
// RISCV_ATTRIBUTES segment is kind of special as it maps a section that is non-ALLOC.
if section_id == output_section_id::RISCV_ATTRIBUTES {
} else {
// All segments should only cover sections that are allocated and have a non-zero address.
ensure!(
section_layout.mem_offset != 0 || merge_target == FILE_HEADER,
"Missing memory offset for section {} present in a program segment.",
output_sections.section_debug(section_id),
);
ensure!(
section_flags.contains(shf::ALLOC),
"Missing SHF_ALLOC section flag for section {} present in a program \
segment.",
output_sections.section_debug(section_id)
);
output_sections.section_debug(section_id)
);
}
for opt_rec in &mut active_segments {
let Some(rec) = opt_rec.as_mut() else {
continue;
Expand Down
1 change: 1 addition & 0 deletions libwild/src/output_section_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ const SECTION_DEFINITIONS: [BuiltInSectionDetails; NUM_BUILT_IN_SECTIONS] = [
BuiltInSectionDetails {
kind: SectionKind::Primary(SectionName(RISCV_ATTRIBUTES_SECTION_NAME)),
ty: sht::RISCV_ATTRIBUTES,
target_segment_type: Some(pt::RISCV_ATTRIBUTES),
..DEFAULT_DEFS
},
// Start of regular sections
Expand Down
4 changes: 4 additions & 0 deletions libwild/src/program_segments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ pub(crate) const PROGRAM_SEGMENT_DEFS: &[ProgramSegmentDef] = &[
segment_type: pt::GNU_RELRO,
segment_flags: pf::READABLE,
},
ProgramSegmentDef {
segment_type: pt::RISCV_ATTRIBUTES,
segment_flags: pf::READABLE,
},
];

pub(crate) const STACK_SEGMENT_DEF: ProgramSegmentDef = ProgramSegmentDef {
Expand Down
3 changes: 1 addition & 2 deletions linker-diff/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,7 @@ impl Config {
"segment.PT_GNU_STACK.*",
"segment.PT_GNU_PROPERTY.*",
"segment.PT_GNU_SFRAME.*",
// TODO: RISC-v
"segment.SHT_RISCV_ATTRIBUTES.*",
// TODO: RISC-V
"segment.LOAD.RW.alignment",
]
.into_iter()
Expand Down
2 changes: 2 additions & 0 deletions linker-utils/src/elf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,8 @@ pub mod pt {
pub const DYNAMIC: SegmentType = SegmentType::from_u32(object::elf::PT_DYNAMIC);
pub const GNU_RELRO: SegmentType = SegmentType::from_u32(object::elf::PT_GNU_RELRO);
pub const GNU_STACK: SegmentType = SegmentType::from_u32(object::elf::PT_GNU_STACK);
// TODO: add constant
pub const RISCV_ATTRIBUTES: SegmentType = SegmentType::from_u32(0x70000003);
}

#[derive(Clone, Copy, PartialEq, Eq)]
Expand Down
1 change: 1 addition & 0 deletions wild/tests/sources/linker-script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
//#ExpectSym:start_aaa bar 8
//#ExpectSym:end_bar bar 12
//#DiffIgnore:section.riscv.attributes
//#DiffIgnore:segment.SHT_RISCV_ATTRIBUTES.*

static int foo1 __attribute__((used, section(".data.foo"))) = 0x01;

Expand Down