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.
Follow up to #467.
This patch fixes the multilib mapping for
-mbranch-protection
.Firstly, the multilib flag to be inserted should be
-mbranch-protection=standard
as it is the flag expected by the PACBTI-M multilib variants.Secondly, the PACBTI-M variant should also match to configurations where the branch protection is restricted to only one of PAC or BTI, like in
-mbranch-protection=bti
or-mbranch-protection=pac-ret
. Before this patch, the variant would only match if both features were requested at the same time. This is safe to do because instructions from either feature have no effect if that feature is disabled at runtime.