language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

reorder section writing to be correct

Browse source
This commit is contained in:
Folkert 2022-08-21 14:21:02 +02:00
parent 9efa02c569
commit 08e4abbf0a
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/linker/src/generate_dylib.rs
View file

@ -461,7 +461,7 @@ fn copy_file(in_data: &[u8], custom_names: &[String]) -> Result<Vec<u8>, Box<dyn
let dynamic_addr = in_section.sh_addr(endian); let dynamic_addr = in_section.sh_addr(endian);
writer.reserve_dynamic(out_dynamic.len()); writer.reserve_dynamic(out_dynamic.len());
// strtab and shstrtab is ignored // symtab, strtab and shstrtab is ignored because they are not ALLOC
// Reserve non-alloc sections at any offset. // Reserve non-alloc sections at any offset.
for (i, in_section) in in_sections.iter().enumerate() { for (i, in_section) in in_sections.iter().enumerate() {
@ -629,11 +629,6 @@ fn copy_file(in_data: &[u8], custom_names: &[String]) -> Result<Vec<u8>, Box<dyn
writer.write_dynstr_section_header(dynstr_addr); writer.write_dynstr_section_header(dynstr_addr);
writer.write_symtab_section_header(num_local);
writer.write_strtab_section_header();
writer.write_shstrtab_section_header();
{ {
let in_section = &sections.eh_frame.section; let in_section = &sections.eh_frame.section;
let out_section = &out_sections[5]; // 5 is a random choice let out_section = &out_sections[5]; // 5 is a random choice
@ -659,6 +654,11 @@ fn copy_file(in_data: &[u8], custom_names: &[String]) -> Result<Vec<u8>, Box<dyn
writer.write_dynamic_section_header(dynamic_addr); writer.write_dynamic_section_header(dynamic_addr);
writer.write_symtab_section_header(num_local);
writer.write_strtab_section_header();
writer.write_shstrtab_section_header();
debug_assert_eq!(writer.reserved_len(), writer.len()); debug_assert_eq!(writer.reserved_len(), writer.len());
Ok(out_data) Ok(out_data)