diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp index f8196e460ae9c..cc21844b26350 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp @@ -428,7 +428,7 @@ unsigned ARMAsmBackend::adjustFixupValue(const MCAssembler &Asm, // signed 16bit range. if ((Kind == ARM::fixup_arm_movw_lo16 || Kind == ARM::fixup_arm_movt_hi16 || Kind == ARM::fixup_t2_movw_lo16 || Kind == ARM::fixup_t2_movt_hi16) && - (Addend < minIntN(16) || Addend > maxIntN(16))) { + !IsResolved && (Addend < minIntN(16) || Addend > maxIntN(16))) { Ctx.reportError(Fixup.getLoc(), "Relocation Not In Range"); return 0; } diff --git a/llvm/test/MC/ARM/arm-movt-movw-absolute-pass.s b/llvm/test/MC/ARM/arm-movt-movw-absolute-pass.s new file mode 100644 index 0000000000000..21239504bd46c --- /dev/null +++ b/llvm/test/MC/ARM/arm-movt-movw-absolute-pass.s @@ -0,0 +1,9 @@ +@RUN: llvm-mc -triple armv7-eabi -filetype obj %s -o - | llvm-objdump -d --triple armv7-eabi - | FileCheck %s + +a: + movw r1, #:lower16:b - a + 65536 + movt r1, #:upper16:b - a + 65536 +b: + +@CHECK: 0: e3001008 movw r1, #0x8 +@CHECK: 4: e3401001 movt r1, #0x1