From e98441590b73a59c05e36da893ee1530c536173b Mon Sep 17 00:00:00 2001 From: Will Newton Date: Wed, 26 Nov 2014 10:36:03 +0000 Subject: [PATCH] Update ARM ELF relocations to ABI 2.09 Add R_ARM_IRELATIVE. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222817 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/ELFRelocs/ARM.def | 3 ++- .../llvm-readobj/Inputs/relocs.obj.elf-arm | Bin 2100 -> 2112 bytes test/tools/llvm-readobj/Inputs/relocs.py | 1 + test/tools/llvm-readobj/reloc-types.test | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/llvm/Support/ELFRelocs/ARM.def b/include/llvm/Support/ELFRelocs/ARM.def index 99ae5756b32..730fc5b8836 100644 --- a/include/llvm/Support/ELFRelocs/ARM.def +++ b/include/llvm/Support/ELFRelocs/ARM.def @@ -3,7 +3,7 @@ #error "ELF_RELOC must be defined" #endif -// Meets 2.08 ABI Specs. +// Meets 2.09 ABI Specs. ELF_RELOC(R_ARM_NONE, 0x00) ELF_RELOC(R_ARM_PC24, 0x01) ELF_RELOC(R_ARM_ABS32, 0x02) @@ -135,3 +135,4 @@ ELF_RELOC(R_ARM_PRIVATE_15, 0x7f) ELF_RELOC(R_ARM_ME_TOO, 0x80) ELF_RELOC(R_ARM_THM_TLS_DESCSEQ16, 0x81) ELF_RELOC(R_ARM_THM_TLS_DESCSEQ32, 0x82) +ELF_RELOC(R_ARM_IRELATIVE, 0xa0) diff --git a/test/tools/llvm-readobj/Inputs/relocs.obj.elf-arm b/test/tools/llvm-readobj/Inputs/relocs.obj.elf-arm index 908507d20ab966d8e83d1def5412483ec3f1e5d9..206c933d478f7bfa4289c78702bf2338a008758b 100644 GIT binary patch delta 79 zcmdlYa6n*!0%OTWMR}%)0W6apm~t2eCa+~uW>sKeU{IKRl}VY=WwIi(_+$ZQ0WeD) eNP04>Gj5q&2qZ-|&t#s>!okDDz_5UofdK#)`w{m5 delta 67 zcmX>guti{k0%O5OMR}&lE=)O$Jd-yvDYMG3Ffd3=zR9G_=rH*&lRB6bpKQY{0A%?x St21txTnZ!wHqT|A%>n>!ni44h diff --git a/test/tools/llvm-readobj/Inputs/relocs.py b/test/tools/llvm-readobj/Inputs/relocs.py index ffddf3daaed..0a605ab85ae 100644 --- a/test/tools/llvm-readobj/Inputs/relocs.py +++ b/test/tools/llvm-readobj/Inputs/relocs.py @@ -808,6 +808,7 @@ class Relocs_Elf_ARM(Enum): R_ARM_ME_TOO = 0x80 R_ARM_THM_TLS_DESCSEQ16 = 0x81 R_ARM_THM_TLS_DESCSEQ32 = 0x82 + R_ARM_IRELATIVE = 0xa0 class Relocs_Elf_Mips(Enum): R_MIPS_NONE = 0 diff --git a/test/tools/llvm-readobj/reloc-types.test b/test/tools/llvm-readobj/reloc-types.test index 20c25380a96..b777c5d7549 100644 --- a/test/tools/llvm-readobj/reloc-types.test +++ b/test/tools/llvm-readobj/reloc-types.test @@ -364,6 +364,7 @@ ELF-ARM: Type: R_ARM_PRIVATE_15 (127) ELF-ARM: Type: R_ARM_ME_TOO (128) ELF-ARM: Type: R_ARM_THM_TLS_DESCSEQ16 (129) ELF-ARM: Type: R_ARM_THM_TLS_DESCSEQ32 (130) +ELF-ARM: Type: R_ARM_IRELATIVE (160) ELF-MIPS: Type: R_MIPS_NONE (0) ELF-MIPS: Type: R_MIPS_16 (1)