The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=aef014de3ff8be3ef06a45cb48a7f2386167456f
commit aef014de3ff8be3ef06a45cb48a7f2386167456f Author: Ahmad Khalifa <[email protected]> AuthorDate: 2026-05-31 11:29:34 +0000 Commit: Ahmad Khalifa <[email protected]> CommitDate: 2026-05-31 12:12:34 +0000 Revert "edk2: enable static asserts for *INT64 alignment" This fails when using WITH_BEARSSL. It seems like we build the EFI bits of libsecureboot (which is really just part of libsa in this case), even when building the BIOS loader. Revert for now to unbreak the build. This reverts commit 2fa4bdd7f9e99698a6652db405c3165fdcd41c1d. Reported by: [email protected] --- sys/contrib/edk2/Include/Base.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/edk2/Include/Base.h b/sys/contrib/edk2/Include/Base.h index d3342c9a6ca2..3ae798db8429 100644 --- a/sys/contrib/edk2/Include/Base.h +++ b/sys/contrib/edk2/Include/Base.h @@ -841,8 +841,10 @@ STATIC_ASSERT (ALIGNOF (INT16) == sizeof (INT16), "Alignment of INT16 does not STATIC_ASSERT (ALIGNOF (UINT16) == sizeof (UINT16), "Alignment of UINT16 does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (ALIGNOF (INT32) == sizeof (INT32), "Alignment of INT32 does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (ALIGNOF (UINT32) == sizeof (UINT32), "Alignment of UINT32 does not meet UEFI Specification Data Type requirements"); +#ifndef _STANDALONE STATIC_ASSERT (ALIGNOF (INT64) == sizeof (INT64), "Alignment of INT64 does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (ALIGNOF (UINT64) == sizeof (UINT64), "Alignment of UINT64 does not meet UEFI Specification Data Type requirements"); +#endif STATIC_ASSERT (ALIGNOF (CHAR8) == sizeof (CHAR8), "Alignment of CHAR8 does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (ALIGNOF (CHAR16) == sizeof (CHAR16), "Alignment of CHAR16 does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (ALIGNOF (INTN) == sizeof (INTN), "Alignment of INTN does not meet UEFI Specification Data Type requirements");
