openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File 44.patch of Package fwupd-efi2 (Revision 21857b0f936671b685b80b811e664f13)

Currently displaying revision 21857b0f936671b685b80b811e664f13 , Show latest

From 05f01dae2576a517e8e6072648987df1e94ee7a6 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Thu, 6 Jul 2023 19:02:30 +0100
Subject: [PATCH 1/2] ARM64: Align data section to 64K

This got lost during a merge, it's part of the 4K page only
UEFI 2.10 fixes

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

diff --git a/efi/lds/elf_aarch64_efi.lds b/efi/lds/elf_aarch64_efi.lds
index e7c2fbc..866c837 100644
--- a/efi/lds/elf_aarch64_efi.lds
+++ b/efi/lds/elf_aarch64_efi.lds
@@ -28,7 +28,7 @@ SECTIONS
   } =0
   _reloc_vsize = _evreloc - _reloc;
   _reloc_size = _ereloc - _reloc;
-  . = ALIGN(4096);
+  . = ALIGN(65536);
   _data = .;
   .dynamic  : { *(.dynamic) }
   . = ALIGN(4096);

From eb0040bcecceabcd6c70008f8189a0709d17d195 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Thu, 6 Jul 2023 19:06:41 +0100
Subject: [PATCH 2/2] ARM32: Only use 4K pages

Turns out some linkers have set page size to 64K on ARM32 aswell
so apply the same fix as ARM64

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 efi/lds/elf_arm_efi.lds | 2 +-
 efi/meson.build         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/efi/lds/elf_arm_efi.lds b/efi/lds/elf_arm_efi.lds
index 71c8c53..1f7f708 100644
--- a/efi/lds/elf_arm_efi.lds
+++ b/efi/lds/elf_arm_efi.lds
@@ -27,7 +27,7 @@ SECTIONS
   } =0
   _reloc_vsize = _evreloc - _reloc;
   _reloc_size = _ereloc - _reloc;
-  . = ALIGN(4096);
+  . = ALIGN(65536);
   _data = .;
   .dynamic  : { *(.dynamic) }
   . = ALIGN(4096);
diff --git a/efi/meson.build b/efi/meson.build
index 9c8296a..c83936e 100644
--- a/efi/meson.build
+++ b/efi/meson.build
@@ -192,7 +192,7 @@ efi_ldflags = ['-T',
                '-L', efi_libdir,
                join_paths(efi_crtdir, arch_crt)]
 
-if host_cpu == 'aarch64'
+if host_cpu == 'aarch64' or host_cpu == 'arm'
 # Don't use 64KiB pages
   efi_ldflags += ['-z', 'common-page-size=4096']
   efi_ldflags += ['-z', 'max-page-size=4096']

From e79565d8d209f79bdb460faa2ebfe11e127e7777 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Tue, 22 Aug 2023 13:48:02 +0100
Subject: [PATCH] meson: check compiler for constant merge argument

Clang doesn't support -fno-merge-constants although both support
-fno-merge-all-constants

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 efi/meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/efi/meson.build b/efi/meson.build
index c83936e..46122e0 100644
--- a/efi/meson.build
+++ b/efi/meson.build
@@ -156,7 +156,7 @@ compile_args = ['-Og',
                 '-fno-strict-aliasing',
                 '-fno-stack-protector',
                 '-fno-stack-check',
-                '-fno-merge-constants',
+                '-fno-merge-all-constants',
                 '-Wsign-compare',
                 '-Wno-missing-field-initializers',
                 '-Wno-address-of-packed-member',
@@ -165,6 +165,8 @@ compile_args = ['-Og',
                 '-I.',
                 '-isystem', efi_incdir,
                 '-isystem', join_paths(efi_incdir, gnu_efi_path_arch)]
+# clang only has fno-merge-all-constants
+compile_args += cc.first_supported_argument('-fno-merge-constants')
 if get_option('werror')
     compile_args += '-Werror'
 endif
 
 
From 41c3a10323a3138dec12d04a3dbeedde97cb920a Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Tue, 22 Aug 2023 13:54:01 +0100
Subject: [PATCH] Fix no optimize attribute on clang

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 efi/fwupdate.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/efi/fwupdate.c b/efi/fwupdate.c
index ef51775..4853c48 100644
--- a/efi/fwupdate.c
+++ b/efi/fwupdate.c
@@ -14,6 +14,14 @@
 #include "fwup-debug.h"
 #include "fwup-efi.h"
 
+#ifndef EFI_OPTNONE
+#ifdef __clang__
+#define EFI_OPTNONE __attribute__((optnone))
+#else
+#define EFI_OPTNONE __attribute__((__optimize__("0")))
+#endif
+#endif
+
 #define UNUSED __attribute__((__unused__))
 #define GNVN_BUF_SIZE			1024
 #define FWUP_NUM_CAPSULE_UPDATES_MAX	128
@@ -502,7 +510,7 @@ EFI_GUID SHIM_LOCK_GUID =
  {0x605dab50,0xe046,0x4300,{0xab,0xb6,0x3d,0xd8,0x10,0xdd,0x8b,0x23}};
 
 static VOID
-__attribute__((__optimize__("0")))
+EFI_OPTNONE
 fwup_debug_hook(VOID)
 {
 	EFI_GUID guid = SHIM_LOCK_GUID;

Places

File 44.patch of Package fwupd-efi2 (Revision 21857b0f936671b685b80b811e664f13)

Places