git: 6914c8ff5df1 - stable/13 - rtld: Add ${TOKEN} aliases to $TOKEN

From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Fri, 18 Feb 2022 02:01:31 UTC
The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=6914c8ff5df1c192e801f209bb520d923a8b3794

commit 6914c8ff5df1c192e801f209bb520d923a8b3794
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2022-02-11 13:46:05 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-02-18 02:01:24 +0000

    rtld: Add ${TOKEN} aliases to $TOKEN
    
    (cherry picked from commit b1b517412342f336a8e6d153130b2f4110e0285b)
---
 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 c2fa85a27224..b495c5f5d8a8 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -1185,9 +1185,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 *