From nobody Sun Feb 25 00:58:34 2024 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 4Tj53H0qjgz5BxYk; Sun, 25 Feb 2024 00:58:35 +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 4Tj53G5b7Bz4tRv; Sun, 25 Feb 2024 00:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822714; 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=pqZFAISMZVa7GzIMi0XMnPfPYg+Zuf0XjugsVXTz4GQ=; b=KwtqttvQiIx9gieZTNW4RF3AOITJEIZy8tYimfCkQzHhoQ2XG2t9GtIQFOPscJ7oE7zU/8 ZlVNekn+k1n728hy9BHz0mfF10L4u6lvokKL7OnXWYxRgDe2fkVwZqKxmPPJs276qobVcM fyGsdH4Yx3zS/auKvNsJGy6S+Lo6w0ZPPbsQNmaVyCtNh+pTPGgJaWTLxZJcgicgQ3F+KH MI2Vm8ujv8/q7ZQv5FprNSP418ak8ypZMQAk/oKR9uX22lHgbzcnWE8DcDatWMeSH/MlBy POVn/ul79uKQII9kUyXGZxC5ZkSpYKLoC4OVPnYT+caSwXZUFhzJ3QguUcmOFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822714; a=rsa-sha256; cv=none; b=fkyhyK9FCIegAO0zqqvAzB2lVcOGj5Yzd+YtswBLMKpsamkrcf93/Ylt7aTp4N6BSkpGIF k3yJOWvOltOvTovQP7oWmEGZFTJKLhz/0EBqKYTUHBkf/Iqv9h1Ih3WI7u3NuwanGyY/Da CPgHuVWfeMbAL6AxNOe/OrDFZsAfhKdCo1kb9w//hC9kdGqaJlCIRRch6rfaJgCgsMW1Xh NIO6M6tASspobwO4BnSNrfQXSaastevWUNgozPPzK8fny5MOupADmYNcEmNXFFdRZHkYOY xwYILreCnuS2nhWsQ2IRtnpK+dhIlXn0XgDSVTT7jEZpnUOkCQOV9ZtEGJ/HJQ== 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=1708822714; 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=pqZFAISMZVa7GzIMi0XMnPfPYg+Zuf0XjugsVXTz4GQ=; b=CPrpASTu5i6iWZTQTVwMuV+i7mPONJI65MnCPXu/U/6Q14h2EKAl2nn9EzhofQhCpoi+rq PCRhiunW5V8O/Er+eSVJv9UMfSEaXMI2gujH72zdPNR+Ag32XPbNLNGD+lBzFtjfCfO01K aJMicN2UaEmOD4n71jfqHuVh+FK21Qvwddvpbj7Q6QCbjtvwmxGtcAjJphHVUyjSZAx18I 0L0aZ3SeQonCMsafulOZ+smm9X7FN58feqdUa2gXnQYM/TXDzvijMtgipfW0VzXVoPODrB mEq9p7IpoW3wZPEFqMG/WE3wNhZUf9hJCHcXyW9gEszhzB95A/zXrqWu8gyGVw== 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 4Tj53G4h8szN4x; Sun, 25 Feb 2024 00:58:34 +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 41P0wYir081798; Sun, 25 Feb 2024 00:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wYp1081795; Sun, 25 Feb 2024 00:58:34 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:34 GMT Message-Id: <202402250058.41P0wYp1081795@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: b4e85f760b6b - main - loader/efi: Use unique linker set for lua 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: b4e85f760b6b77d276747c9beb6191bfb864e0c2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b4e85f760b6b77d276747c9beb6191bfb864e0c2 commit b4e85f760b6b77d276747c9beb6191bfb864e0c2 Author: Warner Losh AuthorDate: 2024-02-25 00:57:13 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:57:13 +0000 loader/efi: Use unique linker set for lua After the linker set cleanup in ldscripts, there's now only one place we need to know the linkerset name, so go ahead and change the lua interpreter augmentation linker set to be uniquely named. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44062 --- stand/efi/loader/Makefile | 2 +- stand/liblua/lutils.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 2031400814e9..bb95b6480646 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_Xficl_compile_set -j set_Xlua_compile_set \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a diff --git a/stand/liblua/lutils.h b/stand/liblua/lutils.h index 522abfd3d0d4..ea715096df09 100644 --- a/stand/liblua/lutils.h +++ b/stand/liblua/lutils.h @@ -34,8 +34,9 @@ int luaopen_pager(lua_State *); #include typedef void lua_init_md_t(lua_State *); +#define _LUA_COMPIE_SET Xlua_compile_set #define LUA_COMPILE_SET(func) \ - DATA_SET(Xficl_compile_set, func) /* XXX linker set know by ldscrips */ + DATA_SET(_LUA_COMPILE_SET, func) #define LUA_FOREACH_SET(s) \ - SET_FOREACH((s), Xficl_compile_set) -SET_DECLARE(Xficl_compile_set, lua_init_md_t); + SET_FOREACH((s), _LUA_COMPILE_SET) +SET_DECLARE(_LUA_COMPILE_SET, lua_init_md_t);