From nobody Wed Mar 26 01:29:02 2025 X-Original-To: dev-commits-src-all@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 4ZMq272t9Gz5s5xM; Wed, 26 Mar 2025 01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZMq263vqGz3rdP; Wed, 26 Mar 2025 01:29:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742952542; 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=IA2Q3gK23rK61C6S5zGe+1R5r5KlpJWdE18HY1IgZwM=; b=Jyn3X+NIz63rdNFej9WqPkmOQYwQZPqCiubpvkbIEWwJQM6hCcRa8R1O/Un8KPw3Y3Vkoq +ye2ZotZxFOSZ23Hw9Y+K8oXe/gc06kiKh6g+dJhA26nzgqb+iH5MsVWGhnq7a++o28pN0 yI9aKwP+TT8LfKQmY9YAjem+MylmT2xhllX+0AuUJy8Utn6/lfLABiUvLtKjAaICV4PbtF ak/XZDq7lNn0fupOPMzzTOlQkcJNyUoDRCwcooUlINWjJ8Eha7JbclCV6eBKB5AGFb7Bxl QURIdh5bQXpP4ncGBqJmfyTDhfOx7ttK26ShsTUSgeQ26y8rr3beh65hwzNcEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742952542; a=rsa-sha256; cv=none; b=cLKw1AV65BqeckPMcTb0mTpv1xs5wPFBiaabvuxolXoiRLpbHB6VwurNejXFuD0Ymxz/Z3 YfR6l2i5PnuhumlaaCJa3GiOxpN9RtJ4gdc58g+K9PoL3smOl73LDDjn4e2A+Abw/Uj3Se OiCRPkuOGOzFOu3z2/9/GLd8C4xxp2RkQ3o6VqRT/Rh6tgk+Lrszn1kPg2aTmIDphGHnIS ojEB+fE46I+uETTBxsytQibX9xC0/9Qfvdm7xfN0eem9ZYtlekrgjRO8go6VAlFz+7DqZJ F9WhA1aPy3kIytKNACM5jncw7aWfm1f9+znRwp1P/AKmRwc1Y96KXD2Xns/JPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742952542; 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=IA2Q3gK23rK61C6S5zGe+1R5r5KlpJWdE18HY1IgZwM=; b=MuJInvZXfyQpS6VFk1Hv9WLpc5rN/ITIqgIB3FevspfLFZvvLiTCmra15KJyzQqKn/Gt2R Pe1vvJ3HgTqut8ycp7lko0HCtO3gfX+MniXyBMzOzOTyqSrCluv7Pw4vv7vTMeamYUZ2+b fSZNSnPOUzx/KgIedyuMKCoqDXTdMmcQti2YqGAIL1VE1oCSbRKQkfM1QLQOMePnGk/Bzm jsGq5o4uIJScU/903cuF6GYWqLYQws/MMwsdsTLCNU3J//jaPl0UZSzRVA+WRUMX8QzZqm qqocu4TpcPgz/6C/RTH00OHp0lmvTLIuRwGguwGnRwnDVLhzH5QRldyAvekHzg== 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 4ZMq2638Q3z14Kv; Wed, 26 Mar 2025 01:29:02 +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 52Q1T2lo047351; Wed, 26 Mar 2025 01:29:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52Q1T2jr047348; Wed, 26 Mar 2025 01:29:02 GMT (envelope-from git) Date: Wed, 26 Mar 2025 01:29:02 GMT Message-Id: <202503260129.52Q1T2jr047348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: ac5378d93ce0 - stable/14 - Add build option for the ia32 loader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ac5378d93ce0bcb639a53b91b546b4d7d24af52b Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac5378d93ce0bcb639a53b91b546b4d7d24af52b commit ac5378d93ce0bcb639a53b91b546b4d7d24af52b Author: Ahmad Khalifa AuthorDate: 2024-05-14 19:27:06 +0000 Commit: Warner Losh CommitDate: 2025-03-26 01:28:38 +0000 Add build option for the ia32 loader In preparation for supporting 64-bit machines with 32-bit UEFI firmware, add a build option for compiling the ia32 loader. Currently unused. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 (cherry picked from commit fe3f792f9a2982678138e239f5e8d66e8ee71aeb) --- share/mk/src.opts.mk | 5 +++++ tools/build/options/WITHOUT_LOADER_IA32 | 1 + tools/build/options/WITH_LOADER_IA32 | 1 + 3 files changed, 7 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 22373f8c7af1..b3f635bc5a70 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -136,6 +136,7 @@ __DEFAULT_YES_OPTIONS = \ LOADER_OFW \ LOADER_PXEBOOT \ LOADER_UBOOT \ + LOADER_IA32 \ LOCALES \ LOCATE \ LPR \ @@ -323,6 +324,10 @@ BROKEN_OPTIONS+=LOADER_KBOOT .if (${__T:Marm*} == "" && ${__T:Mpowerpc*} == "") || ${__T} == "powerpc64le" BROKEN_OPTIONS+=LOADER_UBOOT .endif +# The 32-bit UEFI loader is only for amd64 +.if ${__T} != "amd64" +BROKEN_OPTIONS+=LOADER_IA32 +.endif # GELI and Lua in loader currently cause boot failures on powerpc. # Further debugging is required -- probably they are just broken on big # endian systems generically (they jump to null pointers or try to read diff --git a/tools/build/options/WITHOUT_LOADER_IA32 b/tools/build/options/WITHOUT_LOADER_IA32 new file mode 100644 index 000000000000..2df947216b8f --- /dev/null +++ b/tools/build/options/WITHOUT_LOADER_IA32 @@ -0,0 +1 @@ +Do not build the 32-bit UEFI loader. diff --git a/tools/build/options/WITH_LOADER_IA32 b/tools/build/options/WITH_LOADER_IA32 new file mode 100644 index 000000000000..2030619dbb85 --- /dev/null +++ b/tools/build/options/WITH_LOADER_IA32 @@ -0,0 +1 @@ +Build the 32-bit UEFI loader.