Skip to content
This repository has been archived by the owner on Feb 5, 2019. It is now read-only.

ARM: correct the relocation type for bl on WoA #129

Merged
merged 1 commit into from
Sep 21, 2018
Merged

ARM: correct the relocation type for bl on WoA #129

merged 1 commit into from
Sep 21, 2018

Conversation

jordanrh1
Copy link

Cherry pick /llvm-mirror/llvm#b8d7ba6811da32b73578d3512806483a8014e608 to fix object file generation for windows/arm


The IMAGE_REL_ARM_BRANCH20T applies only to a b.w instruction. A
thumb-2 bl should be relocated using a IMAGE_REL_ARM_BRANCH24T.
Correct the relocation that we emit in such a case.

Resolves PR38620! Based on the patch by Jordan Rhee!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342109 91177308-0d34-0410-b5e6-96231b3b80d8

The `IMAGE_REL_ARM_BRANCH20T` applies only to a `b.w` instruction.  A
thumb-2 `bl` should be relocated using a `IMAGE_REL_ARM_BRANCH24T`.
Correct the relocation that we emit in such a case.

Resolves PR38620!  Based on the patch by Jordan Rhee!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342109 91177308-0d34-0410-b5e6-96231b3b80d8
@alexcrichton alexcrichton merged commit ee7a104 into rust-lang:rust-llvm-release-8-0-0-v1 Sep 21, 2018
@alexcrichton
Copy link
Member

Thanks!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants