diff options
| author | Jim Grosbach <grosbach@apple.com> | 2012-02-27 21:36:23 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2012-02-27 21:36:23 +0000 |
| commit | 7b25ecf6adbf3c4709c48033acfeb6ebbb4452ab (patch) | |
| tree | 649c04d8126e29b74b9881df0434fadd4aec39d9 /lib/MC | |
| parent | 945c2b3965a5d327055f624dd5dab659551da108 (diff) | |
ARM BL/BLX instruction fixups should use relocations.
We on the linker to resolve calls to the appropriate BL/BLX instruction
to make interworking function correctly. It uses the symbol in the
relocation to do that, so we need to be careful about being too clever.
To enable this for ARM mode, split the BL/BLX fixup kind off from the
unconditional-branch fixups.
rdar://10927209
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151571 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC')
| -rw-r--r-- | lib/MC/MCAssembler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/MC/MCAssembler.cpp b/lib/MC/MCAssembler.cpp index c041f65640..a2aaf4e835 100644 --- a/lib/MC/MCAssembler.cpp +++ b/lib/MC/MCAssembler.cpp @@ -299,8 +299,10 @@ bool MCAssembler::evaluateFixup(const MCAsmLayout &Layout, Value -= Offset; } - // Let the backend adjust the fixup value if necessary. - Backend.processFixupValue(*this, Layout, Fixup, DF, Target, Value); + // Let the backend adjust the fixup value if necessary, including whether + // we need a relocation. + Backend.processFixupValue(*this, Layout, Fixup, DF, Target, Value, + IsResolved); return IsResolved; } |