maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[COFF, ARM64] Hook up a few remaining relocations 

Differential Revision: https://reviews.llvm.org/D46355

llvm-svn: 331384
This commit is contained in:
Martin Storsjo 2018-05-02 18:24:37 +00:00
parent 07e612340f
commit d0b5034b8a
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/Target/AArch64/MCTargetDesc/AArch64WinCOFFObjectWriter.cpp
View File

@ -96,9 +96,18 @@ unsigned AArch64WinCOFFObjectWriter::getRelocType(
} }
return COFF::IMAGE_REL_ARM64_PAGEOFFSET_12L; return COFF::IMAGE_REL_ARM64_PAGEOFFSET_12L;
case AArch64::fixup_aarch64_pcrel_adr_imm21:
return COFF::IMAGE_REL_ARM64_REL21;
case AArch64::fixup_aarch64_pcrel_adrp_imm21: case AArch64::fixup_aarch64_pcrel_adrp_imm21:
return COFF::IMAGE_REL_ARM64_PAGEBASE_REL21; return COFF::IMAGE_REL_ARM64_PAGEBASE_REL21;
case AArch64::fixup_aarch64_pcrel_branch14:
return COFF::IMAGE_REL_ARM64_BRANCH14;
case AArch64::fixup_aarch64_pcrel_branch19:
return COFF::IMAGE_REL_ARM64_BRANCH19;
case AArch64::fixup_aarch64_pcrel_branch26: case AArch64::fixup_aarch64_pcrel_branch26:
case AArch64::fixup_aarch64_pcrel_call26: case AArch64::fixup_aarch64_pcrel_call26:
return COFF::IMAGE_REL_ARM64_BRANCH26; return COFF::IMAGE_REL_ARM64_BRANCH26;

13
llvm/test/MC/AArch64/coff-relocations.s
View File

@ -52,6 +52,15 @@ add x0, x0, :secrel_hi12:foo
; IMAGE_REL_ARM64_SECREL_LOW12L ; IMAGE_REL_ARM64_SECREL_LOW12L
ldr x0, [x0, :secrel_lo12:foo] ldr x0, [x0, :secrel_lo12:foo]
; IMAGE_REL_ARM64_REL21
adr x0, foo + 0x12345
; IMAGE_REL_ARM64_BRANCH19
bne target
; IMAGE_REL_ARM64_BRANCH14
tbz x0, #0, target
; CHECK: Format: COFF-ARM64 ; CHECK: Format: COFF-ARM64
; CHECK: Arch: aarch64 ; CHECK: Arch: aarch64
; CHECK: AddressSize: 64bit ; CHECK: AddressSize: 64bit
@ -74,6 +83,9 @@ ldr x0, [x0, :secrel_lo12:foo]
; CHECK: 0x40 IMAGE_REL_ARM64_SECREL_LOW12A foo ; CHECK: 0x40 IMAGE_REL_ARM64_SECREL_LOW12A foo
; CHECK: 0x44 IMAGE_REL_ARM64_SECREL_HIGH12A foo ; CHECK: 0x44 IMAGE_REL_ARM64_SECREL_HIGH12A foo
; CHECK: 0x48 IMAGE_REL_ARM64_SECREL_LOW12L foo ; CHECK: 0x48 IMAGE_REL_ARM64_SECREL_LOW12L foo
; CHECK: 0x4C IMAGE_REL_ARM64_REL21 foo
; CHECK: 0x50 IMAGE_REL_ARM64_BRANCH19 target
; CHECK: 0x54 IMAGE_REL_ARM64_BRANCH14 target
; CHECK: } ; CHECK: }
; CHECK: ] ; CHECK: ]
@ -84,3 +96,4 @@ ldr x0, [x0, :secrel_lo12:foo]
; DISASM: 40: 00 00 00 91 add x0, x0, #0 ; DISASM: 40: 00 00 00 91 add x0, x0, #0
; DISASM: 44: 00 00 40 91 add x0, x0, #0, lsl #12 ; DISASM: 44: 00 00 40 91 add x0, x0, #0, lsl #12
; DISASM: 48: 00 00 40 f9 ldr x0, [x0] ; DISASM: 48: 00 00 40 f9 ldr x0, [x0]
; DISASM: 4c: 20 1a 09 30 adr x0, #74565