From 029ba553bda1520d2c2cae8d2c1fae152972d088 Mon Sep 17 00:00:00 2001 From: Daniil Kovalev Date: Mon, 1 Jul 2024 20:38:20 +0300 Subject: [PATCH] Change relocs names according to: - https://github.com/ARM-software/abi-aa/pull/255 - https://github.com/ARM-software/abi-aa/pull/259 --- llvm/include/llvm/BinaryFormat/ELFRelocs/AArch64.def | 4 ++-- llvm/test/tools/llvm-readobj/ELF/reloc-types-aarch64.test | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/llvm/include/llvm/BinaryFormat/ELFRelocs/AArch64.def b/llvm/include/llvm/BinaryFormat/ELFRelocs/AArch64.def index ece8577fe219f4..6f0e948a98c5fa 100644 --- a/llvm/include/llvm/BinaryFormat/ELFRelocs/AArch64.def +++ b/llvm/include/llvm/BinaryFormat/ELFRelocs/AArch64.def @@ -154,10 +154,10 @@ ELF_RELOC(R_AARCH64_AUTH_MOVW_GOTOFF_G3, 0x8116) ELF_RELOC(R_AARCH64_AUTH_GOT_LD_PREL19, 0x8117) ELF_RELOC(R_AARCH64_AUTH_LD64_GOTOFF_LO15, 0x8118) ELF_RELOC(R_AARCH64_AUTH_ADR_GOT_PAGE, 0x8119) -ELF_RELOC(R_AARCH64_AUTH_GOT_LO12_NC, 0x811a) +ELF_RELOC(R_AARCH64_AUTH_LD64_GOT_LO12_NC, 0x811a) ELF_RELOC(R_AARCH64_AUTH_LD64_GOTPAGE_LO15, 0x811b) ELF_RELOC(R_AARCH64_AUTH_GOT_ADD_LO12_NC, 0x811c) -ELF_RELOC(R_AARCH64_AUTH_GOT_ADR_PREL21, 0x811d) +ELF_RELOC(R_AARCH64_AUTH_GOT_ADR_PREL_LO21, 0x811d) ELF_RELOC(R_AARCH64_AUTH_GLOB_DAT, 0xe201) ELF_RELOC(R_AARCH64_AUTH_TLSDESC, 0xe202) ELF_RELOC(R_AARCH64_AUTH_IRELATIVE, 0xe203) diff --git a/llvm/test/tools/llvm-readobj/ELF/reloc-types-aarch64.test b/llvm/test/tools/llvm-readobj/ELF/reloc-types-aarch64.test index 8111bfe71c10f9..2833c0b59ae13d 100644 --- a/llvm/test/tools/llvm-readobj/ELF/reloc-types-aarch64.test +++ b/llvm/test/tools/llvm-readobj/ELF/reloc-types-aarch64.test @@ -140,10 +140,10 @@ # CHECK: Type: R_AARCH64_AUTH_GOT_LD_PREL19 (33047) # CHECK: Type: R_AARCH64_AUTH_LD64_GOTOFF_LO15 (33048) # CHECK: Type: R_AARCH64_AUTH_ADR_GOT_PAGE (33049) -# CHECK: Type: R_AARCH64_AUTH_GOT_LO12_NC (33050) +# CHECK: Type: R_AARCH64_AUTH_LD64_GOT_LO12_NC (33050) # CHECK: Type: R_AARCH64_AUTH_LD64_GOTPAGE_LO15 (33051) # CHECK: Type: R_AARCH64_AUTH_GOT_ADD_LO12_NC (33052) -# CHECK: Type: R_AARCH64_AUTH_GOT_ADR_PREL21 (33053) +# CHECK: Type: R_AARCH64_AUTH_GOT_ADR_PREL_LO21 (33053) # CHECK: Type: R_AARCH64_AUTH_GLOB_DAT (57857) # CHECK: Type: R_AARCH64_AUTH_TLSDESC (57858) # CHECK: Type: R_AARCH64_AUTH_IRELATIVE (57859) @@ -294,10 +294,10 @@ Sections: - Type: R_AARCH64_AUTH_GOT_LD_PREL19 - Type: R_AARCH64_AUTH_LD64_GOTOFF_LO15 - Type: R_AARCH64_AUTH_ADR_GOT_PAGE - - Type: R_AARCH64_AUTH_GOT_LO12_NC + - Type: R_AARCH64_AUTH_LD64_GOT_LO12_NC - Type: R_AARCH64_AUTH_LD64_GOTPAGE_LO15 - Type: R_AARCH64_AUTH_GOT_ADD_LO12_NC - - Type: R_AARCH64_AUTH_GOT_ADR_PREL21 + - Type: R_AARCH64_AUTH_GOT_ADR_PREL_LO21 - Type: R_AARCH64_AUTH_GLOB_DAT - Type: R_AARCH64_AUTH_TLSDESC - Type: R_AARCH64_AUTH_IRELATIVE