From Alex von Gluck IV <kallisti5@xxxxxxxxxxx>:
Alex von Gluck IV has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/2174 ;)
Change subject: efi/types: Only set ms_abi on x86
......................................................................
efi/types: Only set ms_abi on x86
* Upstreamed to Fuchsia via:
https://fuchsia-review.googlesource.com/c/fuchsia/+/358320
Change-Id: I3232cc1a5bf6194d5f2fa82f13668ca089faca92
---
M headers/private/kernel/platform/efi/types.h
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/74/2174/1
diff --git a/headers/private/kernel/platform/efi/types.h
b/headers/private/kernel/platform/efi/types.h
index 3ccb671..0295e7f 100644
--- a/headers/private/kernel/platform/efi/types.h
+++ b/headers/private/kernel/platform/efi/types.h
@@ -7,7 +7,12 @@
#include <stddef.h>
#include <stdint.h>
+// 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)
--
To view, visit https://review.haiku-os.org/c/haiku/+/2174
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I3232cc1a5bf6194d5f2fa82f13668ca089faca92
Gerrit-Change-Number: 2174
Gerrit-PatchSet: 1
Gerrit-Owner: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Gerrit-MessageType: newchange
