File more-aarch64.patch of Package gnu-efi

Overview Repositories Revisions Requests Users Attributes Meta

File more-aarch64.patch of Package gnu-efi (Revision 52604154e6c040853cb9a658976d017c)

Currently displaying revision 52604154e6c040853cb9a658976d017c , Show latest

From a90c2f16fa992b58524fcb0246b09a9806814259 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Thu, 2 Feb 2023 11:27:36 +0000
Subject: [PATCH 1/3] Make.defaults: Enable objcopy on aarch64

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 Make.defaults | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Make.defaults b/Make.defaults
index 47ed361..b89ae59 100755
--- a/Make.defaults
+++ b/Make.defaults
@@ -139,7 +139,6 @@ endif
 # Set HAVE_EFI_OBJCOPY if objcopy understands --target efi-[app|bsdrv|rtdrv],
 # otherwise we need to compose the PE/COFF header using the assembler
 #
-ifneq ($(ARCH),aarch64)
 ifneq ($(ARCH),arm)
 ifneq ($(ARCH),mips64el)
 ifneq ($(ARCH),riscv64)
@@ -147,7 +146,6 @@ export HAVE_EFI_OBJCOPY=y
 endif
 endif
 endif
-endif
 
 ifneq ($(ARCH),arm)
 export LIBGCC=$(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
From 1e0055069400179726858e472591ca5ac334120b Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Thu, 2 Feb 2023 11:43:19 +0000
Subject: [PATCH 2/3] aarch64 lds: Force data segment align to 64KiB

Required by UEFI 2.10 AArch64 specification
https://uefi.org/specs/UEFI/2.10/02_Overview.html#aarch64-platforms

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 gnuefi/elf_aarch64_efi.lds | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnuefi/elf_aarch64_efi.lds b/gnuefi/elf_aarch64_efi.lds
index 1774d76..845938c 100644
--- a/gnuefi/elf_aarch64_efi.lds
+++ b/gnuefi/elf_aarch64_efi.lds
@@ -29,7 +29,7 @@ SECTIONS
   {
    *(.reloc)
   }
-  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  . = ALIGN(65536);
   .dynamic  : { *(.dynamic) }
   .data :
   {
@@ -69,7 +69,6 @@ SECTIONS
   .dynstr   : { *(.dynstr) }
   . = ALIGN(4096);
   .note.gnu.build-id : { *(.note.gnu.build-id) }
-  . = DATA_SEGMENT_END (.);
   .ignored.reloc :
   {
     *(.rela.reloc)
From 7c00cf9d9119bb0eb15ec44967b6d4ec0e46d9d7 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Tue, 7 Feb 2023 16:25:58 +0000
Subject: [PATCH 3/3] Make.defaults: Force 4K page size on ARM64

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 Make.defaults | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Make.defaults b/Make.defaults
index b89ae59..88e18a2 100755
--- a/Make.defaults
+++ b/Make.defaults
@@ -155,6 +155,11 @@ ifeq ($(ARCH),arm)
 CFLAGS += -marm
 endif
 
+ifeq ($(ARCH),aarch64)
+LDFLAGS += -z common-page-size=4096
+LDFLAGS += -z max-page-size=4096
+endif
+
 # Generic compilation flags
 INCDIR  += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
            -I$(TOPDIR)/inc/protocol
From 89d55b364d5f7fb7614e19646e06230ea90dc9c1 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Tue, 7 Feb 2023 21:48:27 +0000
Subject: [PATCH 09/16] ARM32/x86_64 lds: Force data segment align to 4KiB

Some newer versions of binutils can set invalid COMMONPAGESIZE
and MAXPAGESIZE values on these architectures

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 gnuefi/elf_arm_efi.lds    | 3 +--
 gnuefi/elf_x86_64_efi.lds | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnuefi/elf_arm_efi.lds b/gnuefi/elf_arm_efi.lds
index 2edc6a8..0c58831 100644
--- a/gnuefi/elf_arm_efi.lds
+++ b/gnuefi/elf_arm_efi.lds
@@ -15,7 +15,7 @@ SECTIONS
   }
   _etext = .;
   _text_size = . - _text;
-  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  . = ALIGN(4096);
   .dynamic  : { *(.dynamic) }
   .data :
   {
@@ -54,7 +54,6 @@ SECTIONS
   .dynstr   : { *(.dynstr) }
   . = ALIGN(4096);
   .note.gnu.build-id : { *(.note.gnu.build-id) }
-  . = DATA_SEGMENT_END (.);
   /DISCARD/ :
   {
     *(.rel.reloc)
diff --git a/gnuefi/elf_x86_64_efi.lds b/gnuefi/elf_x86_64_efi.lds
index e3d32d1..7be5902 100644
--- a/gnuefi/elf_x86_64_efi.lds
+++ b/gnuefi/elf_x86_64_efi.lds
@@ -30,7 +30,7 @@ SECTIONS
   {
    *(.reloc)
   }
-  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  . = ALIGN(4096);
   .data :
   {
    _data = .;
@@ -66,7 +66,6 @@ SECTIONS
   . = ALIGN(4096);
   .dynstr   : { *(.dynstr) }
   . = ALIGN(4096);
-  . = DATA_SEGMENT_END (.);
   .ignored.reloc :
   {
     *(.rela.reloc)
-- 
2.31.1

Places

File more-aarch64.patch of Package gnu-efi (Revision 52604154e6c040853cb9a658976d017c)

Places