From nobody Sun Nov 16 18:29:03 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 4d8fXb3mkVz6GsVk; Sun, 16 Nov 2025 18:29:03 +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 4d8fXb1pY0z43BY; Sun, 16 Nov 2025 18:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763317743; 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=4YpEcwXS6ar3JXaOSR6RyBKbZVGZuha5RvUItM5dRpY=; b=tKS7JigbfRiYBOETxVSvWU1cwFr0zI4iP56M8WOO/iw2vXIbjp+rf1/B48BKpmJoSzvBG8 IFVnk7Oxp890TrvLWCWmtBaGDKI2kqELxyQ7+vlZOYLCYuhkbdnLaYF2nY7DEHUja9gyAT ZYouN23XK+qGaHW9EodOll09EDkVjtvewKpGybp1hjN2bCKahMoWTi6gB3kIAYqaqnqp8k liXm/JOKchoeRN6oDBaRRLQ3Spup9XZ4jtmoxHpdLFyt91O7rY1+bCGYFlx5imzeeT4kOv itlJmbTrwXtrUOJIWhEhl5FFKRsjr5E0aUrf41keISI9kzuGLsVU0lamQBg+4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763317743; 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=4YpEcwXS6ar3JXaOSR6RyBKbZVGZuha5RvUItM5dRpY=; b=fOxKhTG9+WkLVhD4Yu1Vcn4E944uQnXZYxwbIBVS+PyBANgxF63JqvqPJ4Hct8K/SPFN1V +tdWBQO3FgllzGUb0ToUp7i4L0oUQXa671KDudWAYlAPIPKWqZhSzzWKXQG2NB74vpFgLm VHf5P+pBQZ++MMbuY6I88B3OLdkiLvq99F/FeWfPkz6npSkwTPI6Z0c/W2q7ou+tnJr87K HiKED94PZxR5Kt8PfkSI7YdTsZw3B7duxH2fs2rF5WeOacqAwHLmdETGqHtGYu0YIMMaR7 8Swvza3/v+2+Cj7pxTdm33wsJyRb7rZzZrztxW+TaYhyAcu5RxquUV/rKOfzjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763317743; a=rsa-sha256; cv=none; b=E1Y0n+kVeW1s6Yp5E5uWShevW2ehdFpkUHIsYdZ9PEAwT4Lu/Fp5y+5Y2cyqmCPNf6tgqm FH4dnTmRV5ukbP4u+Tfkv/isUV0VME1EcZP+mIC/Bd19H96xY+2D8Wa/Y+9CdJxyQ4OYk1 yehnYYceaPF3o/lleztNQo7wAUX5fQqBvaf4CxooFYNldw5D15ckXqOYXr0ibk+20wu3Rk ipQl5+z7NvChlU3qaj82m+rmt8UGE3LXQybcuAVDvBVk73l7B4ZAs/3hC3KTm5LfGljwVP LVg/wcEsuJTAlwI9DNCAvBuF/THLYd5cRQtED724YKFMzsRwhIEuEr7S5sLpCA== 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 4d8fXb1GqPzqJF; Sun, 16 Nov 2025 18:29:03 +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 5AGIT3Z1007963; Sun, 16 Nov 2025 18:29:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AGIT3wh007960; Sun, 16 Nov 2025 18:29:03 GMT (envelope-from git) Date: Sun, 16 Nov 2025 18:29:03 GMT Message-Id: <202511161829.5AGIT3wh007960@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: 67c7e94315ff - main - edk2: Move ProcessorBind.h to contrib/edk2 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: 67c7e94315ffeaa55e3dcf2f6066cb8fe483b5c2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=67c7e94315ffeaa55e3dcf2f6066cb8fe483b5c2 commit 67c7e94315ffeaa55e3dcf2f6066cb8fe483b5c2 Author: Warner Losh AuthorDate: 2025-11-16 17:34:33 +0000 Commit: Warner Losh CommitDate: 2025-11-16 18:29:03 +0000 edk2: Move ProcessorBind.h to contrib/edk2 Have our own ProcessorBind.h. It just includes sys/efi-edk2.h, but undefines TRUE, FALSE and MAC. The first two are from acpica and are redefined to something almost the same. MAC is a global option that, well, interferes with using EDK2, dangit. I suppose I should redefine it after, but I don't think you can save the value of a pre-processor variable. This breaks a little with the tradition of having this in a seprate directory and using build magic. However, the build is already magical enough and having this here makes things less magical. Also, EDK2 puts this in a processor specific directory, so we won't have conflicts (they need it there since they run on more processors than we do: we can just include sys/efi-edk2.h which covers the smallar variance we have in processors). Sponsored by: Netflix --- lib/libefivar/ProcessorBind.h | 3 --- sys/contrib/edk2/Include/ProcessorBind.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libefivar/ProcessorBind.h b/lib/libefivar/ProcessorBind.h deleted file mode 100644 index 6985a193cff9..000000000000 --- a/lib/libefivar/ProcessorBind.h +++ /dev/null @@ -1,3 +0,0 @@ -/* File in public domain */ -/* Brings in the glue for UEFI/EDK2 Tianocore code to run on this OS */ -#include diff --git a/sys/contrib/edk2/Include/ProcessorBind.h b/sys/contrib/edk2/Include/ProcessorBind.h new file mode 100644 index 000000000000..d67c4aa99b19 --- /dev/null +++ b/sys/contrib/edk2/Include/ProcessorBind.h @@ -0,0 +1,11 @@ +/* + * Copyright 2025 Netflix, Inc + * + * SPDX-License-Idnetifier: BSD-2-Clause + */ +/* These three will be redefined -- well MAC is an option that collides */ +#undef TRUE +#undef FALSE +#undef MAC +#include +