diff options
| author | Tim Northover <tnorthover@apple.com> | 2014-04-16 15:27:52 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2014-04-16 15:27:52 +0000 |
| commit | 3e69958b6b09a6cddc02eec185e3ace68e0670be (patch) | |
| tree | 6a3c3900b458d763bbb1c8d102b7c5c71182020f /llvm | |
| parent | 5e73df5cf0f344656604731c6ea055401c7752d3 (diff) | |
| download | bcm5719-llvm-3e69958b6b09a6cddc02eec185e3ace68e0670be.tar.gz bcm5719-llvm-3e69958b6b09a6cddc02eec185e3ace68e0670be.zip | |
AArch64/ARM64: produce correct relocation for conditional branches.
llvm-svn: 206391
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/ARM64/MCTargetDesc/ARM64ELFObjectWriter.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/MC/AArch64/elf-reloc-condbr.s | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM64/MCTargetDesc/ARM64ELFObjectWriter.cpp b/llvm/lib/Target/ARM64/MCTargetDesc/ARM64ELFObjectWriter.cpp index 1a132a17ffc..7779b824e0c 100644 --- a/llvm/lib/Target/ARM64/MCTargetDesc/ARM64ELFObjectWriter.cpp +++ b/llvm/lib/Target/ARM64/MCTargetDesc/ARM64ELFObjectWriter.cpp @@ -83,7 +83,11 @@ unsigned ARM64ELFObjectWriter::GetRelocType(const MCValue &Target, case ARM64::fixup_arm64_pcrel_call26: return ELF::R_AARCH64_CALL26; case ARM64::fixup_arm64_pcrel_imm19: - return ELF::R_AARCH64_TLSIE_LD_GOTTPREL_PREL19; + // A bit of an oddity here: shared by both "ldr x0, :gottprel:var" and + // "b.eq var". + if (SymLoc == ARM64MCExpr::VK_GOTTPREL) + return ELF::R_AARCH64_TLSIE_LD_GOTTPREL_PREL19; + return ELF::R_AARCH64_CONDBR19; default: llvm_unreachable("Unsupported pc-relative fixup kind"); } diff --git a/llvm/test/MC/AArch64/elf-reloc-condbr.s b/llvm/test/MC/AArch64/elf-reloc-condbr.s index b70dfa70fb8..9b70a20e1bc 100644 --- a/llvm/test/MC/AArch64/elf-reloc-condbr.s +++ b/llvm/test/MC/AArch64/elf-reloc-condbr.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \ +// RUN: llvm-mc -triple=arm64-none-linux-gnu -filetype=obj %s -o - | \ // RUN: llvm-readobj -r | FileCheck -check-prefix=OBJ %s b.eq somewhere |
