From: Owen Anderson Date: Fri, 10 Dec 2010 22:53:48 +0000 (+0000) Subject: Fix merge error in my last fix to Thumb2 vldr fixups. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5fd873d8e83e485aef79c1f5fa1704748500ca8b;p=oota-llvm.git 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 --- diff --git a/lib/Target/ARM/ARMMCCodeEmitter.cpp b/lib/Target/ARM/ARMMCCodeEmitter.cpp index c02d85bfd42..35f2bbd1df7 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 |