Merge pull request #21595 from alexrp/objcopy-seg-paddr

`objcopy`: Use `p_paddr` from `PT_LOAD` even if zero.
This commit is contained in:
Alex Rønne Petersen 2024-10-05 05:21:48 +02:00 committed by GitHub
commit e6fd01a949
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -456,7 +456,7 @@ const BinaryElfOutput = struct {
if (phdr.p_type == elf.PT_LOAD) {
const newSegment = try allocator.create(BinaryElfSegment);
newSegment.physicalAddress = if (phdr.p_paddr != 0) phdr.p_paddr else phdr.p_vaddr;
newSegment.physicalAddress = phdr.p_paddr;
newSegment.virtualAddress = phdr.p_vaddr;
newSegment.fileSize = @intCast(phdr.p_filesz);
newSegment.elfOffset = phdr.p_offset;