[android] Fix original-defined-attr test for Android 32 bits. #28542
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 32 bits, the first parameter is the pointer size, so it is different for 32 and 64 bits. Add an additional check prefix with the pointer size and match for both pointer sizes. Works in both 32 and 64 bits targets.
nkcsgexi
approved these changes
Dec 3, 2019
|
Thanks for accepting! @swift-ci please test |
This was referenced Dec 4, 2019
DougGregor
approved these changes
Dec 4, 2019
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 32 bits, the first parameter is the pointer size, so it is different
for 32 and 64 bits. Add an additional check prefix with the pointer size
and match for both pointer sizes. Works in both 32 and 64 bits targets.
Introduced in #28528 and first seen in https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/4613/
(An alternative would be using the SDK name or similar, but I think this is a case of pointer size)