[patch] Patch

0001-efi-stub-out-__grub_efi_api-when-GRUB_UTIL-is-define.patch (text/plain), 1.18 KB, created by Mike Gilbert on 2024-11-30 21:22:34 UTC

From 40c63fa872322f2ed4beb31e0acf740a8f923cb3 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <[e-mail]>
Date: Sat, 30 Nov 2024 16:07:52 -0500
Subject: [PATCH] efi: stub out __grub_efi_api when GRUB_UTIL is defined

When building utils for x32, ms_abi is not a valid attribute.

Bug: https://bugs.gentoo.org/945484
Signed-off-by: Mike Gilbert <[e-mail]>
---
 include/grub/efi/api.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index b686e8afe..8b70be5e7 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -590,6 +590,7 @@ typedef grub_efi_uintn_t grub_efi_status_t;
  * annotation. (This includes protocols implemented by GRUB that are installed
  * into the EFI protocol database.)
  */
+#if !defined(GRUB_UTIL)
 #if defined(__i386__)
 #define __grub_efi_api			__attribute__((regparm(0)))
 #elif defined(__x86_64__)
@@ -597,6 +598,9 @@ typedef grub_efi_uintn_t grub_efi_status_t;
 #else
 #define __grub_efi_api
 #endif
+#else /* defined(GRUB_UTIL) */
+#define __grub_efi_api
+#endif
 
 #define GRUB_EFI_ERROR_CODE(value)	\
   ((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value))
-- 
2.47.1