Expand =/$SYSROOT for INPUT/GROUP script commands#950
Open
parth-07 wants to merge 1 commit intoqualcomm:mainfrom
Open
Expand =/$SYSROOT for INPUT/GROUP script commands#950parth-07 wants to merge 1 commit intoqualcomm:mainfrom
parth-07 wants to merge 1 commit intoqualcomm:mainfrom
Conversation
This commit improves the script parser to expand the = and $SYSROOT prefix in INPUT/GROUP inputs. Resolves qualcomm#927 Signed-off-by: Parth Arora <partaror@qti.qualcomm.com>
parth-07
force-pushed
the
SysrootExpansion
branch
3 times, most recently
from
b5640a0 to
c91146e
Compare
quic-seaswara
requested changes
Mar 18, 2026
Contributor
quic-seaswara
left a comment
quic-seaswara
left a comment
There was a problem hiding this comment.
This is very cool feature!
| InputStrTok = | ||
| ThisScriptFile.createFileToken(Name.str(), ThisScriptFile.asNeeded()); | ||
| ThisScriptFile.createFileToken(ExpandedName, ThisScriptFile.asNeeded()); | ||
| } |
Contributor
There was a problem hiding this comment.
This needs to be done in resolvePath
For example
ld.bfd --sysroot=/tmp/xxx/ =main.o
I could not find this expansion of $SYSROOT for input files, may be I am not using the right version of ld.
| if (Name.starts_with("=")) | ||
| Suffix = Name.substr(1); | ||
| else if (Name.starts_with("$SYSROOT")) | ||
| Suffix = Name.substr(8); // strlen("$SYSROOT") == 8 |
Contributor
There was a problem hiding this comment.
Name.substr(strlen("$SYSROOT")) or create a function to get the suffix.
| @@ -0,0 +1 @@ | |||
| GROUP(=/lib64/lib1.so) | |||
Contributor
There was a problem hiding this comment.
Can you add GROUP($SYSROOT) as well?
| RUN: %link %linkopts -o %t.out2 --sysroot=%t.dir -T %p/Inputs/script_sysroot.t %t.main.o --verbose 2>&1 | %filecheck %s --check-prefix=SYSROOT | ||
| RUN: %link %linkopts -o %t.out3 --sysroot=%t.dir -T %p/Inputs/group_equals.t %t.main.o --verbose 2>&1 | %filecheck %s --check-prefix=GROUP | ||
| RUN: %not %link %linkopts -o %t.out4 -T %p/Inputs/script_equals.t %t.main.o 2>&1 | %filecheck %s --check-prefix=NOSYSROOT | ||
| #END_TEST |
Contributor
There was a problem hiding this comment.
Need verbose output to show how the files are resolved.
Also please annotate map file to show what files are being expanded.
| void ScriptParser::addFile(StringRef Name) { | ||
| StrToken *InputStrTok = nullptr; | ||
| if (Name.consume_front("-l")) | ||
| InputStrTok = ThisScriptFile.createNameSpecToken(Name.str(), |
Contributor
There was a problem hiding this comment.
What does ld for namespec files ?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit improves the script parser to expand
the = and $SYSROOT prefix in INPUT/GROUP inputs.
Resolves #927