From nobody Fri Feb 11 18:01:57 2022 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 D2A4F19BD920; Fri, 11 Feb 2022 18:01:57 +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 4JwLzT5BfWz3HF5; Fri, 11 Feb 2022 18:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644602517; 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=FQ1DsnhlLxrnEo4nqh+hgyn73y+SJrI8+1+/bTyTMnw=; b=Eh+3g6ptliNg/8w3DcZ17oRc0I5ps/ADEe2K/G3jgaZFgVqjC6Bee1It4TkcD8pTDMxj53 Y9+mOIWCMZ1KFXU8WTqoBee6jg5CDPUEBL+Ff19VA+Rjqcjc9vdfqXyS/AWJ/M32X90wIP fkha4H3XUmmMN7VUn1/JD3O/vh8a2BMMrMJ69d17QELfzeGE3vizqqzcSi45d4BEcooAWj 5PvK5jgUvDh5J+TLSh2GsVOk+OhMWYksXtxrDKHLIfwXDhFRDVQ1KaxZDZ1nbs4bpAwiv+ 0Eiafy+IK/sofKJEwNu1TmFBcu98SHcpcDbk7lk0L9PrFj9lFGezOtZtJeCDvQ== 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 9302318955; Fri, 11 Feb 2022 18:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21BI1v0S025565; Fri, 11 Feb 2022 18:01:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BI1vYq025564; Fri, 11 Feb 2022 18:01:57 GMT (envelope-from git) Date: Fri, 11 Feb 2022 18:01:57 GMT Message-Id: <202202111801.21BI1vYq025564@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: b1b517412342 - main - rtld: Add ${TOKEN} aliases to $TOKEN 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1b517412342f336a8e6d153130b2f4110e0285b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644602517; 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=FQ1DsnhlLxrnEo4nqh+hgyn73y+SJrI8+1+/bTyTMnw=; b=qUG/1p4lU8/+iIbGUFwAHsQMPrAjsTlEZU6LFF0N2V8iHQSRLKRB9aMYuNdatysfigIbRK oQXnWT4FJB3QNKczL9+Y8CqojeQ7y/AMM5AvYgpI+XOdKjm9YDGbTF0zEDsn11zThbEvO3 oWKkT/4VMDuxEyhwIpgqCeUe263oU4RmiuCR60dZfcVTBUEZ9QEmSRn/0DFB+Q59i/gDQj 38NXqrOHdGMksyYxA+kO/pHT5/sjBjnk2+YeR3WC8Y7clRAjxnFh4sKGfPFB4BpIS4ci4d 0ZTqRAhX02COQpfHp811+Qa1nhPu9c9Y91/0QBrLYC3U87nRLBPJrZAOTtUcfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644602517; a=rsa-sha256; cv=none; b=jymLnD68n7rA1potX4ug4gix+si7/I/bnABRI3u3NCiyx2tYQJ+BOb/7bkbL8hKboLjqXZ b2jehuuzGXVN78Hz5xOYs4I14XyQH8dpRdH3zqY1ug9BBPvbYir3OEoE568UTFMQLNSDR1 AYuz5PNJenN3Sj6mO0FDBKn+Fx7cy+P0nGbby8Gt8ok1yUgT5SqluE9gjK3tL1JldHWDvu OR5QONn5C44oefP7B7Nzgmgwt9byLQ0xDrKJpHBXwA6fgC62JpkPBvYleKRxEuTzxPo3hm OG3GWr2gfxmXoeSi9QqacnxpfiS435DFS4junm2HV7EyL1t0V9DNShnRpHvqag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b1b517412342f336a8e6d153130b2f4110e0285b commit b1b517412342f336a8e6d153130b2f4110e0285b Author: Konstantin Belousov AuthorDate: 2022-02-11 13:46:05 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-11 18:01:20 +0000 rtld: Add ${TOKEN} aliases to $TOKEN it seems that glibc supports them, and such spelling is mentioned in the ld.bfd manual. Idea seems to auto-correct some quoting/makefile sytnax errors on linker command line. Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34247 --- libexec/rtld-elf/rtld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 63b921ff2503..9ab84b3e3fa3 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1181,9 +1181,13 @@ static const struct { const char *subst; } tokens[] = { { .kw = "$ORIGIN", .pass_obj = true, .subst = NULL }, + { .kw = "${ORIGIN}", .pass_obj = true, .subst = NULL }, { .kw = "$OSNAME", .pass_obj = false, .subst = uts.sysname }, + { .kw = "${OSNAME}", .pass_obj = false, .subst = uts.sysname }, { .kw = "$OSREL", .pass_obj = false, .subst = uts.release }, + { .kw = "${OSREL}", .pass_obj = false, .subst = uts.release }, { .kw = "$PLATFORM", .pass_obj = false, .subst = uts.machine }, + { .kw = "${PLATFORM}", .pass_obj = false, .subst = uts.machine }, }; static char *