From nobody Tue Apr 16 20:13:20 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 4VJwG91Fz9z5H0hl; Tue, 16 Apr 2024 20:13:21 +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 4VJwG86xwDz4v9r; Tue, 16 Apr 2024 20:13:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298401; 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=GstGBarUnaTkzw9+5M4229jO8fsLY8x1U9hYJazNNaI=; b=ZmiXlcNUg4YgdjTuHv6E3uvTqWZ1e5AwYCajqRz4ykQJMYWxqzv/t6XH1GGx5eGRxC1udr 2RASmLr7guBc/BXLtSNTNsnKuffakWPtBMYGTd+VjqV9FsF3IrlZ0c/k98g1YhAl98EgPU zP4r5Oa6JVQe4oxKnvwnusLX0mPGjrAS7q1EDuanGYEtthnpHK/0mpafb5PDi++Ow801zh fP0klx57JUIZm3ChsC4WtHJrqs9/3NsMABswXcf38p4HbrKHDemYoHmx1leqbijH6u3Icy 0rdedQ+K/2l4LKk8+sfezSg0rdlPErDZJif6q14gLb7fWJFzDYe+MUeZEJWpug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298401; a=rsa-sha256; cv=none; b=T0MgAL26kZiYwIWk9uqcOMptuQubrZGl6b7HmM5TN3ShNN/exDAekuhGo3YiOYpGCIbEtY QKZqn+cNOVTcblCUw07lYBdWDxRUn24q5CNXR85YZLTEIfTCv5Q8PYU5xC5Q7KwjxKT2rv LSzHLl/jhJEcvXi/Uek4z10thmaDOAgT3yRLlsBFpgolEJfMghzOKlkQWA9msTLv+kZngL 3YZJpYAYwzLyBhUkBD+dk2MQdWgw/8Qz8D/o9/Ci1unN6SIEpGDK49oC/6xePz/wvlvrKw 5ooEGCdqVEz3mpMzswVyqyFrhsq8+kN75tZ9CHIdp2rTVlKFsg+6hFtygkIAkQ== 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=1713298401; 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=GstGBarUnaTkzw9+5M4229jO8fsLY8x1U9hYJazNNaI=; b=i2YMqu7GJdUTswJSdBGXAw9gCbwvC7XPJDXh68PQzEyDHuswan8Y0r0ALpSmI9LtFnlteM 0CLC2ztaZTqhSUQYHYOA4bNxg9uW/sIsf22duoTJJS6iZUWaP95mowRbGV9wwzTg7G5OBe tWOU16Uuc4snFE2An66V7zJh+kIw8bCsQzPj+bd7qlZD321+IrXJcaJhpd151FEXTv4Xwt FJffTGYK055pGUjS2Ddxm303x+xuDbREBqfJOdt8fJPKbwESEe3cYxMwrH5CvsGl0E/pzI wO7LMJwzeL3h5joC/OkBNY4ToHXGz4Hvc/beaA1/6rtUTDxUQeVTAhZ3KxGlDA== 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 4VJwG869s4zwwF; Tue, 16 Apr 2024 20:13:20 +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 43GKDKlF039345; Tue, 16 Apr 2024 20:13:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDKU8039342; Tue, 16 Apr 2024 20:13:20 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:20 GMT Message-Id: <202404162013.43GKDKU8039342@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: 88ec6ce7d159 - stable/14 - loader/efi: Use unique linker set for lua 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: 88ec6ce7d15915d53f68b9930b7f2cbb791d227f Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=88ec6ce7d15915d53f68b9930b7f2cbb791d227f commit 88ec6ce7d15915d53f68b9930b7f2cbb791d227f Author: Warner Losh AuthorDate: 2024-02-25 00:57:13 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:27 +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 (cherry picked from commit b4e85f760b6b77d276747c9beb6191bfb864e0c2) --- 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);