Merge branch 'master' of ssh://people.ipfire.org/pub/git/ipfire-2.x

[people/stevee/ipfire-2.x.git] / src / patches / ipxe-handle-R_X86_64_PLT32.patch

diff --git a/src/patches/ipxe-handle-R_X86_64_PLT32.patch b/src/patches/ipxe-handle-R_X86_64_PLT32.patch
deleted file mode 100644 (file)
index ef2d434..0000000
--- a/src/patches/ipxe-handle-R_X86_64_PLT32.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5dce2d454b2829431e0484ac0f993b7a2759e0df Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Sat, 25 Aug 2018 13:53:08 +0200
-Subject: [PATCH] [build] handle R_X86_64_PLT32 from binutils 2.31
-
-Starting from binutils 2.31.0 (commit bd7ab16b) x86-64 assembler
-generates R_X86_64_PLT32 instead of R_X86_64_PC32.
----
- src/util/elf2efi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
-index 6718df777..2c5b9df8a 100644
---- a/src/util/elf2efi.c
-+++ b/src/util/elf2efi.c
-@@ -636,6 +636,7 @@ static void process_reloc ( struct elf_file *elf, const Elf_Shdr *shdr,
-               case ELF_MREL ( EM_ARM, R_ARM_THM_JUMP24 ) :
-               case ELF_MREL ( EM_ARM, R_ARM_V4BX ):
-               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 ) :