From e53e22439c95a901967011ea890a43515a6207c4 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 29 Jan 2020 11:08:34 -0600 Subject: [PATCH] efi/types: Only set ms_abi on x86 * Upstreamed to Fuchsia via: https://fuchsia-review.googlesource.com/c/fuchsia/+/358320 Change-Id: I3232cc1a5bf6194d5f2fa82f13668ca089faca92 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2174 Reviewed-by: waddlesplash --- headers/private/kernel/platform/efi/types.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/headers/private/kernel/platform/efi/types.h b/headers/private/kernel/platform/efi/types.h index 3ccb671535..0295e7fbc6 100644 --- a/headers/private/kernel/platform/efi/types.h +++ b/headers/private/kernel/platform/efi/types.h @@ -7,7 +7,12 @@ #include #include +// EFI on x86 uses the Microsoft ABI which is not the default for gcc +#if defined(__x86_64__) || defined(__x86__) #define EFIAPI __attribute__((ms_abi)) +#else +#define EFIAPI +#endif #define EFI_ERROR_MASK 0x8000000000000000 #define EFI_ERR(x) (EFI_ERROR_MASK | x)