[llvm-commits] [llvm] r121772 - in /llvm/trunk: lib/Target/ARM/ARMMCCodeEmitter.cpp test/MC/ARM/arm_fixups.s

[Daniel Dunbar]

Author: ddunbar
Date: Tue Dec 14 11:37:16 2010
New Revision: 121772

URL: http://llvm.org/viewvc/llvm-project?rev=121772&view=rev
Log:
MC/ARM: Fix-up fixup offset for fixup_arm_branch target specific fixup.

Added:
    llvm/trunk/test/MC/ARM/arm_fixups.s
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=121772&r1=121771&r2=121772&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMMCCodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMMCCodeEmitter.cpp Tue Dec 14 11:37:16 2010
@@ -58,7 +58,7 @@
 { "fixup_arm_adr_pcrel_12",  1,            24,  MCFixupKindInfo::FKF_IsPCRel },
 { "fixup_t2_adr_pcrel_12",   0,            32,  MCFixupKindInfo::FKF_IsPCRel |
                                                 MCFixupKindInfo::FKF_IsAligned},
-{ "fixup_arm_branch",        1,            24,  MCFixupKindInfo::FKF_IsPCRel },
+{ "fixup_arm_branch",        0,            24,  MCFixupKindInfo::FKF_IsPCRel },
 { "fixup_t2_condbranch",     0,            32,  MCFixupKindInfo::FKF_IsPCRel },
 { "fixup_t2_uncondbranch",   0,            32,  MCFixupKindInfo::FKF_IsPCRel },
 { "fixup_arm_thumb_br",      0,            16,  MCFixupKindInfo::FKF_IsPCRel },

Added: llvm/trunk/test/MC/ARM/arm_fixups.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/arm_fixups.s?rev=121772&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/arm_fixups.s (added)
+++ llvm/trunk/test/MC/ARM/arm_fixups.s Tue Dec 14 11:37:16 2010
@@ -0,0 +1,7 @@
+// RUN: llvm-mc -triple arm-unknown-unknown %s --show-encoding > %t
+// RUN: FileCheck < %t %s
+
+// CHECK: bl _printf @ encoding: [A,A,A,0xeb]
+// CHECK: @ fixup A - offset: 0, value: _printf, kind: fixup_arm_branch
+bl _printf
+        
\ No newline at end of file