[ELF][AArch64] Correct relocation codes for R_<CLS>_PLT32

[psmith]

Summary

The relocation codes for R_<CLS>_PLT32 are incorrectly in the dynamic relocation range that starts at 1024 for AArch64 and 180 for AArch64_32. Correct these codes so that they start at the next available static relocation code below TLS. The R_<CLS>_PLT32 description is currently in unpublished draft so this change corrects LLVM to match the values that will appear in the next release of ELF for the 64-bit Arm Architecture document.

[pcc]

llvm/include/llvm/BinaryFormat/ELFRelocs/AArch64.def

123

Shouldn't it be in the range [0x100..0x200)? This value is in the range used for TLS relocations, [0x200..0x300).

215

Likewise. It looks like [0x00..0x50) is the range for the aarch64_32 non-TLS relocations.

[psmith]

Thanks for the comments. When I made the change I looked at:

Static relocation codes for ELF64 object files begin at (257); dynamic ones at (1024). Both (0) and (256) should be accepted as values of R_AARCH64_NONE, the null relocation.
Static relocation codes for ELF32 object files begin at [1]; dynamic ones at [180].

I couldn't find anything about a TLS range, but it looks like there is one being observed even if it isn't explicitly called out. Let me know if you've spotted it?

I'll check with my colleagues tomorrow as I'll need to get the ABI change approved before updating here. My preference would be to move before the TLS relocations but it is probably not the end of the world as I don't think that there is any tool that could guarantee the TLS relocations were in a certain range to make a simpler isTLSReloc check.

[psmith]

I've moved the codes below the block of relocations representing TLS.

[MaskRay]

LGTM.

llvm/include/llvm/BinaryFormat/ELFRelocs/AArch64.def

 ELF_RELOC(R_AARCH64_TLSDESC_OFF_G0_NC,               0x236)
 ELF_RELOC(R_AARCH64_TLSDESC_LDR,                     0x237)
 ELF_RELOC(R_AARCH64_TLSDESC_ADD,                     0x238)
 ELF_RELOC(R_AARCH64_TLSDESC_CALL,                    0x239)
 ELF_RELOC(R_AARCH64_TLSLE_LDST128_TPREL_LO12,        0x23a)
 ELF_RELOC(R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC,     0x23b)
 ELF_RELOC(R_AARCH64_TLSLD_LDST128_DTPREL_LO12,       0x23c)
 ELF_RELOC(R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC,    0x23d)
+ELF_RELOC(R_AARCH64_PLT32,                           0x23e)
+// Dynamic relocations start
 ELF_RELOC(R_AARCH64_COPY,                            0x400)
 ELF_RELOC(R_AARCH64_GLOB_DAT,                        0x401)
 ELF_RELOC(R_AARCH64_JUMP_SLOT,                       0x402)
 ELF_RELOC(R_AARCH64_RELATIVE,                        0x403)
 // 0x404 and 0x405 are now R_AARCH64_TLS_IMPDEF1 and R_AARCH64_TLS_IMPDEF2
 // We follow GNU and define TLS_IMPDEF1 as TLS_DTPMOD64 and TLS_IMPDEF2 as
 // TLS_DTPREL64
 ELF_RELOC(R_AARCH64_TLS_DTPMOD64,                    0x404)
 ELF_RELOC(R_AARCH64_TLS_DTPREL64,                    0x405)
 ELF_RELOC(R_AARCH64_TLS_TPREL64,                     0x406)
 ELF_RELOC(R_AARCH64_TLSDESC,                         0x407)
 ELF_RELOC(R_AARCH64_IRELATIVE,                       0x408)
-ELF_RELOC(R_AARCH64_PLT32,                           0x409)
 
 // ELF_RELOC(R_AARCH64_P32_NONE,                         0)
 ELF_RELOC(R_AARCH64_P32_ABS32,                       0x001)
 ELF_RELOC(R_AARCH64_P32_ABS16,                       0x002)
 ELF_RELOC(R_AARCH64_P32_PREL32,                      0x003)
 ELF_RELOC(R_AARCH64_P32_PREL16,                      0x004)
 ELF_RELOC(R_AARCH64_P32_MOVW_UABS_G0,                0x005)
 ELF_RELOC(R_AARCH64_P32_MOVW_UABS_G0_NC,             0x006)

 ELF_RELOC(R_AARCH64_P32_TLSLE_LDST128_TPREL_LO12,    0x078)
 ELF_RELOC(R_AARCH64_P32_TLSLE_LDST128_TPREL_LO12_NC, 0x079)
 ELF_RELOC(R_AARCH64_P32_TLSDESC_LD_PREL19,           0x07a)
 ELF_RELOC(R_AARCH64_P32_TLSDESC_ADR_PREL21,          0x07b)
 ELF_RELOC(R_AARCH64_P32_TLSDESC_ADR_PAGE21,          0x07c)
 ELF_RELOC(R_AARCH64_P32_TLSDESC_LD32_LO12,           0x07d)
 ELF_RELOC(R_AARCH64_P32_TLSDESC_ADD_LO12,            0x07e)
 ELF_RELOC(R_AARCH64_P32_TLSDESC_CALL,                0x07f)
+ELF_RELOC(R_AARCH64_P32_PLT32,                       0x080)
+// Dynamic relocations start
 ELF_RELOC(R_AARCH64_P32_COPY,                        0x0b4)
 ELF_RELOC(R_AARCH64_P32_GLOB_DAT,                    0x0b5)
 ELF_RELOC(R_AARCH64_P32_JUMP_SLOT,                   0x0b6)
 ELF_RELOC(R_AARCH64_P32_RELATIVE,                    0x0b7)
 ELF_RELOC(R_AARCH64_P32_TLS_DTPREL,                  0x0b8)
 ELF_RELOC(R_AARCH64_P32_TLS_DTPMOD,                  0x0b9)
 ELF_RELOC(R_AARCH64_P32_TLS_TPREL,                   0x0ba)
 ELF_RELOC(R_AARCH64_P32_TLSDESC,                     0x0bb)
 ELF_RELOC(R_AARCH64_P32_IRELATIVE,                   0x0bc)
-ELF_RELOC(R_AARCH64_P32_PLT32,                       0x0bd)

llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-aarch64.test

 # CHECK: Type: R_AARCH64_TLSDESC_OFF_G0_NC (566)
 # CHECK: Type: R_AARCH64_TLSDESC_LDR (567)
 # CHECK: Type: R_AARCH64_TLSDESC_ADD (568)
 # CHECK: Type: R_AARCH64_TLSDESC_CALL (569)
 # CHECK: Type: R_AARCH64_TLSLE_LDST128_TPREL_LO12 (570)
 # CHECK: Type: R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC (571)
 # CHECK: Type: R_AARCH64_TLSLD_LDST128_DTPREL_LO12 (572)
 # CHECK: Type: R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC (573)
+# CHECK: Type: R_AARCH64_PLT32 (574)
 # CHECK: Type: R_AARCH64_COPY (1024)
 # CHECK: Type: R_AARCH64_GLOB_DAT (1025)
 # CHECK: Type: R_AARCH64_JUMP_SLOT (1026)
 # CHECK: Type: R_AARCH64_RELATIVE (1027)
 # CHECK: Type: R_AARCH64_TLS_DTPMOD64 (1028)
 # CHECK: Type: R_AARCH64_TLS_DTPREL64 (1029)
 # CHECK: Type: R_AARCH64_TLS_TPREL64 (1030)
 # CHECK: Type: R_AARCH64_TLSDESC (1031)
 # CHECK: Type: R_AARCH64_IRELATIVE (1032)
-# CHECK: Type: R_AARCH64_PLT32 (1033)
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_AARCH64
 Sections:
Relocations:
       - Type: R_AARCH64_TLSDESC_OFF_G0_NC
       - Type: R_AARCH64_TLSDESC_LDR
       - Type: R_AARCH64_TLSDESC_ADD
       - Type: R_AARCH64_TLSDESC_CALL
       - Type: R_AARCH64_TLSLE_LDST128_TPREL_LO12
       - Type: R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC
       - Type: R_AARCH64_TLSLD_LDST128_DTPREL_LO12
       - Type: R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC
+      - Type: R_AARCH64_PLT32
       - Type: R_AARCH64_COPY
       - Type: R_AARCH64_GLOB_DAT
       - Type: R_AARCH64_JUMP_SLOT
       - Type: R_AARCH64_RELATIVE
       - Type: R_AARCH64_TLS_DTPMOD64
       - Type: R_AARCH64_TLS_DTPREL64
       - Type: R_AARCH64_TLS_TPREL64
       - Type: R_AARCH64_TLSDESC
       - Type: R_AARCH64_IRELATIVE
-      - Type: R_AARCH64_PLT32