encounter
/
decomp-toolkit
mirror of https://github.com/encounter/decomp-toolkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix .note.split warnings for older mwld versions 

Prior to mwld GC 3.0a3, the linker doesn't support ELF .note sections
properly. With GC 2.7, it crashes if the section type is SHT_NOTE.
Use the same section type as .mwcats.* so the linker ignores it.
This commit is contained in:
Luke Street 2024-09-04 19:56:22 -06:00
parent a112eb1829
commit d9817f63d5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/elf.rs
View File

@ -12,7 +12,7 @@ use indexmap::IndexMap;
use objdiff_core::obj::split_meta::{SplitMeta, SHT_SPLITMETA, SPLITMETA_SECTION}; use objdiff_core::obj::split_meta::{SplitMeta, SHT_SPLITMETA, SPLITMETA_SECTION};
use object::{ use object::{
elf, elf,
elf::{SHF_ALLOC, SHF_EXECINSTR, SHF_WRITE, SHT_NOBITS, SHT_PROGBITS}, elf::{SHF_ALLOC, SHF_EXECINSTR, SHF_WRITE, SHT_LOUSER, SHT_NOBITS, SHT_PROGBITS},
write::{ write::{
elf::{ProgramHeader, Rel, SectionHeader, SectionIndex, SymbolIndex, Writer}, elf::{ProgramHeader, Rel, SectionHeader, SectionIndex, SymbolIndex, Writer},
StringId, StringId,
@ -34,6 +34,8 @@ use crate::{
}, },
}; };
pub const SHT_MWCATS: u32 = SHT_LOUSER + 0x4A2A82C2;
enum BoundaryState { enum BoundaryState {
/// Looking for a file symbol, any section symbols are queued /// Looking for a file symbol, any section symbols are queued
LookForFile(Vec<(u64, String)>), LookForFile(Vec<(u64, String)>),
@ -456,7 +458,7 @@ pub fn write_elf(obj: &ObjInfo, export_all: bool) -> Result<Vec<u8>> {
}; };
// Generate .note.split section // Generate .note.split section
let mut split_meta = if let Some(metadata) = &obj.split_meta { let mut split_meta = if let (Some(metadata), Some(_)) = (&obj.split_meta, &obj.mw_comment) {
// Reserve section // Reserve section
let name = writer.add_section_name(SPLITMETA_SECTION.as_bytes()); let name = writer.add_section_name(SPLITMETA_SECTION.as_bytes());
let index = writer.reserve_section_index(); let index = writer.reserve_section_index();
@ -825,9 +827,16 @@ pub fn write_elf(obj: &ObjInfo, export_all: bool) -> Result<Vec<u8>> {
// Write .note.split section header // Write .note.split section header
if let Some((metadata, idx)) = &split_meta { if let Some((metadata, idx)) = &split_meta {
let out_section = &out_sections[*idx]; let out_section = &out_sections[*idx];
let mut sh_type = SHT_SPLITMETA;
if matches!(&obj.mw_comment, Some(comment) if comment.version < 14) {
// Prior to mwld GC 3.0a3, the linker doesn't support ELF .note sections
// properly. With GC 2.7, it crashes if the section type is SHT_NOTE.
// Use the same section type as .mwcats.* so the linker ignores it.
sh_type = SHT_MWCATS;
}
writer.write_section_header(&SectionHeader { writer.write_section_header(&SectionHeader {
name: Some(out_section.name), name: Some(out_section.name),
sh_type: SHT_SPLITMETA, sh_type,
sh_flags: 0, sh_flags: 0,
sh_addr: 0, sh_addr: 0,
sh_offset: out_section.offset as u64, sh_offset: out_section.offset as u64,