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 | 7cdd2328959934326d0ee74a5b634c70c4e96bab (patch) | |
| tree | b03df011e6d6358c6d7472439e7fd06515568af7 /llvm/lib | |
| parent | 4743d7564075ca42b5f79b388961a80da9ea3b65 (diff) | |
| download | bcm5719-llvm-7cdd2328959934326d0ee74a5b634c70c4e96bab.tar.gz bcm5719-llvm-7cdd2328959934326d0ee74a5b634c70c4e96bab.zip | |
Fix merge error in my last fix to Thumb2 vldr fixups.
llvm-svn: 121588
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMMCCodeEmitter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMMCCodeEmitter.cpp b/llvm/lib/Target/ARM/ARMMCCodeEmitter.cpp index c02d85bfd42..35f2bbd1df7 100644 --- a/llvm/lib/Target/ARM/ARMMCCodeEmitter.cpp +++ b/llvm/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 | |
