From nobody Tue Apr 16 20:13:21 2024 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 4VJwGB1ZB6z5H0hm; Tue, 16 Apr 2024 20:13:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJwGB0jThz4vH5; Tue, 16 Apr 2024 20:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298402; 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=tiKSq3n/5nYiwLkDdHJvMDCYLedt7hEcBszqZu4lzkI=; b=sRrNbNJjDzsE9fyrZ1XfleXm23cUmh5X4Ii9Es1ES/aSKuzK79thDsl3DrxcSrx7GazOPk TVG+TuSX2sqx17jOpz+Smoa4/4qhn2iOsQN3UbIfqf2I7EQUOFNHCFp8f7B7eI7IXAALSy KanycERy35UIqlqyCLSLFVuFK5PNQyBscYfYlPZgz7qYIBjTpvyXl7g8omSxasCa1PAkNS UNI3HtkRfbzmceELLhahGM9P3tkME3JXV2AHXTvhZWQpX5iLeHbteEVJ202IJXAhHSlWhz eDbEvG1SrSkbd6LNz4/mgRmsVKjyuQy5skpWpCZEJsOloS/qz/NH8ju2ICoNtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298402; a=rsa-sha256; cv=none; b=OVfGwj1i/O0/fhGtzg1qCCZXmkANJqEzpKPprvqQVR7hEpByFnRmiXEXhPq9gZYqddVOT8 cwTdYp0HcK+XS1Cdosy8lzkvYD4qfqcN5NyT9dLuIzhTPiRiSEpyFFcIn9QGpq+28S2dq1 S2INjQy+k6v8er1EHR8QLCl812SBGjoHzvR13xi651NqFV1m1//OQvi7TjVfosKg5Qm/WR DWCs9dzENd1AbnTLe3DLeZxwannCKEKWWnTAWko0aORjmPz9V2gHIIyRIprxpf/rK0qnfW vQYfAgOytMIdbj9a35bQk73h5W2sK/KtumTbJHOt91Dkfm4dIwmi/mCqJ8KSbA== 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=1713298402; 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=tiKSq3n/5nYiwLkDdHJvMDCYLedt7hEcBszqZu4lzkI=; b=yndtz/qWT+nQA3y1CElY0TmgAEaX1EHmU4KLAE1UfHdFoyaNYGa3HBLVuQHuf1yISNEr0Q NN+kNIvy2aSb7NMSQ0dGY9XUbWh5y2qmNmMxMdojmf59ZQhYwp1akj9MSv+JeuFFc/ZaPG k6wOoUyjeR3EYj6qcgEwPt5AJ/WuFjpKTvwooLHoSVAu3Ex/DCsjlIV6HNRO/Yu4xvS18R mkRoHtKSQIk3Lxk0nQwcGuj5kkd+xJfpfY49d8JFIc8g4RMaEPwQbKq+HIfdTEyOA+BQxd gMT3Y3xnIrtGvw08KYXwn+aTzF1/OhUTDAIznOZDHFvXahCfz6QdNwhCeCgG8w== 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 4VJwGB0JqXzxY7; Tue, 16 Apr 2024 20:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKDLk5039396; Tue, 16 Apr 2024 20:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDL6A039393; Tue, 16 Apr 2024 20:13:21 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:21 GMT Message-Id: <202404162013.43GKDL6A039393@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: 36d49fb2d585 - stable/14 - loader/ficl: Rename the ficl compile set to X4th_compile_set 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: 36d49fb2d58501facfd219f0b5bb260c9986b53d Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=36d49fb2d58501facfd219f0b5bb260c9986b53d commit 36d49fb2d58501facfd219f0b5bb260c9986b53d Author: Warner Losh AuthorDate: 2024-02-25 00:57:21 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:28 +0000 loader/ficl: Rename the ficl compile set to X4th_compile_set And upcoming change will need this set to be named this. Since it's only used in the efi Makefile, and inside if ficl itself, the change should be a nop. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44063 (cherry picked from commit 8ec8413faa3573c579d9e6361de904f8251b0c0e) --- stand/efi/loader/Makefile | 2 +- stand/ficl/ficl.h | 4 ++-- stand/ficl/loader.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index bb95b6480646..b8a98fc1dd47 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -117,7 +117,7 @@ ${LOADER}.efi: ${PROG} ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ - -j set_Xficl_compile_set -j set_Xlua_compile_set \ + -j set_X4th_compile_set -j set_Xlua_compile_set \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a diff --git a/stand/ficl/ficl.h b/stand/ficl/ficl.h index bdade26eee09..7be78f1a36b8 100644 --- a/stand/ficl/ficl.h +++ b/stand/ficl/ficl.h @@ -1153,8 +1153,8 @@ typedef struct ficlFILE typedef void ficlCompileFcn(FICL_SYSTEM *); #define FICL_COMPILE_SET(func) \ - DATA_SET(Xficl_compile_set, func) -SET_DECLARE(Xficl_compile_set, ficlCompileFcn); + DATA_SET(X4th_compile_set, func) +SET_DECLARE(X4th_compile_set, ficlCompileFcn); #ifdef LOADER_VERIEXEC #include diff --git a/stand/ficl/loader.c b/stand/ficl/loader.c index 618d9483fbd9..69a65ebedb73 100644 --- a/stand/ficl/loader.c +++ b/stand/ficl/loader.c @@ -865,7 +865,7 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys) dictAppendWord(dp, "uuid-from-string", ficlUuidFromString, FW_DEFAULT); dictAppendWord(dp, "uuid-to-string", ficlUuidToString, FW_DEFAULT); - SET_FOREACH(fnpp, Xficl_compile_set) + SET_FOREACH(fnpp, X4th_compile_set) (*fnpp)(pSys); #if defined(__i386__)