d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtld: Add ${TOKEN} aliases to $TOKEN

Browse Source 
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
This commit is contained in:
Konstantin Belousov 2022-02-11 15:46:05 +02:00
parent 55abf23dd3
commit b1b5174123
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/rtld-elf/rtld.c
View File

@ -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 *