From nobody Wed Mar 26 01:29:01 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 4ZMq263yrNz5s5pq; Wed, 26 Mar 2025 01:29:02 +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 4ZMq252k0Pz3rgt; Wed, 26 Mar 2025 01:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742952541; 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=Ab8RjRMqStThHdP/pASza4VFY9vM9mvggzGcs0QpKDM=; b=uSvOfdszULwadpladY6FWDAGSDfKn0g5sSPK39Sf7zEYMix7thwRwxd4dI+rv1okdbPtZx wvo6tlxQw122eW10rI9OxlaEp+kEYPcC7FpzTOF7RD1aCs5GZr7CRMFI2CM6btvF2zUDZp vIr7M5PTWV0YKjXercRGJHiMRGeax6JY5p1+IS8x+ka9tX+AE6raj3DWWrboiZ5VijaK2I yIuHPzYHQootng6BuIJYlHpa6xuSfStLZ/YZYGwn0mNlWZ0QHfKREN7bDgTiqHKgxeIPEY 6/jzloRFq6/5M7CWUI8d6+fC7IjYxYtpUcbpKY6p/ruGJ/s1itKjFIMDPPge3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742952541; a=rsa-sha256; cv=none; b=V5Q3Ct8/4vhoRDgOtu4l3IvFNfaOgXLjImiWLV8h5N+KzcqMV/RDAD5aiQSEZAbYl4mmkl VhLaxzlc67oL548r4IrdNq7ydOAOhWkPpoj0eS/3rz4+agH7qVLHOeDYiSbgHEAEM1nqg1 TXNxsJQfDYppOz0v2IJxihmHvT7M6hCV0Hwj3FV9sxScXFG+ut61+URRTs4WWBnNq3nzcr 1ZwCpzoTHpbunb6Gvp+b45dA0ZkP4rYaeAyg6KDl5dlrEeWMNLAXhZyBzltpDJAwSGtCzv E/gaYUk4V1eJWyOyF/S8YZ82F89HcdVI9O7JlOA1aw4QJwZYqezpsF6UmTbsCQ== 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=1742952541; 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=Ab8RjRMqStThHdP/pASza4VFY9vM9mvggzGcs0QpKDM=; b=I1fJWCOyofRbiXoyLWnxlSLw1RnSP+EyFhI+ltu0Wr2NjuUU4Ha4RQIP8+kZBFlfb0dVbB kdfyUhkcA1c4wUHhgvGcknIYoDVfb3AJnoeiq4GgKWHtch1jPEpkM965sPjt5ydHjxVfYE OPf+8VAO+du74TGAU42nenrk4XFI8amjmR3skM3sRzjQ7vfSOYfgyxT/JoLpEExudljYyH PTpuC6H+vVRfadLrEG4r4Acw1xI0CxENTxRjLn7lbXyOCIbMAZLRBb3kGgZXQ0IddseT+r SYqA7p9cEdBMw4RuA5i2eMzb/+9/f5RP9OL0zYcBN8nX9tZht40sT6CwWooZOw== 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 4ZMq251ysbz14Kt; Wed, 26 Mar 2025 01:29:01 +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 52Q1T1Ik047317; Wed, 26 Mar 2025 01:29:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52Q1T18U047314; Wed, 26 Mar 2025 01:29:01 GMT (envelope-from git) Date: Wed, 26 Mar 2025 01:29:01 GMT Message-Id: <202503260129.52Q1T18U047314@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: 7d7dc14d6b38 - stable/14 - stand/efi: Add a 32-bit variant of libefi 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: 7d7dc14d6b389ba0df4f522501c39578cbef8cae Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d7dc14d6b389ba0df4f522501c39578cbef8cae commit 7d7dc14d6b389ba0df4f522501c39578cbef8cae Author: Ahmad Khalifa AuthorDate: 2024-05-14 19:37:13 +0000 Commit: Warner Losh CommitDate: 2025-03-26 01:28:38 +0000 stand/efi: Add a 32-bit variant of libefi In preparation for supporting 64-bit machines with 32-bit UEFI firmware, add a 32-bit variant of libefi since we need to compile both the 64-bit version and the 32-bit version at the same time. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 (cherry picked from commit f0d5b1bdf075c68ddb1dcfbc5a0eda0214510b5b) --- stand/Makefile | 1 + stand/defs.mk | 10 +++++++--- stand/efi/Makefile | 1 + stand/efi/libefi32/Makefile | 4 ++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/stand/Makefile b/stand/Makefile index 6d0d7a09672a..a9f2f5a0c50b 100644 --- a/stand/Makefile +++ b/stand/Makefile @@ -67,6 +67,7 @@ SUBDIR_DEPEND_${MACHINE}+= libofw SUBDIR+=${_x} .if defined(LIB32LIST) && ${LIB32LIST:M${_x}} SUBDIR+=${_x}32 +INTERP_DEPENDS+=${_x}32 .endif .if ${_x} != "libsa" SUBDIR_DEPEND_${_x}+= libsa diff --git a/stand/defs.mk b/stand/defs.mk index 3624b9311161..a1cb39f8b4a0 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -38,7 +38,14 @@ WARNS?= 1 BOOTSRC= ${SRCTOP}/stand EFISRC= ${BOOTSRC}/efi EFIINC= ${EFISRC}/include +# For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is +# built 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here +# and activate it when DO32 is explicitly defined to be 1. +.if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1 +EFIINCMD= ${EFIINC}/i386 +.else EFIINCMD= ${EFIINC}/${MACHINE} +.endif FDTSRC= ${BOOTSRC}/fdt FICLSRC= ${BOOTSRC}/ficl LDRSRC= ${BOOTSRC}/common @@ -128,9 +135,6 @@ CFLAGS+= -m32 -mcpu=powerpc -mbig-endian CFLAGS+= -m32 -mcpu=powerpc -mlittle-endian .endif -# For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is -# build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here -# and activate it when DO32 is explicitly defined to be 1. .if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1 CFLAGS+= -m32 # LD_FLAGS is passed directly to ${LD}, not via ${CC}: diff --git a/stand/efi/Makefile b/stand/efi/Makefile index 2ecd8ba07aa0..e92d59e9f8b7 100644 --- a/stand/efi/Makefile +++ b/stand/efi/Makefile @@ -4,6 +4,7 @@ NO_OBJ=t .include SUBDIR.yes+= libefi +SUBDIR.${MK_LOADER_IA32}+= libefi32 SUBDIR.${MK_FDT}+= fdt SUBDIR.yes+= .WAIT diff --git a/stand/efi/libefi32/Makefile b/stand/efi/libefi32/Makefile new file mode 100644 index 000000000000..779c7e604686 --- /dev/null +++ b/stand/efi/libefi32/Makefile @@ -0,0 +1,4 @@ +DO32=1 + +.PATH: ${.CURDIR}/../libefi +.include "${.CURDIR}/../libefi/Makefile"