From nobody Sun Nov 16 18:29:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8fXd67zYz6GsMl; Sun, 16 Nov 2025 18:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8fXd3Gzwz43Q4; Sun, 16 Nov 2025 18:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763317745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQXG0piySLG8NA8BEQYcRuBs235rv2K+klLzQwfVyaM=; b=uHMelYz2rF/2yInobX/CtbwlIN2mKFVCAfspO0VNDd0rYRTkNdNvuXyMIOV7i4SrWHQccL ntQygfeygzLBObBE7veSKvW5gj2kauwk+ZxWt0PnAZETfhVJzTB5A9UZGo3FaxAc7ljFzd jMi1tLBI2bZz3PohRmNusMpLHgzV9L0i9aGIaoBODEdeU43QlS1zExp5BLwKPf0Roplss4 8CfPNAv0i6VhZdm6/D6dr8YuYEwpcHDXFPM6LoRVjHw5gWxxWvarYlRLUzStGZHXomocIV K1ikRnzlM4+KTJiX1xSsF6ZzLQDJvma+c9FWQzaF49FnFyj+LqN02XTFTeqzjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763317745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQXG0piySLG8NA8BEQYcRuBs235rv2K+klLzQwfVyaM=; b=T4049Mlyh1khnFFO19XCXndPUyAmKPSGwxtQxPsr54spa46qGo0582UuGbVoGTZka5LDzf YmUWivjac7wvI0PJaOO4FHKoHPgLYDi5l6joMce0GjirQeFL5SlSKaGn3voBNLMm2xAFDY 8GwZ8jUDYeOYNZIAid460f/gT9fjqcXOM5PAm+A/xOiFIXu8AEuGK+CLNSi/cb1ESgqKh2 4G0a6g446w9y7R+1+e/gExhARMzjCaO5w8jtMq2NM2l4PbFPefPLV4lulgDFyvHhxJ54bR Kd6XMd/7DuLnjvOMQks+sJSicl//rMx4/1OauFWqh/1KiB1ILJwriFSF9HwYbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763317745; a=rsa-sha256; cv=none; b=Mi9BakLjGbBGgMqEWSQONl2h23utMWNt6PbnPwCuAw/d3ngPM3mbz1yCzIUu8WirDNasLm RL0tK93b2XhZZvRfti5WmmL/BfU3/wACabZsotLc8AsjKKjeANiZV7pboP7ffy4pNZcg78 7HbDgMHa4jUhLJ13KXgadPBLR69chlNmTF63S2p5kpAQgyE6N8nVNpgwVAAkLPYtOB2ryn vn/VxlcksP1R4lx5YJZXk0s37Frj3a+tg9o0KqsXSeECf9S1bB5cizOeIJvuG9uzDRH19j VpMScZAKMRcgZSMzdcUp+FtVmA99QFJIeAljYVy8Ox2t0DGIsYA5e6FJqd/DNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8fXd2W07zqb0; Sun, 16 Nov 2025 18:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AGIT5R9008029; Sun, 16 Nov 2025 18:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AGIT5b2008026; Sun, 16 Nov 2025 18:29:05 GMT (envelope-from git) Date: Sun, 16 Nov 2025 18:29:05 GMT Message-Id: <202511161829.5AGIT5b2008026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 473786a131b0 - main - edk2: Tweak the tests for UEFI Specification Data Type requirements List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 473786a131b0546e60fc8330f79e270e145e1bfd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=473786a131b0546e60fc8330f79e270e145e1bfd commit 473786a131b0546e60fc8330f79e270e145e1bfd Author: Warner Losh AuthorDate: 2025-11-16 17:34:58 +0000 Commit: Warner Losh CommitDate: 2025-11-16 18:29:03 +0000 edk2: Tweak the tests for UEFI Specification Data Type requirements On x86 these trigger for 32-bit builds. We only ever (will) do that for the 32-bit loader that starts a 64 bit kernel for ia32. For the moment, take the training wheels off, though most likely some compile flags need to be used to change the i386 ABI to force *int64_t alignment to 64 bits or some other horror as yet ill-concieved. Despite this assertion, the ia32 to boot 64-bit kernels loaders seem to work. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D53653 --- 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 e3d03a9cc5ab..2b53e118b33f 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");