diff --git a/ipxe-fix-build.patch b/ipxe-fix-build.patch new file mode 100644 index 00000000..cced57f5 --- /dev/null +++ b/ipxe-fix-build.patch @@ -0,0 +1,21 @@ +Newer binutils (>= 2.31) will emit PLT32 relocs for call/jmp +instructions on x86_64 in some cases, instead of PC32 relocs +as before. This can only be done because on x86-64 the PLT +doesn't need any special setup, and in turn this means that +for post-processing/after-link purposes PLT32 and PC32 relocs +can be handled the same. elf2efi simply ignores all PC-relative +relocs (as the code is already fully final for them) and PLT32 +is one of them, so add it to the list. + +(Otherwise an "Unrecognized relocation type 4" error occurs +when building some of the EFI images for IPXE). +--- a/src/util/elf2efi.c.mm 2018-07-25 12:19:10.647661846 +0000 ++++ b/src/util/elf2efi.c 2018-07-25 13:18:18.609633494 +0000 +@@ -637,6 +637,7 @@ static void process_reloc ( struct elf_f + case ELF_MREL ( EM_ARM, R_ARM_THM_PC22 ) : + case ELF_MREL ( EM_ARM, R_ARM_THM_JUMP24 ) : + case ELF_MREL ( EM_X86_64, R_X86_64_PC32 ) : ++ case ELF_MREL ( EM_X86_64, R_X86_64_PLT32 ) : + case ELF_MREL ( EM_AARCH64, R_AARCH64_CALL26 ) : + case ELF_MREL ( EM_AARCH64, R_AARCH64_JUMP26 ) : + case ELF_MREL ( EM_AARCH64, R_AARCH64_ADR_PREL_LO21 ) : diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index cfbdbf7f..c7f0774c 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -5,6 +5,12 @@ Wed Jul 25 22:26:16 UTC 2018 - ldewey@suse.com * Patches added: 0067-seccomp-allow-sched_setscheduler-wi.patch +------------------------------------------------------------------- +Wed Jul 25 13:24:50 UTC 2018 - matz@suse.com + +- Add ipxe-fix-build.patch to not error out with + binutils >= 2.31 . + ------------------------------------------------------------------- Thu Jul 5 21:31:58 UTC 2018 - brogers@suse.com diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 5a75262e..7a84bd3d 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -213,6 +213,7 @@ Patch1101: seabios-switch-to-python3-as-needed.patch Patch1200: ipxe-stable-buildid.patch Patch1201: ipxe-use-gcc6-for-more-compact-code.patch Patch1202: ipxe-efi-guard-strncpy-with-gcc-warning-ignore-pragma.patch +Patch1203: ipxe-fix-build.patch # sgabios # PATCH-FIX-OPENSUSE sgabios-stable-buildid.patch brogers@suse.com -- reproducible builds @@ -951,6 +952,7 @@ pushd roms/ipxe %patch1201 -p1 %endif %patch1202 -p1 +%patch1203 -p1 popd pushd roms/sgabios diff --git a/qemu.changes b/qemu.changes index cfbdbf7f..c7f0774c 100644 --- a/qemu.changes +++ b/qemu.changes @@ -5,6 +5,12 @@ Wed Jul 25 22:26:16 UTC 2018 - ldewey@suse.com * Patches added: 0067-seccomp-allow-sched_setscheduler-wi.patch +------------------------------------------------------------------- +Wed Jul 25 13:24:50 UTC 2018 - matz@suse.com + +- Add ipxe-fix-build.patch to not error out with + binutils >= 2.31 . + ------------------------------------------------------------------- Thu Jul 5 21:31:58 UTC 2018 - brogers@suse.com diff --git a/qemu.spec b/qemu.spec index df14be28..a4da5661 100644 --- a/qemu.spec +++ b/qemu.spec @@ -213,6 +213,7 @@ Patch1101: seabios-switch-to-python3-as-needed.patch Patch1200: ipxe-stable-buildid.patch Patch1201: ipxe-use-gcc6-for-more-compact-code.patch Patch1202: ipxe-efi-guard-strncpy-with-gcc-warning-ignore-pragma.patch +Patch1203: ipxe-fix-build.patch # sgabios # PATCH-FIX-OPENSUSE sgabios-stable-buildid.patch brogers@suse.com -- reproducible builds @@ -951,6 +952,7 @@ pushd roms/ipxe %patch1201 -p1 %endif %patch1202 -p1 +%patch1203 -p1 popd pushd roms/sgabios diff --git a/qemu.spec.in b/qemu.spec.in index 35ae9ce5..21a59a93 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -148,6 +148,7 @@ Patch1101: seabios-switch-to-python3-as-needed.patch Patch1200: ipxe-stable-buildid.patch Patch1201: ipxe-use-gcc6-for-more-compact-code.patch Patch1202: ipxe-efi-guard-strncpy-with-gcc-warning-ignore-pragma.patch +Patch1203: ipxe-fix-build.patch # sgabios # PATCH-FIX-OPENSUSE sgabios-stable-buildid.patch brogers@suse.com -- reproducible builds @@ -820,6 +821,7 @@ pushd roms/ipxe %patch1201 -p1 %endif %patch1202 -p1 +%patch1203 -p1 popd pushd roms/sgabios