[llvm-commits] [llvm] r121588 - /llvm/trunk/lib/Target/ARM/ARMMCCodeEmitter.cpp

Owen Anderson resistor at mac.com
Fri Dec 10 14:53:48 PST 2010


Author: resistor
Date: Fri Dec 10 16:53:48 2010
New Revision: 121588

URL: http://llvm.org/viewvc/llvm-project?rev=121588&view=rev
Log:
Fix merge error in my last fix to Thumb2 vldr fixups.

Modified:
    llvm/trunk/lib/Target/ARM/ARMMCCodeEmitter.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMMCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMCCodeEmitter.cpp?rev=121588&r1=121587&r2=121588&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMMCCodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMMCCodeEmitter.cpp Fri Dec 10 16:53:48 2010
@@ -54,7 +54,7 @@
                                                 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 |





More information about the llvm-commits mailing list