diff options
| author | Roger Pau Monné <royger@FreeBSD.org> | 2021-02-17 00:03:33 +0800 |
|---|---|---|
| committer | Roger Pau Monné <royger@FreeBSD.org> | 2021-02-17 00:03:33 +0800 |
| commit | 80a96d377f8d48b45ebfb41fa21fdce29cb244a5 (patch) | |
| tree | b7c9d470c4be3275ff0673fd59fded9a00e621e4 /emulators/xen-kernel | |
| parent | f5019a6d1615d045844464dd39205cd120d6e80a (diff) | |
| download | freebsd-ports-gnome-80a96d377f8d48b45ebfb41fa21fdce29cb244a5.tar.gz freebsd-ports-gnome-80a96d377f8d48b45ebfb41fa21fdce29cb244a5.tar.zst freebsd-ports-gnome-80a96d377f8d48b45ebfb41fa21fdce29cb244a5.zip | |
emulators/xen-kernel: fix EFI calling convention
Xen builds using clang where not using the correct calling convention
for EFI services, backport an upstream patch to fix it.
Approved by: bapt (implicit)
Diffstat (limited to 'emulators/xen-kernel')
| -rw-r--r-- | emulators/xen-kernel/Makefile | 5 | ||||
| -rw-r--r-- | emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch | 38 |
2 files changed, 42 insertions, 1 deletions
diff --git a/emulators/xen-kernel/Makefile b/emulators/xen-kernel/Makefile index 0e47261e8de5..2f31dbc4a10e 100644 --- a/emulators/xen-kernel/Makefile +++ b/emulators/xen-kernel/Makefile @@ -2,7 +2,7 @@ PORTNAME= xen PORTVERSION= 4.14.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ PKGNAMESUFFIX= -kernel @@ -28,6 +28,9 @@ PLIST_FILES= /boot/xen \ # Propagate module command line passed by the loader. EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-pvh-pass-module-command-line-to-dom0.patch:-p1 +# Fix EFI BS call ABI. +EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch:-p1 + .include <bsd.port.options.mk> .if ${OPSYS} != FreeBSD diff --git a/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch b/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch new file mode 100644 index 000000000000..81838d32e374 --- /dev/null +++ b/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch @@ -0,0 +1,38 @@ +From 92f5ffa58d188c9f9a9f1bcdccb6d6348d9df612 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com> +Date: Thu, 4 Feb 2021 14:02:32 +0100 +Subject: [PATCH] x86/efi: enable MS ABI attribute on clang +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Or else the EFI service calls will use the wrong calling convention. + +The __ms_abi__ attribute is available on all supported versions of +clang. Add a specific Clang check because the GCC version reported by +Clang is below the required 4.4 to use the __ms_abi__ attribute. + +Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> +Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Ian Jackson <iwj@xenproject.org> +Release-Acked-by: Ian Jackson <iwj@xenproject.org> +--- + xen/include/asm-x86/x86_64/efibind.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xen/include/asm-x86/x86_64/efibind.h b/xen/include/asm-x86/x86_64/efibind.h +index b013db175d..ddcfae07ec 100644 +--- a/xen/include/asm-x86/x86_64/efibind.h ++++ b/xen/include/asm-x86/x86_64/efibind.h +@@ -172,7 +172,7 @@ typedef uint64_t UINTN; + #ifndef EFIAPI // Forces EFI calling conventions reguardless of compiler options + #ifdef _MSC_EXTENSIONS + #define EFIAPI __cdecl // Force C calling convention for Microsoft C compiler +- #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) ++ #elif __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) + #define EFIAPI __attribute__((__ms_abi__)) // Force Microsoft ABI + #else + #define EFIAPI // Substitute expresion to force C calling convention +-- +2.30.1 + |