Allow overriding linker scripts in built-in targets #97749
Closed
Conversation
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
rustbot
added
the
T-compiler
|
r? @davidtwco (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
petrochenkov
reviewed
Jun 5, 2022
| || arg.starts_with("-dT") | ||
| } | ||
| // Omit the embedded linker script if a user supplied one | ||
| if sess.opts.cg.link_args.iter().any(|arg| is_script_arg(arg)) { |
There was a problem hiding this comment.
rustc should not try interpreting raw linker arguments.
Maybe rustc can use --default-script for the target-specified script to be overridable?
There was a problem hiding this comment.
We should probably use --default-script, but lld doesn't support it yet so that would break the workflow for the psp target so I'll close this PR for now.
petrochenkov
added
S-waiting-on-author
|
Ping from triage: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR #72062 added the ability to include linker scripts with built-in targets. However, this only works for targets that never need to customize the ld script since it cannot be overridden. This commit checks user-supplied link args for ld scripts and omits the built-in script if another is found. Technically scripts may also be passed to ld without a flag (i.e. as if it were a .o), but detecting those requires opening and parsing the files specified in link args so I didn't check for those. I also considered changing
--scriptwith--defaultscript(which can be overridden), but lld doesn't support this. I'm not sure who should review this, but the PSP target (cc @overdrivenpotato) is the only one currently using built-in scripts and this shouldn't affect those users' workflow.For context, there's been interest in adding a playstation 1 target which would benefit from this change. Currently the required ld script is provided by the psx crate's
build.rs, but it would be nice to have a built-in target which just works without requiring any specific crate. The psx also needs customized ld scripts in some cases so the current built-in scripts are too inflexible.