Skip to content

Commit 1e5acc0

Browse files
committed
Merge branch 'x64-missing-relocation-types' into chimps-at-sea
2 parents 674e71e + 7f3b831 commit 1e5acc0

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

objdiff-core/src/arch/x86.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ impl ArchX86 {
8686
| pe::IMAGE_REL_AMD64_REL32_2
8787
| pe::IMAGE_REL_AMD64_REL32_3
8888
| pe::IMAGE_REL_AMD64_REL32_4
89-
| pe::IMAGE_REL_AMD64_REL32_5 => Some(4),
89+
| pe::IMAGE_REL_AMD64_REL32_5
90+
| pe::IMAGE_REL_AMD64_SECREL => Some(4),
9091
pe::IMAGE_REL_AMD64_ADDR64 => Some(8),
9192
_ => None,
9293
},
@@ -313,7 +314,8 @@ impl Arch for ArchX86 {
313314
| pe::IMAGE_REL_AMD64_REL32_2
314315
| pe::IMAGE_REL_AMD64_REL32_3
315316
| pe::IMAGE_REL_AMD64_REL32_4
316-
| pe::IMAGE_REL_AMD64_REL32_5,
317+
| pe::IMAGE_REL_AMD64_REL32_5
318+
| pe::IMAGE_REL_AMD64_SECREL,
317319
}
318320
| object::RelocationFlags::Elf { r_type: elf::R_X86_64_32 | elf::R_X86_64_PC32 } => {
319321
let data =
@@ -361,6 +363,7 @@ impl Arch for ArchX86 {
361363
pe::IMAGE_REL_AMD64_REL32_3 => Some("IMAGE_REL_AMD64_REL32_3"),
362364
pe::IMAGE_REL_AMD64_REL32_4 => Some("IMAGE_REL_AMD64_REL32_4"),
363365
pe::IMAGE_REL_AMD64_REL32_5 => Some("IMAGE_REL_AMD64_REL32_5"),
366+
pe::IMAGE_REL_AMD64_SECREL => Some("IMAGE_REL_AMD64_SECREL"),
364367
_ => None,
365368
},
366369
_ => None,

0 commit comments

Comments
 (0)