From nobody Thu Nov 07 05:20:34 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 4XkVlR3yq7z5cN4J; Thu, 07 Nov 2024 05:20: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkVlR0wb9z54pk; Thu, 7 Nov 2024 05:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730956835; 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=3yTSoAtJ5cF6vStX+u66j6e8YWkoSaHKdqPH+MFcwtg=; b=Q2giQxc3XqeNfsSiinHF8p+BBrJh0iBQl6LTlPs7pAbqhSVb7CyQMe4ixDXWpOCXdqLYyQ uNTtHpWI36Zn1K06XycxwRkcwmmhdB6qAzLeHAVCJG/qHrdKX9BZpvkr79jC+OZn2cc04g 1XYVX04qsYvAAeVGLvFke2o2/JmhuVzUfnb2jeA0xdf6fQAfLahIl5rXt5oMWHT3rRlIDr k/A1KZQHvt7h6Xe7rbczLEZmHQ0VvttP9UQuoLas5EhBtN/xKaipaILmFvN1n6IKAwI9Su HMQ1qWDUNmMIqflxRLycv076CtEmwZ5xLBlZy/hMCn8gYZ1gnK1HIka9bTM82A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730956835; 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=3yTSoAtJ5cF6vStX+u66j6e8YWkoSaHKdqPH+MFcwtg=; b=GH4SlDsEKzN4yJ8pkN5UDurVZVRZdewHizyu73iNivq6JblqCg/Ku4MbGcMg8hI0gNz32o nbMLN3uwOcJzsCaOnP5hq5+1hk/viQjOXX9eY4yhcYr/FVXpVi7PWT71mzLuN6Y1pLwTAz 3QJKKSHDpx1pcJPailMTtlpTnrugq7wHBlPt6CleuvuGslVgEWULQaRIxogWHKBw+0mWp8 7FDE0BimWo9po3BKHtHYlW3fGt4XG76KbrmLHEObLNmXN66aS8iuTKMnZ9sWlNG+32/yrH tdz98Jo8RvXiq9X6+RyfEBMKybhTw6JwHQWzxwEptmCaSUDxXrPYKj4ydZluVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730956835; a=rsa-sha256; cv=none; b=csj311GgG+N/GeLUwGfhDN3FH4W0LaQo7wPv1wO+h4QoKDMTPx9DbdVogOHpGgjsxYns2C /6H3BYloXDBCZaDDa0p5WUcUxZ2/rt4kJuYovP48+5+ZiTtVawq6nBJxprlnKN7zp2LWhV IhkUZI/oki/i79HN4ZigjkbfhhI1JWfDmZkeXatXIgSNVUCstsrJCUlNlIlT9SWaUo8IWg N8T5tXRbESqPWixk1gk+FsmAKtU0vxETuKo578Wsz7nFY48hkVDEAUfWwsuWyIqGxFbq3m mCJpqdXRavt567WLtZT1rSSO6NdFuLamMz3JDAKDnosWf/5MM8bIXmuS5JzrcQ== 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 4XkVlR0PHSzXT2; Thu, 7 Nov 2024 05:20:35 +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 4A75KYZM014528; Thu, 7 Nov 2024 05:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A75KYrK014525; Thu, 7 Nov 2024 05:20:34 GMT (envelope-from git) Date: Thu, 7 Nov 2024 05:20:34 GMT Message-Id: <202411070520.4A75KYrK014525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d7214577ff00 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d7214577ff00221ac84a85e61794a5e126b952dd Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d7214577ff00221ac84a85e61794a5e126b952dd commit d7214577ff00221ac84a85e61794a5e126b952dd Author: Konstantin Belousov AuthorDate: 2024-11-01 19:20:17 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-07 05:14:38 +0000 rtld: make it easier to add sparce non-default members to ld_env_var_desc by making the LD_ENV_DESC() macro variadic. Suggested by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D47351 --- 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 c670ec7f0009..7c61fec44ef7 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -348,8 +348,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),