Skip to content

Commit 8410ee4

Browse files
authored
[NFC][AArch64][ELF][PAC] Update AUTH relocation IDs (#74986)
ARM-software/abi-aa#227 changes IDs of `R_AARCH64_AUTH_ABS64` and `R_AARCH64_AUTH_RELATIVE` in PAuth ABI specification from draft ones (`0xe100` and `0xe200`) to final ones (`0x244` and `0x411`). This patch changes the values in llvm correspondingly.
1 parent ac640c6 commit 8410ee4

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ ELF_RELOC(R_AARCH64_TLSLE_LDST128_TPREL_LO12, 0x23a)
121121
ELF_RELOC(R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC, 0x23b)
122122
ELF_RELOC(R_AARCH64_TLSLD_LDST128_DTPREL_LO12, 0x23c)
123123
ELF_RELOC(R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC, 0x23d)
124+
ELF_RELOC(R_AARCH64_AUTH_ABS64, 0x244)
124125
// Dynamic relocations start
125126
ELF_RELOC(R_AARCH64_COPY, 0x400)
126127
ELF_RELOC(R_AARCH64_GLOB_DAT, 0x401)
@@ -134,8 +135,7 @@ ELF_RELOC(R_AARCH64_TLS_DTPREL64, 0x405)
134135
ELF_RELOC(R_AARCH64_TLS_TPREL64, 0x406)
135136
ELF_RELOC(R_AARCH64_TLSDESC, 0x407)
136137
ELF_RELOC(R_AARCH64_IRELATIVE, 0x408)
137-
ELF_RELOC(R_AARCH64_AUTH_ABS64, 0xe100)
138-
ELF_RELOC(R_AARCH64_AUTH_RELATIVE, 0xe200)
138+
ELF_RELOC(R_AARCH64_AUTH_RELATIVE, 0x411)
139139

140140
// ELF_RELOC(R_AARCH64_P32_NONE, 0)
141141
ELF_RELOC(R_AARCH64_P32_ABS32, 0x001)

llvm/test/MC/AArch64/elf-reloc-ptrauth.s

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
// RELOC: Relocation section '.rela.test' at offset 0x230 contains 8 entries:
77
// RELOC-NEXT: Offset Info Type Symbol's Value Symbol's Name + Addend
8-
// RELOC-NEXT: 0000000000000000 000000010000e100 R_AARCH64_AUTH_ABS64 0000000000000000 .helper + 0
9-
// RELOC-NEXT: 0000000000000010 000000080000e100 R_AARCH64_AUTH_ABS64 0000000000000000 _g1 + 0
10-
// RELOC-NEXT: 0000000000000020 000000090000e100 R_AARCH64_AUTH_ABS64 0000000000000000 _g2 + 0
11-
// RELOC-NEXT: 0000000000000030 0000000a0000e100 R_AARCH64_AUTH_ABS64 0000000000000000 _g3 + 0
12-
// RELOC-NEXT: 0000000000000040 0000000b0000e100 R_AARCH64_AUTH_ABS64 0000000000000000 _g4 + 7
13-
// RELOC-NEXT: 0000000000000050 0000000c0000e100 R_AARCH64_AUTH_ABS64 0000000000000000 _g5 - 3
14-
// RELOC-NEXT: 0000000000000060 000000020000e100 R_AARCH64_AUTH_ABS64 0000000000000000 _g 6 + 0
15-
// RELOC-NEXT: 0000000000000070 0000000d0000e100 R_AARCH64_AUTH_ABS64 0000000000000000 _g 7 + 7
8+
// RELOC-NEXT: 0000000000000000 0000000100000244 R_AARCH64_AUTH_ABS64 0000000000000000 .helper + 0
9+
// RELOC-NEXT: 0000000000000010 0000000800000244 R_AARCH64_AUTH_ABS64 0000000000000000 _g1 + 0
10+
// RELOC-NEXT: 0000000000000020 0000000900000244 R_AARCH64_AUTH_ABS64 0000000000000000 _g2 + 0
11+
// RELOC-NEXT: 0000000000000030 0000000a00000244 R_AARCH64_AUTH_ABS64 0000000000000000 _g3 + 0
12+
// RELOC-NEXT: 0000000000000040 0000000b00000244 R_AARCH64_AUTH_ABS64 0000000000000000 _g4 + 7
13+
// RELOC-NEXT: 0000000000000050 0000000c00000244 R_AARCH64_AUTH_ABS64 0000000000000000 _g5 - 3
14+
// RELOC-NEXT: 0000000000000060 0000000200000244 R_AARCH64_AUTH_ABS64 0000000000000000 _g 6 + 0
15+
// RELOC-NEXT: 0000000000000070 0000000d00000244 R_AARCH64_AUTH_ABS64 0000000000000000 _g 7 + 7
1616

1717
// RELOC: Hex dump of section '.test':
1818
// VVVVVVVV addend, not needed for rela

0 commit comments

Comments
 (0)