[test][Linux] Improve Gold/LLD detection for function_sections.swift #73470
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
In swiftlang#72061 the test was modified because LLD and Gold linker map formats are different, so they need different CHECKs. The original method in PR swiftlang#72061 presents problems when the output is not exactly only one line. These changes use the first line of the linker map file to decide if the Gold or the LLD linker map checks should be used, since the format differs in both for the first line. This way of checking works in my Linux machine when using the default linker, when forcing Gold with `-use-ld=gold` and when forcing LLD with `-use-ld=lld`.
|
@swift-ci please test |
al45tair
approved these changes
May 7, 2024
|
Thanks for this. I was going to look at this this morning, but it looks like you've already found the problem. |
|
Looking at the build failure at the moment. |
|
Hmmm. Maybe it just didn't include the other fix we needed. My other PR built fine, and I can build locally just fine. |
|
@swift-ci Please test macOS platform |
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.
In #72061 the test was modified because LLD and Gold linker map formats are different, so they need different CHECKs. The original method in PR #72061 presents problems when the output is not exactly only one line.
These changes use the first line of the linker map file to decide if the Gold or the LLD linker map checks should be used, since the format differs in both for the first line.
This way of checking works in my Linux machine when using the default linker, when forcing Gold with
-use-ld=goldand when forcing LLD with-use-ld=lld.Additionally, the temporary directory is used for the outputs, or the non-temporary directory static archive
libFunctionSections.awill get more and more temporary objects added to it as one runs the test suite (clanginvokesarasar crs, which will "replace" the objects, but sinceclangis using a temporary object, the object names always have different suffixes, so nothing gets replaced).