Skip to content

Set DT_PREINIT_ARRAY{,SZ} if .preinit_array is present #759

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
davidlattimore merged 2 commits into from
May 14, 2025
Merged

Set DT_PREINIT_ARRAY{,SZ} if .preinit_array is present #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d67744
Set DT_PREINIT_ARRAY{,SR} if .preinit_array is present
marxin May 14, 2025
0ed351f
Trigger CI
marxin May 14, 2025
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
10 changes: 10 additions & 0 deletions libwild/src/elf_writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3040,6 +3040,16 @@ const EPILOGUE_DYNAMIC_ENTRY_WRITERS: &[DynamicEntryWriter] = &[
|inputs| inputs.has_data_in_section(output_section_id::FINI_ARRAY),
|inputs| inputs.size_of_section(output_section_id::FINI_ARRAY),
),
DynamicEntryWriter::optional(
object::elf::DT_PREINIT_ARRAY,
|inputs| inputs.has_data_in_section(output_section_id::PREINIT_ARRAY),
|inputs| inputs.vma_of_section(output_section_id::PREINIT_ARRAY),
),
DynamicEntryWriter::optional(
object::elf::DT_PREINIT_ARRAYSZ,
|inputs| inputs.has_data_in_section(output_section_id::PREINIT_ARRAY),
|inputs| inputs.size_of_section(output_section_id::PREINIT_ARRAY),
),
DynamicEntryWriter::new(object::elf::DT_STRTAB, |inputs| {
inputs.vma_of_section(output_section_id::DYNSTR)
}),
Expand Down
3 changes: 2 additions & 1 deletion wild/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,8 @@ fn integration_test(
"dynamic-bss-only.c",
"shared-priority.c",
"shared.c",
"duplicate_strong_symbols.c"
"duplicate_strong_symbols.c",
"preinit-array.c"
)]
program_name: &'static str,
#[allow(unused_variables)] setup_symlink: (),
Expand Down
18 changes: 18 additions & 0 deletions wild/tests/sources/preinit-array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//#Object:preinit-array.s
//#LinkerDriver:gcc
//#DiffIgnore:segment.LOAD.RW.alignment
//#DiffIgnore:section.data
//#DiffIgnore:section.rodata
//#DiffIgnore:.dynamic.DT_PREINIT_ARRAY
//#Arch: x86_64
//#RequiresGlibc:true

int exit_code;

void preinit() {
exit_code = 42;
}

int main() {
return exit_code;
}
7 changes: 7 additions & 0 deletions wild/tests/sources/preinit-array.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.globl preinit

.section .preinit_array,"aw",@preinit_array
.p2align 3
.quad preinit

.section .note.GNU-stack,"",@progbits