forked from pool/grub2
Accepting request 628181 from home:dimstar:Factory
Fix build with binutils 2.31 - Staging:C OBS-URL: https://build.opensuse.org/request/show/628181 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=310
This commit is contained in:
parent
14f0077de0
commit
6923065128
74
grub2-binutils2.31.patch
Normal file
74
grub2-binutils2.31.patch
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "H.J. Lu" <hjl.tools@gmail.com>
|
||||||
|
Date: Sat, 17 Feb 2018 06:47:28 -0800
|
||||||
|
Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
|
||||||
|
|
||||||
|
Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
|
||||||
|
|
||||||
|
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
|
||||||
|
|
||||||
|
x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
|
||||||
|
32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as
|
||||||
|
R_X86_64_PC32.
|
||||||
|
|
||||||
|
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
|
||||||
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||||||
|
---
|
||||||
|
grub-core/efiemu/i386/loadcore64.c | 1 +
|
||||||
|
grub-core/kern/x86_64/dl.c | 1 +
|
||||||
|
util/grub-mkimagexx.c | 1 +
|
||||||
|
util/grub-module-verifier.c | 1 +
|
||||||
|
4 files changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
|
||||||
|
index e49d0b6..18facf4 100644
|
||||||
|
--- a/grub-core/efiemu/i386/loadcore64.c
|
||||||
|
+++ b/grub-core/efiemu/i386/loadcore64.c
|
||||||
|
@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
|
||||||
|
break;
|
||||||
|
|
||||||
|
case R_X86_64_PC32:
|
||||||
|
+ case R_X86_64_PLT32:
|
||||||
|
err = grub_efiemu_write_value (addr,
|
||||||
|
*addr32 + rel->r_addend
|
||||||
|
+ sym.off
|
||||||
|
diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
|
||||||
|
index 4406906..3a73e6e 100644
|
||||||
|
--- a/grub-core/kern/x86_64/dl.c
|
||||||
|
+++ b/grub-core/kern/x86_64/dl.c
|
||||||
|
@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
|
||||||
|
break;
|
||||||
|
|
||||||
|
case R_X86_64_PC32:
|
||||||
|
+ case R_X86_64_PLT32:
|
||||||
|
{
|
||||||
|
grub_int64_t value;
|
||||||
|
value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
|
||||||
|
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
|
||||||
|
index a2bb054..39d7efb 100644
|
||||||
|
--- a/util/grub-mkimagexx.c
|
||||||
|
+++ b/util/grub-mkimagexx.c
|
||||||
|
@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
|
||||||
|
break;
|
||||||
|
|
||||||
|
case R_X86_64_PC32:
|
||||||
|
+ case R_X86_64_PLT32:
|
||||||
|
{
|
||||||
|
grub_uint32_t *t32 = (grub_uint32_t *) target;
|
||||||
|
*t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
|
||||||
|
diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
|
||||||
|
index 9179285..a79271f 100644
|
||||||
|
--- a/util/grub-module-verifier.c
|
||||||
|
+++ b/util/grub-module-verifier.c
|
||||||
|
@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
|
||||||
|
-1
|
||||||
|
}, (int[]){
|
||||||
|
R_X86_64_PC32,
|
||||||
|
+ R_X86_64_PLT32,
|
||||||
|
-1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
--
|
||||||
|
cgit v1.0-41-gc330
|
||||||
|
|
||||||
|
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 8 15:17:13 UTC 2018 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Add grub2-binutils2.31.patch: x86-64: Treat R_X86_64_PLT32 as
|
||||||
|
R_X86_64_PC32. Starting from binutils commit bd7ab16b x86-64
|
||||||
|
assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
|
||||||
|
32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32
|
||||||
|
as R_X86_64_PC32.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 6 09:02:45 UTC 2018 - josef.moellers@suse.com
|
Mon Aug 6 09:02:45 UTC 2018 - josef.moellers@suse.com
|
||||||
|
|
||||||
|
@ -219,6 +219,7 @@ Patch86: 0001-Fix-packed-not-aligned-error-on-GCC-8.patch
|
|||||||
Patch87: 0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
|
Patch87: 0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
|
||||||
Patch88: unix-exec-avoid-atexit-handlers-when-child-exits.patch
|
Patch88: unix-exec-avoid-atexit-handlers-when-child-exits.patch
|
||||||
Patch89: 0001-xfs-Accept-filesystem-with-sparse-inodes.patch
|
Patch89: 0001-xfs-Accept-filesystem-with-sparse-inodes.patch
|
||||||
|
Patch90: grub2-binutils2.31.patch
|
||||||
# Btrfs snapshot booting related patches
|
# Btrfs snapshot booting related patches
|
||||||
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
|
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
|
||||||
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
|
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
|
||||||
@ -512,6 +513,7 @@ swap partition while in resuming
|
|||||||
%patch87 -p1
|
%patch87 -p1
|
||||||
%patch88 -p1
|
%patch88 -p1
|
||||||
%patch89 -p1
|
%patch89 -p1
|
||||||
|
%patch90 -p1
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
%patch103 -p1
|
%patch103 -p1
|
||||||
|
Loading…
Reference in New Issue
Block a user