[PS5][Driver] Restore whole-archive state when -fjmc
#115181
Conversation
`--whole-archive` is passed to the linker to have it consume all objects within the SIE Just My Code library, rather than just those that fulfil outstanding references. Prior to this change, `--no-whole-archive` was used to reset the associated archive handling state in the linker, under the assumption that `--whole-archive` wasn't already in effect. But that assumption may be incorrect. So use `--push/pop-state` to restore the previous state, whatever that may be. Given the position of these switches on the link line, the problem described with the outgoing code is unlikely to cause an issue in practice. But push/pop protect against accidents due to future additions to and reorderings of arguments. PS5 only. The proprietary PS4 linker doesn't support `--push/pop-state`, or an equivalent. SIE tracker: TOOLCHAIN-16704.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-driver @llvm/pr-subscribers-clang Author: Edd Dawson (playstation-edd) Changes
Prior to this change, Given the position of these switches on the link line, the problem described with the outgoing code is unlikely to cause an issue in practice. But push/pop protect against accidents due to future additions to and reorderings of arguments. PS5 only. The proprietary PS4 linker doesn't support SIE tracker: TOOLCHAIN-16704. Full diff: https://github.com/llvm/llvm-project/pull/115181.diff 2 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp b/clang/lib/Driver/ToolChains/PS4CPU.cpp
index 261c136de782e7..df43da93d77555 100644
--- a/clang/lib/Driver/ToolChains/PS4CPU.cpp
+++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp
@@ -375,9 +375,10 @@ void tools::PS5cpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
}
if (UseJMC) {
+ CmdArgs.push_back("--push-state");
CmdArgs.push_back("--whole-archive");
CmdArgs.push_back("-lSceJmc_nosubmission");
- CmdArgs.push_back("--no-whole-archive");
+ CmdArgs.push_back("--pop-state");
}
if (Args.hasArg(options::OPT_fuse_ld_EQ)) {
diff --git a/clang/test/Driver/ps5-linker.c b/clang/test/Driver/ps5-linker.c
index 8a0ade91871295..fb5f8a9ec5cee5 100644
--- a/clang/test/Driver/ps5-linker.c
+++ b/clang/test/Driver/ps5-linker.c
@@ -95,7 +95,7 @@
// CHECK: -plugin-opt=-enable-jmc-instrument
// Check the default library name.
-// CHECK-LIB: "--whole-archive" "-lSceJmc_nosubmission" "--no-whole-archive"
+// CHECK-LIB: "--push-state" "--whole-archive" "-lSceJmc_nosubmission" "--pop-state"
// Test the driver's control over the -fcrash-diagnostics-dir behavior with linker flags.
|
jmorse
left a comment
jmorse
left a comment
There was a problem hiding this comment.
LGTM, although maybe CHECK_JMC instead of CHECK_LIB as it seems very JMC specific? No strong opinion.
Done - thanks. |
3 participants
--whole-archiveis passed to the linker to have it consume all objects within the SIE Just My Code library, rather than just those that fulfil outstanding references.Prior to this change,
--no-whole-archivewas used to reset the associated archive handling state in the linker, under the assumption that--whole-archivewasn't already in effect. But that assumption may be incorrect. So use--push/pop-stateto restore the previous state, whatever that may be.Given the position of these switches on the link line, the problem described with the outgoing code is unlikely to cause an issue in practice. But push/pop protect against accidents due to future additions to and reorderings of arguments.
PS5 only. The proprietary PS4 linker doesn't support
--push/pop-state, or an equivalent.SIE tracker: TOOLCHAIN-16704.