diff options
| author | Owen Anderson <resistor@mac.com> | 2010-12-10 22:53:48 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2010-12-10 22:53:48 +0000 |
| commit | 5fd873d8e83e485aef79c1f5fa1704748500ca8b (patch) | |
| tree | 5ca9c20470a49e477ae992482026d3545edf1e9d /lib | |
| parent | e2e0f58809374265bd75edeefae8817e7ade62b4 (diff) | |
| download | external_llvm-5fd873d8e83e485aef79c1f5fa1704748500ca8b.zip external_llvm-5fd873d8e83e485aef79c1f5fa1704748500ca8b.tar.gz external_llvm-5fd873d8e83e485aef79c1f5fa1704748500ca8b.tar.bz2 | |
Fix merge error in my last fix to Thumb2 vldr fixups.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121588 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/ARM/ARMMCCodeEmitter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/ARM/ARMMCCodeEmitter.cpp b/lib/Target/ARM/ARMMCCodeEmitter.cpp index c02d85b..35f2bbd 100644 --- a/lib/Target/ARM/ARMMCCodeEmitter.cpp +++ b/lib/Target/ARM/ARMMCCodeEmitter.cpp @@ -54,7 +54,7 @@ public: MCFixupKindInfo::FKF_IsAligned}, { "fixup_arm_pcrel_10", 1, 24, MCFixupKindInfo::FKF_IsPCRel }, { "fixup_t2_pcrel_10", 0, 32, MCFixupKindInfo::FKF_IsPCRel | - MCFixupKindInfo::FKF_IsPCRel }, + MCFixupKindInfo::FKF_IsAligned}, { "fixup_arm_adr_pcrel_12", 1, 24, MCFixupKindInfo::FKF_IsPCRel }, { "fixup_arm_branch", 1, 24, MCFixupKindInfo::FKF_IsPCRel }, { "fixup_t2_branch", 0, 32, MCFixupKindInfo::FKF_IsPCRel | |