Fix hijack and zpoline parallel build and drop .WAIT from test targets#616
Merged
tavip merged 2 commits intolkl:masterfrom Sep 4, 2025
Conversation
This is a follow up change for commit 3c97822 ("lkl: add tests build barrier") tracked via lkl#558. The hijack and zpoline libraries also share object files, so need extra logic to avoid parallel build failures. Add a new intermediate libhijack-priv-in.o prerequisite for the hijack libraries, avoiding the .WAIT target which breaks make libraries_install on older (e.g. 4.2.1) versions of make. The existing liblkl$(SOSUF) target is currently unmatched, so fix it and use it as a linker target which omits libhijack-priv-in.o. Signed-off-by: David Disseldorp <ddiss@suse.de>
This effectively reverts commit 3c97822 ("lkl: add tests build barrier"), replacing the tests .WAIT barrier with a common-object prerequisite to keep parallel builds working. Prerequisites are preferable to explicit .WAIT barriers, as they better allow for build concurrency and also avoid install target breakage described in the previous commit. One minor drawback is that some of the test binaries don't use any cla.o symbols, but get linked nevertheless. E.g. Before: text data bss dec hex filename 7878818 4851995 885880 13616693 cfc635 tools/lkl/tests/boot After: text data bss dec hex filename 7880494 4852094 885856 13618444 cfcd0c tools/lkl/tests/boot I don't see it as a problem, but if it is then we could split up the prerequisites. Signed-off-by: David Disseldorp <ddiss@suse.de>
tavip
approved these changes
Sep 4, 2025
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
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 is a minor follow up atop #612 , to use the same build-prerequisite approach (instead of
.WAIT) for parallel builds.