diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2015-04-27 15:13:17 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2015-04-27 15:13:17 +0000 |
| commit | d31aadf5154e5b9af19713bc140089c3fa27a53e (patch) | |
| tree | e8109e8c7919563da61c59d52ac0f88756fb41a0 | |
| parent | a480ef5494cd9624fb253a86f55bf9e25bf0ae6e (diff) | |
| download | bcm5719-llvm-d31aadf5154e5b9af19713bc140089c3fa27a53e.tar.gz bcm5719-llvm-d31aadf5154e5b9af19713bc140089c3fa27a53e.zip | |
Add missing snippets from r235880
llvm-svn: 235890
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp | 3 | ||||
| -rw-r--r-- | lld/test/elf/ARM/rel-v4bx.test | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp index 74aed57ecf6..cc6328da8df 100644 --- a/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp @@ -652,6 +652,9 @@ std::error_code ARMTargetRelocationHandler::applyRelocation( case R_ARM_IRELATIVE: // Runtime only relocations. Ignore here. break; + case R_ARM_V4BX: + // TODO implement + break; default: return make_unhandled_reloc_error(); } diff --git a/lld/test/elf/ARM/rel-v4bx.test b/lld/test/elf/ARM/rel-v4bx.test index b843d88c740..348a6bdcd90 100644 --- a/lld/test/elf/ARM/rel-v4bx.test +++ b/lld/test/elf/ARM/rel-v4bx.test @@ -8,13 +8,10 @@ # CHECK: Disassembly of section .text: # CHECK: main: -# CHECK: 400114: 03 30 8f e0 add r3, pc, r3 -# CHECK: 400118: 02 20 93 e7 ldr r2, [r3, r2] -# CHECK: 40011c: 00 00 52 e3 cmp r2, #0 # The following instruction creates a RM_ARM_V4BX relocation that # allows the linker to replace the bx instruction to a ARMv4 # compatible one. Currently lld does not change it. -# CHECK: 400120: 1e ff 2f 01 bxeq lr +# CHECK: 400114: 1e ff 2f 01 bxeq lr --- FileHeader: @@ -28,7 +25,7 @@ Sections: Type: SHT_PROGBITS Flags: [ SHF_ALLOC, SHF_EXECINSTR ] AddressAlign: 0x0000000000000004 - Content: 03308FE0022093E7000052E31EFF2F01 + Content: 1EFF2F01 - Name: .rel.text Type: SHT_REL Flags: [ SHF_INFO_LINK ] @@ -36,7 +33,7 @@ Sections: AddressAlign: 0x0000000000000004 Info: .text Relocations: - - Offset: 0x000000000000000C + - Offset: 0x0000000000000000 Symbol: '' Type: R_ARM_V4BX - Name: .data |
