diff options
| author | Martin Storsjo <martin@martin.st> | 2017-12-14 08:56:36 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2017-12-14 08:56:36 +0000 |
| commit | 94d72b89d663e73e3178395e8a4f9bfafaff4b23 (patch) | |
| tree | 87d32ee0be310b8025686214f7db763cf78ed735 | |
| parent | 9603b8e3f5c49ec554513694ebcc495def3abf09 (diff) | |
| download | bcm5719-llvm-94d72b89d663e73e3178395e8a4f9bfafaff4b23.tar.gz bcm5719-llvm-94d72b89d663e73e3178395e8a4f9bfafaff4b23.zip | |
[COFF] Error out if 20 bit thumb branches are out of range
This is similar to what was added in SVN r277838 for 24 bit
branch instructions.
Differential Revision: https://reviews.llvm.org/D41163
llvm-svn: 320677
| -rw-r--r-- | lld/COFF/Chunks.cpp | 2 | ||||
| -rw-r--r-- | lld/test/COFF/Inputs/far-arm-thumb-abs20.s | 2 | ||||
| -rw-r--r-- | lld/test/COFF/arm-thumb-branch20-error.s | 10 |
3 files changed, 14 insertions, 0 deletions
diff --git a/lld/COFF/Chunks.cpp b/lld/COFF/Chunks.cpp index df98a041cd5..557b0265442 100644 --- a/lld/COFF/Chunks.cpp +++ b/lld/COFF/Chunks.cpp @@ -129,6 +129,8 @@ void applyMOV32T(uint8_t *Off, uint32_t V) { } static void applyBranch20T(uint8_t *Off, int32_t V) { + if (!isInt<21>(V)) + fatal("relocation out of range"); uint32_t S = V < 0 ? 1 : 0; uint32_t J1 = (V >> 19) & 1; uint32_t J2 = (V >> 18) & 1; diff --git a/lld/test/COFF/Inputs/far-arm-thumb-abs20.s b/lld/test/COFF/Inputs/far-arm-thumb-abs20.s new file mode 100644 index 00000000000..8483e32dc7f --- /dev/null +++ b/lld/test/COFF/Inputs/far-arm-thumb-abs20.s @@ -0,0 +1,2 @@ +.global too_far20 +too_far20 = 0x501004 diff --git a/lld/test/COFF/arm-thumb-branch20-error.s b/lld/test/COFF/arm-thumb-branch20-error.s new file mode 100644 index 00000000000..ec7d23b0532 --- /dev/null +++ b/lld/test/COFF/arm-thumb-branch20-error.s @@ -0,0 +1,10 @@ +// REQUIRES: arm +// RUN: llvm-mc -filetype=obj -triple=thumbv7a-windows-gnu %s -o %t.obj +// RUN: llvm-mc -filetype=obj -triple=thumbv7a-windows-gnu %S/Inputs/far-arm-thumb-abs20.s -o %t.far.obj +// RUN: not lld-link -entry:_start -subsystem:console %t.obj %t.far.obj -out:%t.exe 2>&1 | FileCheck %s + .syntax unified + .globl _start +_start: + bne too_far20 + +// CHECK: relocation out of range |
