From nobody Thu Nov 14 00:43:06 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 4XphG33TGDz5cpNP; Thu, 14 Nov 2024 00:43:07 +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 4XphG30QQzz4qjF; Thu, 14 Nov 2024 00:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731544987; 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=Bd/5wHwuzl/IsZpAS1EpnkcY1zciQ2rqBopEIT1W4kA=; b=Waam+hZO2TcbMC0K8rnp5H1iHDrmhTj5m3QUXIQJBGh4a2bXAiuz/ZIWPFjxaIOPF9cxFe +y8YqYivZ/jpxdmNS92UsZf6tEFo8nPwKCwa/dW1lBPNGD9XuXKSA9ygiofXkR9G+mO9zq UDlFlVyEsjK6ZIx5IEEen842J1c33PA7NrSrpRxc2VomSdY3dQlHCRWTbeqWP1VTCCEwmG Jn0Txlt7Q21Ej0j9AT2yFbLaJ7H4YntD9gp4L4kDPYpyWA46FfLytzg6gfWoo+ADq/iZTt PuGQmRHUOJfy2hoTHjrv0TWvhiomEy9CTCfIz/B8aufyYzkUVuJpmk3NwYK2bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731544987; 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=Bd/5wHwuzl/IsZpAS1EpnkcY1zciQ2rqBopEIT1W4kA=; b=AJ3LBBwUKEf0mmnmqRMTS5+1OPQUmSXGoP+kHwMgwFC2Mb+1sPUqMKUew4SbC7YbkvRJrp bPcvaZw9woaxNo9zf8iKSEoVzINbIGRj6QSt498RdoKwAVUONSb+QDMMMTasCVWGU9yDmv 9O70fll2GLMxzkyoLk5/uL894MES5PHR0Naz6CWMQ7J9hvXGdUu2uRA2pPfUwidOdWU+p7 DMWKZZYFZ+fhObw16oQLNEQ1TwhfAB7s/3b8IBH+EtWVqDPUTJFbvUTyo3LG/JwzR3d1Hv iAI9k/kFGL3zaALQVbnATP8sgyqmj/MnLCMQb+KiM+8EqWmWzip/RHDawcl1Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731544987; a=rsa-sha256; cv=none; b=u8K+bTNX1LsmdL+MvfbNwvpI2X4J/LD1AmPg/l8Bfjc5KMb6GUR238M4EplSsOA2ThwsZU ph9oTshIVCKiUsIIx//0d7xw3r4J6A4PqH3o6Zl6qE0QIezGwBaYFXu0ER0qedKOnRFdQB 2USNphCny54XeDRbyv2NJGB9WS1tI31RhrDIvrllY4gllHBa2pLzxeQnJhccbhf5FdWB4m VVm659HFBGwBGpRB1V3/VnZezmhkUndAUJk88eTDYR7Kn7DPp+drvP2eUJxjOLy6ZsIHJx 3OHlIclzCtlrlLH3tmZ9HXcbV014jWQooHcYN08Ujwd8WmvOTquH4Ejxga7Cvw== 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 4XphG300gGzH94; Thu, 14 Nov 2024 00:43:07 +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 4AE0h6p1024370; Thu, 14 Nov 2024 00:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AE0h6rj024367; Thu, 14 Nov 2024 00:43:06 GMT (envelope-from git) Date: Thu, 14 Nov 2024 00:43:06 GMT Message-Id: <202411140043.4AE0h6rj024367@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: db21e6980b92 - stable/14 - rtld: make it easier to add sparce non-default members to ld_env_var_desc 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: db21e6980b92140e044d1eaf5b86971e49b1574d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=db21e6980b92140e044d1eaf5b86971e49b1574d commit db21e6980b92140e044d1eaf5b86971e49b1574d Author: Konstantin Belousov AuthorDate: 2024-11-01 19:20:17 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-14 00:42:17 +0000 rtld: make it easier to add sparce non-default members to ld_env_var_desc (cherry picked from commit d7214577ff00221ac84a85e61794a5e126b952dd) --- libexec/rtld-elf/rtld.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 9e0c3b92848e..41d11adacb09 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -349,8 +349,11 @@ struct ld_env_var_desc { const char *val; const bool unsecure:1; }; -#define LD_ENV_DESC(var, unsec) \ - [LD_##var] = { .n = #var, .unsecure = unsec } +#define LD_ENV_DESC(var, unsec, ...) \ + [LD_##var] = { \ + .n = #var, \ + .unsecure = unsec, \ + __VA_ARGS__ \ static struct ld_env_var_desc ld_env_vars[] = { LD_ENV_DESC(BIND_NOW, false),