svn commit: r565411 - in head/emulators/xen-kernel: . files

[Roger Pau Monné]

Author: royger (src committer)
Date: Tue Feb 16 16:03:33 2021
New Revision: 565411
URL: https://svnweb.freebsd.org/changeset/ports/565411

Log:
  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)

Added:
  head/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch   (contents, props changed)
Modified:
  head/emulators/xen-kernel/Makefile

Modified: head/emulators/xen-kernel/Makefile
==============================================================================
--- head/emulators/xen-kernel/Makefile	Tue Feb 16 15:44:27 2021	(r565410)
+++ head/emulators/xen-kernel/Makefile	Tue Feb 16 16:03:33 2021	(r565411)
@@ -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
@@ -27,6 +27,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>
 

Added: head/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch	Tue Feb 16 16:03:33 2021	(r565411)
@@ -0,0 +1,38 @@
+From 92f5ffa58d188c9f9a9f1bcdccb6d6348d9df612 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau at 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 at citrix.com>
+Acked-by: Andrew Cooper <andrew.cooper3 at citrix.com>
+Reviewed-by: Ian Jackson <iwj at xenproject.org>
+Release-Acked-by: Ian Jackson <iwj at 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
+