[AArch64][ELF][llvm-readobj] Support ELF AUTH constants

[kovdan01]

Summary

This patch adds llvm-readobj support for:

• Dynamic R_AARCH64_AUTH_* relocations (including RELR compressed AUTH relocations) as described here: https://github.com/ARM-software/abi-aa/blob/main/pauthabielf64/pauthabielf64.rst#auth-variant-dynamic-relocations

• .note.AARCH64-PAUTH-ABI-tag section as defined here https://github.com/ARM-software/abi-aa/blob/main/pauthabielf64/pauthabielf64.rst#elf-marking

[kovdan01]

Rebase to current mainline

[kovdan01]

@MaskRay @psmith A kind reminder regarding the revision. Would be glad to see your comments.

[kovdan01]

Fix typo

[MaskRay]

I haven'ed looked closely, but a <numeric> issue makes this not buildable for me..

lld/ELF/Config.h

151 ↗

(On Diff #554992)

They make the offsets of following variables larger. move to the end.
<xxx, 0> is more common in lld. The inline element doesn't save.

lld/ELF/Driver.cpp

2595 ↗

(On Diff #554992)

move the check to the caller

2612 ↗

(On Diff #554992)

No trailing period. Please check the existing convention.

2615 ↗

(On Diff #554992)

Please check the existing convention.

lld/ELF/InputFiles.cpp

964 ↗

(On Diff #554992)

move the check to the caller

lld/ELF/SyntheticSections.cpp

362 ↗

(On Diff #554992)

this needs <numeric>

lld/test/ELF/aarch64-feature-pauth.s

3 ↗

(On Diff #554992)

%tsplit makes temporary output filenames unnecessarily long. Just use RUN: rm -rf %t && split-file %s %t && cd %t

please check the existing convention.

59 ↗

(On Diff #554992)

We omit messages before error: as the executable may have a different name, e.g. ld.lld.exe. Please follow the style of some recently added tests.

[kovdan01]

Fix issues mentioned by @MaskRay

lld/ELF/Config.h

151 ↗

(On Diff #554992)

Got it, fixed

lld/ELF/Driver.cpp

2595 ↗

(On Diff #554992)

Done

2612 ↗

(On Diff #554992)

Fixed, also changed "one. Either" to "one; either" - multiple sentences IMHO don't look nice in such context

lld/ELF/InputFiles.cpp

964 ↗

(On Diff #554992)

Done

lld/ELF/SyntheticSections.cpp

362 ↗

(On Diff #554992)

Fixed, thanks! It looks like this file is included implicitly from other files on my machine, so didn't mention it by myself.

lld/test/ELF/aarch64-feature-pauth.s

3 ↗

(On Diff #554992)

Fixed, thanks, it definitely enhances readability

59 ↗

(On Diff #554992)

Got it, fixed

[peter.smith]

The program properties are in the appendix as an alternative. Do we need to implement both for the same platform? If both are supported then we have the problem of what happens when one relocatable object has a notes section and the other a GNU properties section.

The ELF marking in the specification was very much a placeholder in the specification waiting for some implementation experience in prototypes. The notes section was used mostly as GNU properties are a Linux extension, and this may end up being used outside of a GNU platform. I strongly recommend choosing one or the other. Personally I would go with the note section as the properties are listed in an appendix as an alternative.

Experience from BTI has shown that assembler files, particularly those like crt0.s often creep into projects and are hard to find. Many of these assembler files will have no code pointers in them at all so giving a fatal error may be too harsh.

You may want to follow intel CET, which has a -z cet-report = [none|warn|error] for example -z pauth-report = [none|warn|error] which controls what happens when there are some objects without the note section.

I haven't checked through all the details in the implementation.

llvm/tools/llvm-readobj/ELFDumper.cpp

5367

I recommend printAArch64Note as ARM in all caps tends to refer to the ARM (AArch32 backend). Even if the vendor/owner name is ARM the company.

[kovdan01]

In D158574#4638533, @peter.smith wrote:

The program properties are in the appendix as an alternative. Do we need to implement both for the same platform? If both are supported then we have the problem of what happens when one relocatable object has a notes section and the other a GNU properties section.

The ELF marking in the specification was very much a placeholder in the specification waiting for some implementation experience in prototypes. The notes section was used mostly as GNU properties are a Linux extension, and this may end up being used outside of a GNU platform. I strongly recommend choosing one or the other. Personally I would go with the note section as the properties are listed in an appendix as an alternative.

The implementation proposed in this patch allows only one type of pauth mark at a time: if one of input files has .note.AARCH64-PAUTH-ABI-tag section and another one has GNU_PROPERTY_AARCH64_FEATURE_PAUTH in .note.gnu.property, the linker will emit an error: see lld/test/ELF/aarch64-feature-pauth.s:15:

error: input files contain both a .note.AARCH64-PAUTH-ABI-tag section and a GNU_PROPERTY_AARCH64_FEATURE_PAUTH feature in a .note.gnu.property section; all the input files must use the same way of specifying AArch64 PAuth compatibility info

I think we can leave this behavior since it's conservative enough, but allows some platforms to use an alternative marking way if they want to.
The compatibility check implemented is pretty generic (treat files as compatible if and only if their PAuth notes are identical), and it can be used as a skeleton if some platform wants something more complex.
Please let me know your thoughts on that - as for now, I don't see major downsides in leaving both ways implemented (if it's explicitly disallowed to mix them), but maybe you see some issues with that.

Experience from BTI has shown that assembler files, particularly those like crt0.s often creep into projects and are hard to find. Many of these assembler files will have no code pointers in them at all so giving a fatal error may be too harsh.

You may want to follow intel CET, which has a -z cet-report = [none|warn|error] for example -z pauth-report = [none|warn|error] which controls what happens when there are some objects without the note section.

Thanks! I'll definitely implement that, didn't know that such an option exists. I'll also add the notes manually to assembly files in libunwind though - just in case someone wants to link that with the option set to error or using a linker other than lld.

[MaskRay]

I am puzzled by the need of both the generic .note.AARCH64-PAUTH-ABI-tag and the GNU-centric .note.gnu.property.
If .note.AARCH64-PAUTH-ABI-tag is preferred, you can push forward .note.AARCH64-PAUTH-ABI-tag adoption and not bother with .note.gnu.property.
Why should the linker bear complexity related to .note.gnu.property and its interaction with .note.AARCH64-PAUTH-ABI-tag (error, but we could avoid this complexity but not support .note.gnu.property in the first place).

If there is not so such GNU hatred, I'd like that we only implement .note.gnu.property and only implement .note.AARCH64-PAUTH-ABI-tag when it is really needed, i.e. some ELF OSes using PAuth somehow uses .note.AARCH64-PAUTH-ABI-tag.
I'm not certain certain ELF OSes are present. The ABI can be written in a more natural way to favor .note.AARCH64-PAUTH-ABI-tag .

lld/ELF/Config.h

435 ↗

(On Diff #555770)

Variables unrelated to command-line options are generally placed in Ctx.

lld/ELF/Driver.cpp

2600 ↗

(On Diff #555770)

move f1 outside (prefer [0]. to front()->) and use ArrayRef(ctx.objectFiles).slice(1)

2605 ↗

(On Diff #555770)

^ => !=

lld/ELF/InputFiles.cpp

968 ↗

(On Diff #555770)

It's conventional to call errorOrWarn and continue parsing instead of calling fatal

reportFatal can be changed to return bool indicating whether the caller should early return.

974 ↗

(On Diff #555770)

I am not sure the cast is a bad idea. This is the idiomatic way. Elf_Nhdr recognizes endianness and has packed data members.

lld/test/ELF/aarch64-feature-pauth.s

5 ↗

(On Diff #555770)

Since we cd %t, all the %t prefix of temporary object files can be omitted. We ensure all temporary files are in %t now.

6 ↗

(On Diff #555770)

cp gnu11.o gnu12.o

7 ↗

(On Diff #555770)

a non-shared object can be named .so, but it's confusing. Suggest -shared

[MaskRay]

The way D158574 and D156882 are organized looks awkward to me. I think the preferred way is

• patch A: add constants to BinaryFormat and implement llvm-readobj, with tests in llvm/test/tools/llvm-readobj. Please study previous patches adding llvm-readobj support for new constants
• patch B: full-fledged lld implementation

lld/ELF/SyntheticSections.cpp

375 ↗

(On Diff #555770)

The section name convention is AArch64* instead of Aarch64*

384 ↗

(On Diff #555770)

unneeded

[peter.smith]

I agree with MaskRay that for an Alpha specification there is no good reason to support both marking schemes in relocatable objects. I wish I had deleted the alternative one rather than moving it to an appendix. I'll note that the spec covers relocatable objects only, it is the platform's decision about executables and shared objects.

The encoding difference between the processor specific note section and the GNU property is minimal. Essentially the GNU property is just wrapping the contents of the NOTE section in a property. At the relocatable object this doesn't make a lot of difference as the (platform/vendor schema-version) does not fit well with any existing GNU property [*] so it would still need custom code to process. At the executable, shared-object level there is more of a benefit for GNU properties as the program header that identifies the program properties can make it easier for the dynamic linker to find the information. It is possible to use the raw notes in relocatable objects but use a program property in the executable.

Internally to Arm there is a discussion on how to do ELF marking in relocatable objects (not executables and shared-libraries), for example do we continue to use GNU properties or do we use something like Arm (or RISCV) build attributes. I hope that there will be a proposal that can be shared externally for public comment can be put on the Arm ABI github page at some point in the near future. As ABI work tends to move slowly I suspect it will be too late for this though.

• X86 and AArch64 properties

X86 properties https://gitlab.com/x86-psABIs/x86-64-ABI/-/merge_requests/13/diffs?commit_id=b0b0c518c28be848e8494bf3dff2a97688e5fce0
Arch64 properties in https://github.com/ARM-software/abi-aa/blob/main/aaelf64/aaelf64.rst#62program-property

[kovdan01]

TODO:

• yaml2obj is for some reason broken when using AARCH64_DYNAMIC_TAG instead of DYNAMIC_TAG
• more tests for new relocation types

lld/ELF/Config.h

435 ↗

(On Diff #555770)

Done, thanks. I suppose we also might want to move andFeatures to Ctx - I initially placed this new field here because andFeatures was here. I'll submit a small subsequent patch regarding that.

lld/ELF/Driver.cpp

2600 ↗

(On Diff #555770)

Regarding [0]. instead of front()-> - not relevant anymore after '-z pauth-report' implementation. We now use the first non-empty pauth abi tag as a reference instead of the first one.

Regarding `f11 - done, thanks.

2605 ↗

(On Diff #555770)

Changed, thanks! I don't know why I used such a strange way of comparing booleans here :)

lld/ELF/InputFiles.cpp

968 ↗

(On Diff #555770)

It's conventional to call errorOrWarn and continue parsing instead of calling fatal

Done, thanks

reportFatal can be changed to return bool indicating whether the caller should early return.

I'm not sure what you meant here. Please let me know if my changes are not what you expected.

974 ↗

(On Diff #555770)

Yes, you a right, removed the comment. Thanks!

lld/ELF/SyntheticSections.cpp

375 ↗

(On Diff #555770)

Changed, thanks

384 ↗

(On Diff #555770)

Done, thanks

lld/test/ELF/aarch64-feature-pauth.s

5 ↗

(On Diff #555770)

Ah, forgot to change that. Fixed, thanks

6 ↗

(On Diff #555770)

Definitely better, fixed

7 ↗

(On Diff #555770)

Fixed, thanks

llvm/tools/llvm-readobj/ELFDumper.cpp

5367

OK, it makes sense. Changed ARM->AArch64

[kovdan01]

@MaskRay Resolved the issues mentioned and moved the patch to https://github.com/llvm/llvm-project/pull/72713. Please consider reviewing it there. Thanks!

llvm/include/llvm/BinaryFormat/DynamicTags.def

 AARCH64_DYNAMIC_TAG(AARCH64_PAC_PLT, 0x70000003)
 AARCH64_DYNAMIC_TAG(AARCH64_VARIANT_PCS, 0x70000005)
 AARCH64_DYNAMIC_TAG(AARCH64_MEMTAG_MODE, 0x70000009)
 AARCH64_DYNAMIC_TAG(AARCH64_MEMTAG_HEAP, 0x7000000b)
 AARCH64_DYNAMIC_TAG(AARCH64_MEMTAG_STACK, 0x7000000c)
 AARCH64_DYNAMIC_TAG(AARCH64_MEMTAG_GLOBALS, 0x7000000d)
 AARCH64_DYNAMIC_TAG(AARCH64_MEMTAG_GLOBALSSZ, 0x7000000f)
 
+// AArch64 specific dynamic table entries for RELR auth relocations as described here:
+// https://github.com/ARM-software/abi-aa/blob/main/pauthabielf64/pauthabielf64.rst#dynamic-section
+// FIXME: use AARCH64_DYNAMIC_TAG instead of DYNAMIC_TAG.
+// Currently, using AARCH64_DYNAMIC_TAG breaks yaml2obj for some reason.
+DYNAMIC_TAG(AARCH64_AUTH_RELRSZ, 0x70000011)
+DYNAMIC_TAG(AARCH64_AUTH_RELR, 0x70000012)
+DYNAMIC_TAG(AARCH64_AUTH_RELRENT, 0x70000013)
+
 // Hexagon specific dynamic table entries
 HEXAGON_DYNAMIC_TAG(HEXAGON_SYMSZ, 0x70000000)
 HEXAGON_DYNAMIC_TAG(HEXAGON_VER, 0x70000001)
 HEXAGON_DYNAMIC_TAG(HEXAGON_PLT, 0x70000002)
 
 // Mips specific dynamic table entry tags.
 
 MIPS_DYNAMIC_TAG(MIPS_RLD_VERSION, 0x70000001)  // 32 bit version number for

llvm/include/llvm/BinaryFormat/ELF.h

enum : unsigned {
   // Exception Index table
   SHT_ARM_EXIDX = 0x70000001U,
   // BPABI DLL dynamic linking pre-emption map
   SHT_ARM_PREEMPTMAP = 0x70000002U,
   //  Object file compatibility attributes
   SHT_ARM_ATTRIBUTES = 0x70000003U,
   SHT_ARM_DEBUGOVERLAY = 0x70000004U,
   SHT_ARM_OVERLAYSECTION = 0x70000005U,
+  // Special aarch64-specific section for MTE support, as described in:
+  // https://github.com/ARM-software/abi-aa/blob/main/pauthabielf64/pauthabielf64.rst#section-types
+  SHT_AARCH64_AUTH_RELR = 0x70000004U,
   // Special aarch64-specific sections for MTE support, as described in:
   // https://github.com/ARM-software/abi-aa/blob/main/memtagabielf64/memtagabielf64.rst#7section-types
   SHT_AARCH64_MEMTAG_GLOBALS_STATIC = 0x70000007U,
   SHT_AARCH64_MEMTAG_GLOBALS_DYNAMIC = 0x70000008U,
   SHT_HEX_ORDERED = 0x70000000,   // Link editor is to sort the entries in
                                   // this section based on their sizes
   SHT_X86_64_UNWIND = 0x70000001, // Unwind information
 

 
 // Android note types.
 enum {
   NT_ANDROID_TYPE_IDENT = 1,
   NT_ANDROID_TYPE_KUSER = 3,
   NT_ANDROID_TYPE_MEMTAG = 4,
 };
 
+// ARM note types
+enum {
+  NT_ARM_TYPE_PAUTH_ABI_TAG = 1,
+};
+
 // Memory tagging values used in NT_ANDROID_TYPE_MEMTAG notes.
 enum {
   // Enumeration to determine the tagging mode. In Android-land, 'SYNC' means
   // running all threads in MTE Synchronous mode, and 'ASYNC' means to use the
   // kernels auto-upgrade feature to allow for either MTE Asynchronous,
   // Asymmetric, or Synchronous mode. This allows silicon vendors to specify, on
   // a per-cpu basis what 'ASYNC' should mean. Generally, the expectation is
   // "pick the most precise mode that's very fast".

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

 // 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_AUTH_ABS64,                      0xe100)
+ELF_RELOC(R_AARCH64_AUTH_RELATIVE,                   0xe200)
 
 // 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)

llvm/lib/Object/ELF.cpp

switch (Type) {
     STRINGIFY_ENUM_CASE(ELF, SHT_SHLIB);
     STRINGIFY_ENUM_CASE(ELF, SHT_DYNSYM);
     STRINGIFY_ENUM_CASE(ELF, SHT_INIT_ARRAY);
     STRINGIFY_ENUM_CASE(ELF, SHT_FINI_ARRAY);
     STRINGIFY_ENUM_CASE(ELF, SHT_PREINIT_ARRAY);
     STRINGIFY_ENUM_CASE(ELF, SHT_GROUP);
     STRINGIFY_ENUM_CASE(ELF, SHT_SYMTAB_SHNDX);
     STRINGIFY_ENUM_CASE(ELF, SHT_RELR);
+    STRINGIFY_ENUM_CASE(ELF, SHT_AARCH64_AUTH_RELR);
     STRINGIFY_ENUM_CASE(ELF, SHT_ANDROID_REL);
     STRINGIFY_ENUM_CASE(ELF, SHT_ANDROID_RELA);
     STRINGIFY_ENUM_CASE(ELF, SHT_ANDROID_RELR);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_ODRTAB);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_LINKER_OPTIONS);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_CALL_GRAPH_PROFILE);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_ADDRSIG);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_DEPENDENT_LIBRARIES);

llvm/lib/ObjectYAML/ELFYAML.cpp

#define ECase(X) IO.enumCase(Value, #X, ELF::X)
   ECase(SHT_SHLIB);
   ECase(SHT_DYNSYM);
   ECase(SHT_INIT_ARRAY);
   ECase(SHT_FINI_ARRAY);
   ECase(SHT_PREINIT_ARRAY);
   ECase(SHT_GROUP);
   ECase(SHT_SYMTAB_SHNDX);
   ECase(SHT_RELR);
+  ECase(SHT_AARCH64_AUTH_RELR);
   ECase(SHT_ANDROID_REL);
   ECase(SHT_ANDROID_RELA);
   ECase(SHT_ANDROID_RELR);
   ECase(SHT_LLVM_ODRTAB);
   ECase(SHT_LLVM_LINKER_OPTIONS);
   ECase(SHT_LLVM_CALL_GRAPH_PROFILE);
   ECase(SHT_LLVM_ADDRSIG);
   ECase(SHT_LLVM_DEPENDENT_LIBRARIES);

llvm/test/tools/llvm-objdump/ELF/dynamic-section.test

 # ELF64-NEXT:  RELRENT              0x0000000000004321
 # ELF64-NEXT:  ANDROID_REL          0x0000000000001000
 # ELF64-NEXT:  ANDROID_RELSZ        0x0000000000000010
 # ELF64-NEXT:  ANDROID_RELA         0x0000000000001000
 # ELF64-NEXT:  ANDROID_RELASZ       0x0000000000000010
 # ELF64-NEXT:  ANDROID_RELR         0x0000000000001000
 # ELF64-NEXT:  ANDROID_RELRSZ       0x0000000000000010
 # ELF64-NEXT:  ANDROID_RELRENT      0x0000000000001234
+# ELF64-NEXT:  AARCH64_AUTH_RELR    0x0000000000001000
+# ELF64-NEXT:  AARCH64_AUTH_RELRSZ  0x0000000000000010
+# ELF64-NEXT:  AARCH64_AUTH_RELRENT 0x0000000000005678
 # ELF64-NEXT:  GNU_HASH             0x0000000000001000
 # ELF64-NEXT:  TLSDESC_PLT          0x0000000000001000
 # ELF64-NEXT:  TLSDESC_GOT          0x0000000000001000
 # ELF64-NEXT:  RELACOUNT            0x0000000000000000
 # ELF64-NEXT:  RELCOUNT             0x0000000000000000
 # ELF64-NEXT:  FLAGS_1              0x0000000087654321
 # ELF64-NEXT:  VERSYM               0x0000000000001000
 # ELF64-NEXT:  VERDEF               0x0000000000001000
- Name:    .dynamic
      - Tag:   DT_ANDROID_RELASZ
        Value: 0x10
      - Tag:   DT_ANDROID_RELR
        Value: 0x1000
      - Tag:   DT_ANDROID_RELRSZ
        Value: 0x10
      - Tag:   DT_ANDROID_RELRENT
        Value: 0x1234
+     - Tag:   DT_AARCH64_AUTH_RELR
+       Value: 0x1000
+     - Tag:   DT_AARCH64_AUTH_RELRSZ
+       Value: 0x10
+     - Tag:   DT_AARCH64_AUTH_RELRENT
+       Value: 0x5678
      - Tag:   DT_GNU_HASH
        Value: 0x1000
      - Tag:   DT_TLSDESC_PLT
        Value: 0x1000
      - Tag:   DT_TLSDESC_GOT
        Value: 0x1000
      - Tag:   DT_RELACOUNT
        Value: 0x0

 # ELF32-NEXT:  RELRENT              0x00004321
 # ELF32-NEXT:  ANDROID_REL          0x00001000
 # ELF32-NEXT:  ANDROID_RELSZ        0x00000010
 # ELF32-NEXT:  ANDROID_RELA         0x00001000
 # ELF32-NEXT:  ANDROID_RELASZ       0x00000010
 # ELF32-NEXT:  ANDROID_RELR         0x00001000
 # ELF32-NEXT:  ANDROID_RELRSZ       0x00000010
 # ELF32-NEXT:  ANDROID_RELRENT      0x00001234
+# ELF32-NEXT:  AARCH64_AUTH_RELR    0x00001000
+# ELF32-NEXT:  AARCH64_AUTH_RELRSZ  0x00000010
+# ELF32-NEXT:  AARCH64_AUTH_RELRENT 0x00005678
 # ELF32-NEXT:  GNU_HASH             0x00001000
 # ELF32-NEXT:  TLSDESC_PLT          0x00001000
 # ELF32-NEXT:  TLSDESC_GOT          0x00001000
 # ELF32-NEXT:  RELACOUNT            0x00000000
 # ELF32-NEXT:  RELCOUNT             0x00000000
 # ELF32-NEXT:  FLAGS_1              0x87654321
 # ELF32-NEXT:  VERSYM               0x00001000
 # ELF32-NEXT:  VERDEF               0x00001000
- Name:    .dynamic
      - Tag:   DT_ANDROID_RELASZ
        Value: 0x10
      - Tag:   DT_ANDROID_RELR
        Value: 0x1000
      - Tag:   DT_ANDROID_RELRSZ
        Value: 0x10
      - Tag:   DT_ANDROID_RELRENT
        Value: 0x1234
+     - Tag:   DT_AARCH64_AUTH_RELR
+       Value: 0x1000
+     - Tag:   DT_AARCH64_AUTH_RELRSZ
+       Value: 0x10
+     - Tag:   DT_AARCH64_AUTH_RELRENT
+       Value: 0x5678
      - Tag:   DT_GNU_HASH
        Value: 0x1000
      - Tag:   DT_TLSDESC_PLT
        Value: 0x1000
      - Tag:   DT_TLSDESC_GOT
        Value: 0x1000
      - Tag:   DT_RELACOUNT
        Value: 0x0

llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-feature-pauth.s

+# RUN: rm -rf %t && split-file %s %t && cd %t
+
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu abi-tag.s       -o tag.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu abi-tag-short.s -o tag-short.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu abi-tag-long.s  -o tag-long.o
+
+# RUN: llvm-readelf --notes tag.o       | FileCheck --check-prefix NORMAL %s
+# RUN: llvm-readelf --notes tag-short.o | FileCheck --check-prefix SHORT  %s
+# RUN: llvm-readelf --notes tag-long.o  | FileCheck --check-prefix LONG   %s
+
+# NORMAL: AArch64 PAuth ABI tag: platform 0x2a, version 0x1
+# SHORT:  AArch64 PAuth ABI tag: <corrupted size: expected at least 16, got 12>
+# LONG:   AArch64 PAuth ABI tag: platform 0x2a, version 0x1, additional info 0xEFCDAB8967452301
+
+# RUN: llvm-readobj --notes tag.o       | FileCheck --check-prefix LLVM-NORMAL %s
+# RUN: llvm-readobj --notes tag-short.o | FileCheck --check-prefix LLVM-SHORT %s
+# RUN: llvm-readobj --notes tag-long.o  | FileCheck --check-prefix LLVM-LONG %s
+
+// LLVM-SHORT:      Notes [
+// LLVM-SHORT-NEXT:   NoteSection {
+// LLVM-SHORT-NEXT:     Name: .note.AARCH64-PAUTH-ABI-tag
+// LLVM-SHORT-NEXT:     Offset: 0x40
+// LLVM-SHORT-NEXT:     Size: 0x1C
+// LLVM-SHORT-NEXT:     Note {
+// LLVM-SHORT-NEXT:       Owner: ARM
+// LLVM-SHORT-NEXT:       Data size: 0xC
+// LLVM-SHORT-NEXT:       Type: NT_ARM_TYPE_PAUTH_ABI_TAG
+// LLVM-SHORT-NEXT:       Description data (
+// LLVM-SHORT-NEXT:         0000: 2A000000 00000000 01000000
+// LLVM-SHORT-NEXT:       )
+// LLVM-SHORT-NEXT:     }
+// LLVM-SHORT-NEXT:   }
+// LLVM-SHORT-NEXT: ]
+
+// LLVM-NORMAL:      Notes [
+// LLVM-NORMAL-NEXT:   NoteSection {
+// LLVM-NORMAL-NEXT:     Name: .note.AARCH64-PAUTH-ABI-tag
+// LLVM-NORMAL-NEXT:     Offset: 0x40
+// LLVM-NORMAL-NEXT:     Size: 0x20
+// LLVM-NORMAL-NEXT:     Note {
+// LLVM-NORMAL-NEXT:       Owner: ARM
+// LLVM-NORMAL-NEXT:       Data size: 0x10
+// LLVM-NORMAL-NEXT:       Type: NT_ARM_TYPE_PAUTH_ABI_TAG
+// LLVM-NORMAL-NEXT:       Platform: 42
+// LLVM-NORMAL-NEXT:       Version: 1
+// LLVM-NORMAL-NEXT:     }
+// LLVM-NORMAL-NEXT:   }
+// LLVM-NORMAL-NEXT: ]
+
+// LLVM-LONG:      Notes [
+// LLVM-LONG-NEXT:   NoteSection {
+// LLVM-LONG-NEXT:     Name: .note.AARCH64-PAUTH-ABI-tag
+// LLVM-LONG-NEXT:     Offset: 0x40
+// LLVM-LONG-NEXT:     Size: 0x28
+// LLVM-LONG-NEXT:     Note {
+// LLVM-LONG-NEXT:       Owner: ARM
+// LLVM-LONG-NEXT:       Data size: 0x18
+// LLVM-LONG-NEXT:       Type: NT_ARM_TYPE_PAUTH_ABI_TAG
+// LLVM-LONG-NEXT:       Platform: 42
+// LLVM-LONG-NEXT:       Version: 1
+// LLVM-LONG-NEXT:       Additional info: EFCDAB8967452301
+// LLVM-LONG-NEXT:     }
+// LLVM-LONG-NEXT:   }
+// LLVM-LONG-NEXT: ]
+
+#--- abi-tag.s
+
+.section ".note.AARCH64-PAUTH-ABI-tag", "a"
+.long 4
+.long 16
+.long 1
+.asciz "ARM"
+
+.quad 42         // platform
+.quad 1          // version
+
+#--- abi-tag-short.s
+
+.section ".note.AARCH64-PAUTH-ABI-tag", "a"
+.long 4
+.long 12
+.long 1
+.asciz "ARM"
+
+.quad 42
+.word 1
+
+#--- abi-tag-long.s
+
+.section ".note.AARCH64-PAUTH-ABI-tag", "a"
+.long 4
+.long 24
+.long 1
+.asciz "ARM"
+
+.quad 42         // platform
+.quad 1          // version
+.quad 0x0123456789ABCDEF // extra data

llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test

 
 ## Show we print a warning for an invalid relocation table entry size stored in a DT_RELENT entry.
 # RUN: yaml2obj --docnum=2 -DRELTYPE=REL -DTAG1=DT_RELSZ -DTAG2=DT_RELENT -DTAG2VAL=0xFF %s -o %t5
 # RUN: llvm-readobj --dyn-relocations %t5 2>&1 | FileCheck %s -DFILE=%t5 --check-prefix=INVALID-DT-RELENT
 # RUN: llvm-readelf --dyn-relocations %t5 2>&1 | FileCheck %s -DFILE=%t5 --check-prefix=INVALID-DT-RELENT
 
 ## INVALID-DT-RELENT: warning: '[[FILE]]': invalid DT_RELSZ value (0x18) or DT_RELENT value (0xff)
 
-## Show we print a warning for an invalid relocation table size stored in a DT_RELRSZ/DT_ANDROID_RELRSZ entry.
+## Show we print a warning for an invalid relocation table size stored in a DT_RELRSZ/DT_ANDROID_RELRSZ/DT_AARCH64_AUTH_RELRSZ entry.
 # RUN: yaml2obj --docnum=2 -DRELTYPE=RELR -DTAG1=DT_RELRSZ -DTAG1VAL=0xFF -DTAG2=DT_RELRENT %s -o %t6
 # RUN: llvm-readobj --dyn-relocations %t6 2>&1 | FileCheck %s -DFILE=%t6 --check-prefix=INVALID-DT-RELRSZ
 # RUN: llvm-readelf --dyn-relocations %t6 2>&1 | FileCheck %s -DFILE=%t6 --check-prefix=INVALID-DT-RELRSZ
 
 # RUN: yaml2obj --docnum=2 -DRELTYPE=RELR -DTAG1=DT_ANDROID_RELRSZ -DTAG1VAL=0xFF -DTAG2=DT_ANDROID_RELRENT %s -o %t7
 # RUN: llvm-readobj --dyn-relocations %t7 2>&1 | FileCheck %s -DFILE=%t7 --check-prefix=INVALID-DT-ANDROID-RELRSZ
 # RUN: llvm-readelf --dyn-relocations %t7 2>&1 | FileCheck %s -DFILE=%t7 --check-prefix=INVALID-DT-ANDROID-RELRSZ
 
-## INVALID-DT-RELRSZ:         warning: '[[FILE]]': invalid DT_RELRSZ value (0xff) or DT_RELRENT value (0x18)
-## INVALID-DT-ANDROID-RELRSZ: warning: '[[FILE]]': invalid DT_ANDROID_RELRSZ value (0xff) or DT_ANDROID_RELRENT value (0x18)
+# RUN: yaml2obj --docnum=2 -DRELTYPE=RELR -DTAG1=DT_AARCH64_AUTH_RELRSZ -DTAG1VAL=0xFF -DTAG2=DT_AARCH64_AUTH_RELRENT %s -o %t8
+# RUN: llvm-readobj --dyn-relocations %t8 2>&1 | FileCheck %s -DFILE=%t8 --check-prefix=INVALID-DT-AARCH64-AUTH-RELRSZ
+# RUN: llvm-readelf --dyn-relocations %t8 2>&1 | FileCheck %s -DFILE=%t8 --check-prefix=INVALID-DT-AARCH64-AUTH-RELRSZ
+
+## INVALID-DT-RELRSZ:              warning: '[[FILE]]': invalid DT_RELRSZ value (0xff) or DT_RELRENT value (0x18)
+## INVALID-DT-ANDROID-RELRSZ:      warning: '[[FILE]]': invalid DT_ANDROID_RELRSZ value (0xff) or DT_ANDROID_RELRENT value (0x18)
+## INVALID-DT-AARCH64-AUTH-RELRSZ: warning: '[[FILE]]': invalid DT_AARCH64_AUTH_RELRSZ value (0xff) or DT_AARCH64_AUTH_RELRENT value (0x18)
 
-## Show we print a warning for an invalid relocation table entry size stored in a DT_RELRENT/DT_ANDROID_RELRENT entry.
-# RUN: yaml2obj --docnum=2 -DRELTYPE=RELR -DTAG1=DT_RELRSZ -DTAG2=DT_RELRENT -DTAG2VAL=0xFF %s -o %t8
-# RUN: llvm-readobj --dyn-relocations %t8 2>&1 | FileCheck %s -DFILE=%t8 --check-prefix=INVALID-DT-RELRENT
-# RUN: llvm-readelf --dyn-relocations %t8 2>&1 | FileCheck %s -DFILE=%t8 --check-prefix=INVALID-DT-RELRENT
-# RUN: yaml2obj --docnum=2 -DRELTYPE=RELR -DTAG1=DT_ANDROID_RELRSZ -DTAG2=DT_ANDROID_RELRENT -DTAG2VAL=0xFF %s -o %t9
-# RUN: llvm-readobj --dyn-relocations %t9 2>&1 | FileCheck %s -DFILE=%t9 --check-prefix=INVALID-DT-ANDROID-RELRENT
-# RUN: llvm-readelf --dyn-relocations %t9 2>&1 | FileCheck %s -DFILE=%t9 --check-prefix=INVALID-DT-ANDROID-RELRENT
+## Show we print a warning for an invalid relocation table entry size stored in a DT_RELRENT/DT_ANDROID_RELRENT/DT_AARCH64_AUTH_RELRENT entry.
+# RUN: yaml2obj --docnum=2 -DRELTYPE=RELR -DTAG1=DT_RELRSZ -DTAG2=DT_RELRENT -DTAG2VAL=0xFF %s -o %t9
+# RUN: llvm-readobj --dyn-relocations %t9 2>&1 | FileCheck %s -DFILE=%t9 --check-prefix=INVALID-DT-RELRENT
+# RUN: llvm-readelf --dyn-relocations %t9 2>&1 | FileCheck %s -DFILE=%t9 --check-prefix=INVALID-DT-RELRENT
+# RUN: yaml2obj --docnum=2 -DRELTYPE=RELR -DTAG1=DT_ANDROID_RELRSZ -DTAG2=DT_ANDROID_RELRENT -DTAG2VAL=0xFF %s -o %t10
+# RUN: llvm-readobj --dyn-relocations %t10 2>&1 | FileCheck %s -DFILE=%t10 --check-prefix=INVALID-DT-ANDROID-RELRENT
+# RUN: llvm-readelf --dyn-relocations %t10 2>&1 | FileCheck %s -DFILE=%t10 --check-prefix=INVALID-DT-ANDROID-RELRENT
+# RUN: yaml2obj --docnum=2 -DRELTYPE=RELR -DTAG1=DT_AARCH64_AUTH_RELRSZ -DTAG2=DT_AARCH64_AUTH_RELRENT -DTAG2VAL=0xFF %s -o %t11
+# RUN: llvm-readobj --dyn-relocations %t11 2>&1 | FileCheck %s -DFILE=%t11 --check-prefix=INVALID-DT-AARCH64-AUTH-RELRENT
+# RUN: llvm-readelf --dyn-relocations %t11 2>&1 | FileCheck %s -DFILE=%t11 --check-prefix=INVALID-DT-AARCH64-AUTH-RELRENT
 
-## INVALID-DT-RELRENT:         invalid DT_RELRSZ value (0x18) or DT_RELRENT value (0xff)
-## INVALID-DT-ANDROID-RELRENT: invalid DT_ANDROID_RELRSZ value (0x18) or DT_ANDROID_RELRENT value (0xff)
+## INVALID-DT-RELRENT:              invalid DT_RELRSZ value (0x18) or DT_RELRENT value (0xff)
+## INVALID-DT-ANDROID-RELRENT:      invalid DT_ANDROID_RELRSZ value (0x18) or DT_ANDROID_RELRENT value (0xff)
+## INVALID-DT-AARCH64-AUTH-RELRENT: invalid DT_AARCH64_AUTH_RELRSZ value (0x18) or DT_AARCH64_AUTH_RELRENT value (0xff)
 
 ## Show we print a warning for an invalid value of DT_PLTRELSZ, which describes the total size
 ## of the relocation entries associated with the procedure linkage table.
 
 ## Case A: the size of a single relocation entry is 0x18. In this case 0xFF % 0x18 != 0 and we report a warning.
 
 # RUN: yaml2obj --docnum=3 -DVAL=0xFF %s -o %t10a
 # RUN: llvm-readobj --dyn-relocations %t10a 2>&1 | \

llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test

 ## Show that all non-machine specific tags can be read and printed correctly.
 ## Also show that -d is an alias for --dynamic-table.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-readobj --dynamic-table %t1 \
 # RUN:   | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=LLVM64
 # RUN: llvm-readobj -d %t1 | FileCheck %s --check-prefix=LLVM64
 # RUN: llvm-readelf --dynamic-table %t1 \
 # RUN:   | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=GNU64
 # RUN: llvm-readelf -d %t1 | FileCheck %s --check-prefix=GNU64
 
-#      LLVM64:DynamicSection [ (61 entries)
+#      LLVM64:DynamicSection [ (64 entries)
 # LLVM64-NEXT:  Tag                Type                 Name/Value
 # LLVM64-NEXT:  0x0000000000000001 NEEDED               Shared library: [D]
 # LLVM64-NEXT:  0x0000000000000002 PLTRELSZ             16 (bytes)
 # LLVM64-NEXT:  0x0000000000000003 PLTGOT               0x1000
 # LLVM64-NEXT:  0x0000000000000004 HASH                 0x1000
 # LLVM64-NEXT:  0x0000000000000005 STRTAB               0x1000
 # LLVM64-NEXT:  0x0000000000000006 SYMTAB               0x1000
 # LLVM64-NEXT:  0x0000000000000007 RELA                 0x1000

 # LLVM64-NEXT:  0x0000000000000025 RELRENT              17185 (bytes)
 # LLVM64-NEXT:  0x000000006000000F ANDROID_REL          0x1000
 # LLVM64-NEXT:  0x0000000060000010 ANDROID_RELSZ        16 (bytes)
 # LLVM64-NEXT:  0x0000000060000011 ANDROID_RELA         0x1000
 # LLVM64-NEXT:  0x0000000060000012 ANDROID_RELASZ       16 (bytes)
 # LLVM64-NEXT:  0x000000006FFFE000 ANDROID_RELR         0x1000
 # LLVM64-NEXT:  0x000000006FFFE001 ANDROID_RELRSZ       0x10
 # LLVM64-NEXT:  0x000000006FFFE003 ANDROID_RELRENT      0x1234
+# LLVM64-NEXT:  0x0000000070000012 AARCH64_AUTH_RELR    0x1000
+# LLVM64-NEXT:  0x0000000070000011 AARCH64_AUTH_RELRSZ  16 (bytes)
+# LLVM64-NEXT:  0x0000000070000013 AARCH64_AUTH_RELRENT 22136 (bytes)
 # LLVM64-NEXT:  0x000000006FFFFEF5 GNU_HASH             0x1000
 # LLVM64-NEXT:  0x000000006FFFFEF6 TLSDESC_PLT          0x1000
 # LLVM64-NEXT:  0x000000006FFFFEF7 TLSDESC_GOT          0x1000
 # LLVM64-NEXT:  0x000000006FFFFFF9 RELACOUNT            0
 # LLVM64-NEXT:  0x000000006FFFFFFA RELCOUNT             0
 # LLVM64-NEXT:  0x000000006FFFFFFB FLAGS_1              NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON PIE {{$}}
 # LLVM64-NEXT:  0x000000006FFFFFF0 VERSYM               0x1000
 # LLVM64-NEXT:  0x000000006FFFFFFC VERDEF               0x1000
 # LLVM64-NEXT:  0x000000006FFFFFFD VERDEFNUM            0
 # LLVM64-NEXT:  0x000000006FFFFFFE VERNEED              0x1000
 # LLVM64-NEXT:  0x000000006FFFFFFF VERNEEDNUM           0
 # LLVM64-NEXT:  0x000000007FFFFFFD AUXILIARY            Auxiliary library: [D]
 # LLVM64-NEXT:  0x000000007FFFFFFE USED                 Not needed object: [U]
 # LLVM64-NEXT:  0x000000007FFFFFFF FILTER               Filter library: [U]
 # LLVM64-NEXT:  0x0000000012345678 <unknown:>0x12345678 0x8765432187654321
 # LLVM64-NEXT:  0x000000006ABCDEF0 <unknown:>0x6abcdef0 0x9988776655443322
 # LLVM64-NEXT:  0x0000000076543210 <unknown:>0x76543210 0x5555666677778888
 # LLVM64-NEXT:  0x0000000000000000 NULL                 0x0
 # LLVM64-NEXT:]
 
-#      GNU64:Dynamic section at offset {{.*}} contains 61 entries:
+#      GNU64:Dynamic section at offset {{.*}} contains 64 entries:
 # GNU64-NEXT:  Tag                Type                   Name/Value
 # GNU64-NEXT:  0x0000000000000001 (NEEDED)               Shared library: [D]
 # GNU64-NEXT:  0x0000000000000002 (PLTRELSZ)             16 (bytes)
 # GNU64-NEXT:  0x0000000000000003 (PLTGOT)               0x1000
 # GNU64-NEXT:  0x0000000000000004 (HASH)                 0x1000
 # GNU64-NEXT:  0x0000000000000005 (STRTAB)               0x1000
 # GNU64-NEXT:  0x0000000000000006 (SYMTAB)               0x1000
 # GNU64-NEXT:  0x0000000000000007 (RELA)                 0x1000

 # GNU64-NEXT:  0x0000000000000025 (RELRENT)              17185 (bytes)
 # GNU64-NEXT:  0x000000006000000f (ANDROID_REL)          0x1000
 # GNU64-NEXT:  0x0000000060000010 (ANDROID_RELSZ)        16 (bytes)
 # GNU64-NEXT:  0x0000000060000011 (ANDROID_RELA)         0x1000
 # GNU64-NEXT:  0x0000000060000012 (ANDROID_RELASZ)       16 (bytes)
 # GNU64-NEXT:  0x000000006fffe000 (ANDROID_RELR)         0x1000
 # GNU64-NEXT:  0x000000006fffe001 (ANDROID_RELRSZ)       0x10
 # GNU64-NEXT:  0x000000006fffe003 (ANDROID_RELRENT)      0x1234
+# GNU64-NEXT:  0x0000000070000012 (AARCH64_AUTH_RELR)    0x1000
+# GNU64-NEXT:  0x0000000070000011 (AARCH64_AUTH_RELRSZ)  16 (bytes)
+# GNU64-NEXT:  0x0000000070000013 (AARCH64_AUTH_RELRENT) 22136 (bytes)
 # GNU64-NEXT:  0x000000006ffffef5 (GNU_HASH)             0x1000
 # GNU64-NEXT:  0x000000006ffffef6 (TLSDESC_PLT)          0x1000
 # GNU64-NEXT:  0x000000006ffffef7 (TLSDESC_GOT)          0x1000
 # GNU64-NEXT:  0x000000006ffffff9 (RELACOUNT)            0
 # GNU64-NEXT:  0x000000006ffffffa (RELCOUNT)             0
 # GNU64-NEXT:  0x000000006ffffffb (FLAGS_1)              NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON PIE {{$}}
 # GNU64-NEXT:  0x000000006ffffff0 (VERSYM)               0x1000
 # GNU64-NEXT:  0x000000006ffffffc (VERDEF)               0x1000
Entries:
       - Tag:   DT_ANDROID_RELASZ
         Value: 0x10
       - Tag:   DT_ANDROID_RELR
         Value: 0x1000
       - Tag:   DT_ANDROID_RELRSZ
         Value: 0x10
       - Tag:   DT_ANDROID_RELRENT
         Value: 0x1234
+      - Tag:   DT_AARCH64_AUTH_RELR
+        Value: 0x1000
+      - Tag:   DT_AARCH64_AUTH_RELRSZ
+        Value: 0x10
+      - Tag:   DT_AARCH64_AUTH_RELRENT
+        Value: 0x5678
       - Tag:   DT_GNU_HASH
         Value: 0x1000
       - Tag:   DT_TLSDESC_PLT
         Value: 0x1000
       - Tag:   DT_TLSDESC_GOT
         Value: 0x1000
       - Tag:   DT_RELACOUNT
         Value: 0x0

 # RUN:   -DUNKNOWN=0x87654321 -DOSSPEC=0x99887766 -DPROCSPEC=0x55556666 -o %t2
 # RUN: llvm-readobj --dynamic-table %t2 \
 # RUN:   | FileCheck %s --check-prefix=LLVM32 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj -d %t2 | FileCheck %s --check-prefix=LLVM32 --strict-whitespace --match-full-lines
 # RUN: llvm-readelf --dynamic-table %t2 \
 # RUN:   | FileCheck %s --check-prefix=GNU32 --strict-whitespace --match-full-lines
 # RUN: llvm-readelf -d %t2 | FileCheck %s --check-prefix=GNU32 --strict-whitespace --match-full-lines
 
-#      LLVM32:DynamicSection [ (61 entries)
+#      LLVM32:DynamicSection [ (64 entries)
 # LLVM32-NEXT:  Tag        Type                 Name/Value
 # LLVM32-NEXT:  0x00000001 NEEDED               Shared library: [D]
 # LLVM32-NEXT:  0x00000002 PLTRELSZ             16 (bytes)
 # LLVM32-NEXT:  0x00000003 PLTGOT               0x1000
 # LLVM32-NEXT:  0x00000004 HASH                 0x1000
 # LLVM32-NEXT:  0x00000005 STRTAB               0x1000
 # LLVM32-NEXT:  0x00000006 SYMTAB               0x1000
 # LLVM32-NEXT:  0x00000007 RELA                 0x1000

 # LLVM32-NEXT:  0x00000025 RELRENT              17185 (bytes)
 # LLVM32-NEXT:  0x6000000F ANDROID_REL          0x1000
 # LLVM32-NEXT:  0x60000010 ANDROID_RELSZ        16 (bytes)
 # LLVM32-NEXT:  0x60000011 ANDROID_RELA         0x1000
 # LLVM32-NEXT:  0x60000012 ANDROID_RELASZ       16 (bytes)
 # LLVM32-NEXT:  0x6FFFE000 ANDROID_RELR         0x1000
 # LLVM32-NEXT:  0x6FFFE001 ANDROID_RELRSZ       0x10
 # LLVM32-NEXT:  0x6FFFE003 ANDROID_RELRENT      0x1234
+# LLVM32-NEXT:  0x70000012 AARCH64_AUTH_RELR    0x1000
+# LLVM32-NEXT:  0x70000011 AARCH64_AUTH_RELRSZ  16 (bytes)
+# LLVM32-NEXT:  0x70000013 AARCH64_AUTH_RELRENT 22136 (bytes)
 # LLVM32-NEXT:  0x6FFFFEF5 GNU_HASH             0x1000
 # LLVM32-NEXT:  0x6FFFFEF6 TLSDESC_PLT          0x1000
 # LLVM32-NEXT:  0x6FFFFEF7 TLSDESC_GOT          0x1000
 # LLVM32-NEXT:  0x6FFFFFF9 RELACOUNT            0
 # LLVM32-NEXT:  0x6FFFFFFA RELCOUNT             0
 # LLVM32-NEXT:  0x6FFFFFFB FLAGS_1              NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON PIE {{$}}
 # LLVM32-NEXT:  0x6FFFFFF0 VERSYM               0x1000
 # LLVM32-NEXT:  0x6FFFFFFC VERDEF               0x1000
 # LLVM32-NEXT:  0x6FFFFFFD VERDEFNUM            0
 # LLVM32-NEXT:  0x6FFFFFFE VERNEED              0x1000
 # LLVM32-NEXT:  0x6FFFFFFF VERNEEDNUM           0
 # LLVM32-NEXT:  0x7FFFFFFD AUXILIARY            Auxiliary library: [D]
 # LLVM32-NEXT:  0x7FFFFFFE USED                 Not needed object: [U]
 # LLVM32-NEXT:  0x7FFFFFFF FILTER               Filter library: [U]
 # LLVM32-NEXT:  0x12345678 <unknown:>0x12345678 0x87654321
 # LLVM32-NEXT:  0x6ABCDEF0 <unknown:>0x6abcdef0 0x99887766
 # LLVM32-NEXT:  0x76543210 <unknown:>0x76543210 0x55556666
 # LLVM32-NEXT:  0x00000000 NULL                 0x0
 # LLVM32-NEXT:]
 
-#      GNU32:Dynamic section at offset 0x84 contains 61 entries:
+#      GNU32:Dynamic section at offset 0x84 contains 64 entries:
 # GNU32-NEXT:  Tag        Type                   Name/Value
 # GNU32-NEXT:  0x00000001 (NEEDED)               Shared library: [D]
 # GNU32-NEXT:  0x00000002 (PLTRELSZ)             16 (bytes)
 # GNU32-NEXT:  0x00000003 (PLTGOT)               0x1000
 # GNU32-NEXT:  0x00000004 (HASH)                 0x1000
 # GNU32-NEXT:  0x00000005 (STRTAB)               0x1000
 # GNU32-NEXT:  0x00000006 (SYMTAB)               0x1000
 # GNU32-NEXT:  0x00000007 (RELA)                 0x1000

 # GNU32-NEXT:  0x00000025 (RELRENT)              17185 (bytes)
 # GNU32-NEXT:  0x6000000f (ANDROID_REL)          0x1000
 # GNU32-NEXT:  0x60000010 (ANDROID_RELSZ)        16 (bytes)
 # GNU32-NEXT:  0x60000011 (ANDROID_RELA)         0x1000
 # GNU32-NEXT:  0x60000012 (ANDROID_RELASZ)       16 (bytes)
 # GNU32-NEXT:  0x6fffe000 (ANDROID_RELR)         0x1000
 # GNU32-NEXT:  0x6fffe001 (ANDROID_RELRSZ)       0x10
 # GNU32-NEXT:  0x6fffe003 (ANDROID_RELRENT)      0x1234
+# GNU32-NEXT:  0x70000012 (AARCH64_AUTH_RELR)    0x1000
+# GNU32-NEXT:  0x70000011 (AARCH64_AUTH_RELRSZ)  16 (bytes)
+# GNU32-NEXT:  0x70000013 (AARCH64_AUTH_RELRENT) 22136 (bytes)
 # GNU32-NEXT:  0x6ffffef5 (GNU_HASH)             0x1000
 # GNU32-NEXT:  0x6ffffef6 (TLSDESC_PLT)          0x1000
 # GNU32-NEXT:  0x6ffffef7 (TLSDESC_GOT)          0x1000
 # GNU32-NEXT:  0x6ffffff9 (RELACOUNT)            0
 # GNU32-NEXT:  0x6ffffffa (RELCOUNT)             0
 # GNU32-NEXT:  0x6ffffffb (FLAGS_1)              NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON PIE {{$}}
 # GNU32-NEXT:  0x6ffffff0 (VERSYM)               0x1000
 # GNU32-NEXT:  0x6ffffffc (VERDEF)               0x1000

 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_SYMTAB: invalid e_phentsize: 1
 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_RELA: invalid e_phentsize: 1
 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': DT_SYMENT value of 0x987 is not the size of a symbol (0x18)
 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_REL: invalid e_phentsize: 1
 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_JMPREL: invalid e_phentsize: 1
 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_SYMTAB_SHNDX: invalid e_phentsize: 1
 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_RELR: invalid e_phentsize: 1
 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_ANDROID_RELR: invalid e_phentsize: 1
+# PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_AARCH64_AUTH_RELR: invalid e_phentsize: 1
 # PHENTSIZE-WARN-NEXT: warning: '[[FILE]]': unable to parse DT_GNU_HASH: invalid e_phentsize: 1
 
 # PHENTSIZE-LLVM:      warning: '[[FILE]]': string table was not found
 # PHENTSIZE-LLVM-NEXT: LoadName: <?>
 
-# PHENTSIZE-LLVM:      DynamicSection [ (61 entries)
+# PHENTSIZE-LLVM:      DynamicSection [ (64 entries)
 # PHENTSIZE-LLVM-NEXT:   Tag                Type                 Name/Value
 # PHENTSIZE-LLVM-NEXT:   0x0000000000000001 NEEDED               Shared library: [<?>]
 # PHENTSIZE-LLVM-NEXT:   0x0000000000000002 PLTRELSZ             16 (bytes)
 # PHENTSIZE-LLVM-NEXT:   0x0000000000000003 PLTGOT               0x1000
 # PHENTSIZE-LLVM-NEXT:   0x0000000000000004 HASH                 0x1000
 # PHENTSIZE-LLVM-NEXT:   0x0000000000000005 STRTAB               0x1000
 # PHENTSIZE-LLVM-NEXT:   0x0000000000000006 SYMTAB               0x1000
 # PHENTSIZE-LLVM-NEXT:   0x0000000000000007 RELA                 0x1000

 # PHENTSIZE-LLVM-NEXT:   0x0000000000000025 RELRENT              17185 (bytes)
 # PHENTSIZE-LLVM-NEXT:   0x000000006000000F ANDROID_REL          0x1000
 # PHENTSIZE-LLVM-NEXT:   0x0000000060000010 ANDROID_RELSZ        16 (bytes)
 # PHENTSIZE-LLVM-NEXT:   0x0000000060000011 ANDROID_RELA         0x1000
 # PHENTSIZE-LLVM-NEXT:   0x0000000060000012 ANDROID_RELASZ       16 (bytes)
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFE000 ANDROID_RELR         0x1000
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFE001 ANDROID_RELRSZ       0x10
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFE003 ANDROID_RELRENT      0x1234
+# PHENTSIZE-LLVM-NEXT:   0x0000000070000012 AARCH64_AUTH_RELR    0x1000
+# PHENTSIZE-LLVM-NEXT:   0x0000000070000011 AARCH64_AUTH_RELRSZ  16 (bytes)
+# PHENTSIZE-LLVM-NEXT:   0x0000000070000013 AARCH64_AUTH_RELRENT 22136 (bytes)
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFEF5 GNU_HASH             0x1000
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFEF6 TLSDESC_PLT          0x1000
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFEF7 TLSDESC_GOT          0x1000
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFFF9 RELACOUNT            0
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFFFA RELCOUNT             0
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFFFB FLAGS_1              NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON PIE {{$}}
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFFF0 VERSYM               0x1000
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFFFC VERDEF               0x1000
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFFFD VERDEFNUM            0
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFFFE VERNEED              0x1000
 # PHENTSIZE-LLVM-NEXT:   0x000000006FFFFFFF VERNEEDNUM           0
 # PHENTSIZE-LLVM-NEXT:   0x000000007FFFFFFD AUXILIARY            Auxiliary library: [<?>]
 # PHENTSIZE-LLVM-NEXT:   0x000000007FFFFFFE USED                 Not needed object: [<?>]
 # PHENTSIZE-LLVM-NEXT:   0x000000007FFFFFFF FILTER               Filter library: [<?>]
 # PHENTSIZE-LLVM-NEXT:   0x0000000012345678 <unknown:>0x12345678 0x8765432187654321
 # PHENTSIZE-LLVM-NEXT:   0x000000006ABCDEF0 <unknown:>0x6abcdef0 0x9988776655443322
 # PHENTSIZE-LLVM-NEXT:   0x0000000076543210 <unknown:>0x76543210 0x5555666677778888
 # PHENTSIZE-LLVM-NEXT:   0x0000000000000000 NULL                 0x0
 # PHENTSIZE-LLVM-NEXT: ]
 
-# PHENTSIZE-GNU:      Dynamic section at offset 0xc0 contains 61 entries:
+# PHENTSIZE-GNU:      Dynamic section at offset 0xc0 contains 64 entries:
 # PHENTSIZE-GNU-NEXT:   Tag                Type                   Name/Value
 # PHENTSIZE-GNU-NEXT: warning: '[[FILE]]': string table was not found
 # PHENTSIZE-GNU-NEXT:   0x0000000000000001 (NEEDED)               Shared library: [<?>]
 # PHENTSIZE-GNU-NEXT:   0x0000000000000002 (PLTRELSZ)             16 (bytes)
 # PHENTSIZE-GNU-NEXT:   0x0000000000000003 (PLTGOT)               0x1000
 # PHENTSIZE-GNU-NEXT:   0x0000000000000004 (HASH)                 0x1000
 # PHENTSIZE-GNU-NEXT:   0x0000000000000005 (STRTAB)               0x1000
 # PHENTSIZE-GNU-NEXT:   0x0000000000000006 (SYMTAB)               0x1000

 # PHENTSIZE-GNU-NEXT:   0x0000000000000025 (RELRENT)              17185 (bytes)
 # PHENTSIZE-GNU-NEXT:   0x000000006000000f (ANDROID_REL)          0x1000
 # PHENTSIZE-GNU-NEXT:   0x0000000060000010 (ANDROID_RELSZ)        16 (bytes)
 # PHENTSIZE-GNU-NEXT:   0x0000000060000011 (ANDROID_RELA)         0x1000
 # PHENTSIZE-GNU-NEXT:   0x0000000060000012 (ANDROID_RELASZ)       16 (bytes)
 # PHENTSIZE-GNU-NEXT:   0x000000006fffe000 (ANDROID_RELR)         0x1000
 # PHENTSIZE-GNU-NEXT:   0x000000006fffe001 (ANDROID_RELRSZ)       0x10
 # PHENTSIZE-GNU-NEXT:   0x000000006fffe003 (ANDROID_RELRENT)      0x1234
+# PHENTSIZE-GNU-NEXT:   0x0000000070000012 (AARCH64_AUTH_RELR)    0x1000
+# PHENTSIZE-GNU-NEXT:   0x0000000070000011 (AARCH64_AUTH_RELRSZ)  16 (bytes)
+# PHENTSIZE-GNU-NEXT:   0x0000000070000013 (AARCH64_AUTH_RELRENT) 22136 (bytes)
 # PHENTSIZE-GNU-NEXT:   0x000000006ffffef5 (GNU_HASH)             0x1000
 # PHENTSIZE-GNU-NEXT:   0x000000006ffffef6 (TLSDESC_PLT)          0x1000
 # PHENTSIZE-GNU-NEXT:   0x000000006ffffef7 (TLSDESC_GOT)          0x1000
 # PHENTSIZE-GNU-NEXT:   0x000000006ffffff9 (RELACOUNT)            0
 # PHENTSIZE-GNU-NEXT:   0x000000006ffffffa (RELCOUNT)             0
 # PHENTSIZE-GNU-NEXT:   0x000000006ffffffb (FLAGS_1)              NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON PIE
 # PHENTSIZE-GNU-NEXT:   0x000000006ffffff0 (VERSYM)               0x1000
 # PHENTSIZE-GNU-NEXT:   0x000000006ffffffc (VERDEF)               0x1000

llvm/test/tools/llvm-readobj/ELF/relr-relocs.test

- Name:    .relr.dyn
     Flags:   [ SHF_ALLOC ]
     Entries: [ 0x00010D60, 0x00000103, 0x00020000,
                0x000F0501, 0x50400009 ]
     EntSize: [[ENTSIZE=<none>]]
     ShType:  [[SHTYPE=<none>]]
     Link:    [[LINK=<none>]]
 
 ## Check we report a warning when we are unable to dump relocations
-## for a SHT_RELR/SHT_ANDROID_RELR section.
+## for a SHT_RELR/SHT_ANDROID_RELR/SHT_AARCH64_AUTH_RELR section.
 
 ## Case A: check the case when relocations can't be read from an SHT_RELR section.
 # RUN: yaml2obj --docnum=2 -DENTSIZE=1 %s -o %t2.broken
 # RUN: llvm-readobj --relocations %t2.broken 2>&1 | \
 # RUN:   FileCheck -DFILE=%t2.broken --check-prefix=BROKEN-LLVM %s -DSECNAME=SHT_RELR
 # RUN: llvm-readelf --relocations %t2.broken 2>&1 | \
 # RUN:   FileCheck -DFILE=%t2.broken --check-prefix=BROKEN-GNU %s -DSECNAME=SHT_RELR
 

 ## Case B: check the case when relocations can't be read from an SHT_ANDROID_RELR section.
 ##         SHT_ANDROID_RELR = 0x6fffff00.
 # RUN: yaml2obj --docnum=2 -DENTSIZE=1 -DSHTYPE=0x6fffff00 %s -o %t2.broken.android
 # RUN: llvm-readobj --relocations %t2.broken.android 2>&1 | \
 # RUN:   FileCheck -DFILE=%t2.broken.android --check-prefix=BROKEN-LLVM %s -DSECNAME=SHT_ANDROID_RELR
 # RUN: llvm-readelf --relocations %t2.broken.android 2>&1 | \
 # RUN:   FileCheck -DFILE=%t2.broken.android --check-prefix=BROKEN-GNU %s -DSECNAME=SHT_ANDROID_RELR
 
-## Check the behavior when the sh_link field of the SHT_RELR/SHT_ANDROID_RELR section
+## Case C: check the case when relocations can't be read from an SHT_AARCH64_AUTH_RELR section.
+##         SHT_AARCH64_AUTH_RELR = 0x70000004.
+# RUN: yaml2obj --docnum=2 -DENTSIZE=1 -DSHTYPE=0x70000004 %s -o %t2.broken.aarch64auth
+# RUN: llvm-readobj --relocations %t2.broken.aarch64auth 2>&1 | \
+# RUN:   FileCheck -DFILE=%t2.broken.aarch64auth --check-prefix=BROKEN-LLVM-AARCH64-AUTH %s -DSECNAME=SHT_AARCH64_AUTH_RELR
+# RUN: llvm-readelf --relocations %t2.broken.aarch64auth 2>&1 | \
+# RUN:   FileCheck -DFILE=%t2.broken.aarch64auth --check-prefix=BROKEN-GNU-AARCH64-AUTH %s -DSECNAME=SHT_AARCH64_AUTH_RELR
+
+# BROKEN-LLVM-AARCH64-AUTH:      Relocations [
+# BROKEN-LLVM-AARCH64-AUTH-NEXT:   Section (1) .relr.dyn {
+# BROKEN-LLVM-AARCH64-AUTH-NEXT: warning: '[[FILE]]': SHT_AARCH64_AUTH_RELR section in non-AArch64 ELF found, skipping
+# BROKEN-LLVM-AARCH64-AUTH-NEXT:   }
+# BROKEN-LLVM-AARCH64-AUTH-NEXT: ]
+
+# BROKEN-GNU-AARCH64-AUTH:      Relocation section '.relr.dyn' at offset 0x34 contains <?> entries:
+# BROKEN-GNU-AARCH64-AUTH-NEXT:  Offset     Info    Type                Sym. Value  Symbol's Name
+# BROKEN-GNU-AARCH64-AUTH-NEXT: warning: '[[FILE]]': SHT_AARCH64_AUTH_RELR section in non-AArch64 ELF found, skipping
+
+## Check the behavior when the sh_link field of the SHT_RELR/SHT_ANDROID_RELR/SHT_AARCH64_AUTH_RELR section
 ## is set to an arbitrary value. Normally, it is set to 0, because such sections contains
 ## only relative relocations and do not have an associated symbol table, like other
 ## relocation sections.
 
 ## Case A: check we do not report warnings when the sh_link field is set to an arbitrary value
 ##         and the --relocations option is requested.
 # RUN: yaml2obj --docnum=2 -DLINK=0xff %s -o %t2.has.link
 # RUN: llvm-readobj --relocations %t2.has.link 2>&1 | \

llvm/test/tools/llvm-readobj/ELF/section-types.test

 # LLVM: Name: relr
 # LLVM: Type: SHT_RELR
 # LLVM: Name: android_rel
 # LLVM: Type: SHT_ANDROID_REL
 # LLVM: Name: android_rela
 # LLVM: Type: SHT_ANDROID_RELA
 # LLVM: Name: android_relr
 # LLVM: Type: SHT_ANDROID_RELR
+# LLVM: Name: aarch64_auth_relr
+# LLVM: Type: SHT_AARCH64_AUTH_RELR
 # LLVM: Name: llvm_odrtab
 # LLVM: Type: SHT_LLVM_ODRTAB
 # LLVM: Name: linker_options
 # LLVM: Type: SHT_LLVM_LINKER_OPTIONS
 # LLVM: Name: llvm_call_graph_profile
 # LLVM: Type: SHT_LLVM_CALL_GRAPH_PROFILE
 # LLVM: Name: llvm_addrsig
 # LLVM: Type: SHT_LLVM_ADDRSIG

 # GNU-NEXT: fini_array              FINI_ARRAY
 # GNU-NEXT: preinit_array           PREINIT_ARRAY
 # GNU-NEXT: group                   GROUP
 # GNU-NEXT: symtab_shndx            SYMTAB SECTION INDICES
 # GNU-NEXT: relr                    RELR
 # GNU-NEXT: android_rel             ANDROID_REL
 # GNU-NEXT: android_rela            ANDROID_RELA
 # GNU-NEXT: android_relr            ANDROID_RELR
+# GNU-NEXT: aarch64_auth_relr       AARCH64_AUTH_RELR
 # GNU-NEXT: llvm_odrtab             LLVM_ODRTAB
 # GNU-NEXT: linker_options          LLVM_LINKER_OPTIONS
 # GNU-NEXT: llvm_call_graph_profile LLVM_CALL_GRAPH_PROFILE
 # GNU-NEXT: llvm_addrsig            LLVM_ADDRSIG
 # GNU-NEXT: .deplibs                LLVM_DEPENDENT_LIBRARIES
 # GNU-NEXT: .llvm_sympart.f         LLVM_SYMPART
 # GNU-NEXT: part1                   LLVM_PART_EHDR
 # GNU-NEXT: .phdrs                  LLVM_PART_PHDR
Sections:
   - Name: relr
     Type: SHT_RELR
   - Name: android_rel
     Type: SHT_ANDROID_REL
   - Name: android_rela
     Type: SHT_ANDROID_RELA
   - Name: android_relr
     Type: SHT_ANDROID_RELR
+  - Name: aarch64_auth_relr
+    Type: SHT_AARCH64_AUTH_RELR
   - Name: llvm_odrtab
     Type: SHT_LLVM_ODRTAB
   - Name: linker_options
     Type: SHT_LLVM_LINKER_OPTIONS
   - Name: llvm_call_graph_profile
     Type: SHT_LLVM_CALL_GRAPH_PROFILE
   - Name: llvm_addrsig
     Type: SHT_LLVM_ADDRSIG

llvm/tools/llvm-readobj/ELFDumper.cpp

case ELF::DT_RELSZ:
       DynRelRegion.SizePrintName = "DT_RELSZ value";
       break;
     case ELF::DT_RELENT:
       DynRelRegion.EntSize = Dyn.getVal();
       DynRelRegion.EntSizePrintName = "DT_RELENT value";
       break;
     case ELF::DT_RELR:
     case ELF::DT_ANDROID_RELR:
+    case ELF::DT_AARCH64_AUTH_RELR:
       DynRelrRegion.Addr = toMappedAddr(Dyn.getTag(), Dyn.getPtr());
       break;
     case ELF::DT_RELRSZ:
     case ELF::DT_ANDROID_RELRSZ:
+    case ELF::DT_AARCH64_AUTH_RELRSZ:
       DynRelrRegion.Size = Dyn.getVal();
-      DynRelrRegion.SizePrintName = Dyn.d_tag == ELF::DT_RELRSZ
-                                        ? "DT_RELRSZ value"
-                                        : "DT_ANDROID_RELRSZ value";
+      if (Dyn.d_tag == ELF::DT_RELRSZ)
+        DynRelrRegion.SizePrintName = "DT_RELRSZ value";
+      else if (Dyn.d_tag == ELF::DT_ANDROID_RELRSZ)
+        DynRelrRegion.SizePrintName = "DT_ANDROID_RELRSZ value";
+      else if (Dyn.d_tag == ELF::DT_AARCH64_AUTH_RELRSZ)
+        DynRelrRegion.SizePrintName = "DT_AARCH64_AUTH_RELRSZ value";
+      else
+        llvm_unreachable("unexpected Dyn.d_tag value");
       break;
     case ELF::DT_RELRENT:
     case ELF::DT_ANDROID_RELRENT:
+    case ELF::DT_AARCH64_AUTH_RELRENT:
       DynRelrRegion.EntSize = Dyn.getVal();
-      DynRelrRegion.EntSizePrintName = Dyn.d_tag == ELF::DT_RELRENT
-                                           ? "DT_RELRENT value"
-                                           : "DT_ANDROID_RELRENT value";
+      if (Dyn.d_tag == ELF::DT_RELRENT)
+        DynRelrRegion.EntSizePrintName = "DT_RELRENT value";
+      else if (Dyn.d_tag == ELF::DT_ANDROID_RELRENT)
+        DynRelrRegion.EntSizePrintName = "DT_ANDROID_RELRENT value";
+      else if (Dyn.d_tag == ELF::DT_AARCH64_AUTH_RELRENT)
+        DynRelrRegion.EntSizePrintName = "DT_AARCH64_AUTH_RELRENT value";
+      else
+        llvm_unreachable("unexpected Dyn.d_tag value");
       break;
     case ELF::DT_PLTREL:
       if (Dyn.getVal() == DT_REL)
         DynPLTRelRegion.EntSize = sizeof(Elf_Rel);
       else if (Dyn.getVal() == DT_RELA)
         DynPLTRelRegion.EntSize = sizeof(Elf_Rela);
       else
         reportUniqueWarning(Twine("unknown DT_PLTREL value of ") +
std::string ELFDumper<ELFT>::getDynamicEntry(uint64_t Type,
   case DT_SYMENT:
   case DT_RELSZ:
   case DT_RELENT:
   case DT_INIT_ARRAYSZ:
   case DT_FINI_ARRAYSZ:
   case DT_PREINIT_ARRAYSZ:
   case DT_RELRSZ:
   case DT_RELRENT:
+  case DT_AARCH64_AUTH_RELRSZ:
+  case DT_AARCH64_AUTH_RELRENT:
   case DT_ANDROID_RELSZ:
   case DT_ANDROID_RELASZ:
     return std::to_string(Value) + " (bytes)";
   case DT_NEEDED:
   case DT_SONAME:
   case DT_AUXILIARY:
   case DT_USED:
   case DT_FILTER:
if (std::optional<int64_t> A = R.Addend) {
     Addend += utohexstr(RelAddend, /*LowerCase=*/true);
   }
   OS << Addend << "\n";
 }
 
 template <class ELFT>
 static void printRelocHeaderFields(formatted_raw_ostream &OS, unsigned SType) {
   bool IsRela = SType == ELF::SHT_RELA || SType == ELF::SHT_ANDROID_RELA;
-  bool IsRelr = SType == ELF::SHT_RELR || SType == ELF::SHT_ANDROID_RELR;
+  bool IsRelr = SType == ELF::SHT_RELR || SType == ELF::SHT_ANDROID_RELR ||
+                SType == ELF::SHT_AARCH64_AUTH_RELR;
   if (ELFT::Is64Bits)
     OS << "    ";
   else
     OS << " ";
   if (IsRelr && opts::RawRelr)
     OS << "Data  ";
   else
     OS << "Offset";
void GNUELFDumper<ELFT>::printDynamicRelocHeader(unsigned Type, StringRef Name,
   printRelocHeaderFields<ELFT>(OS, Type);
 }
 
 template <class ELFT>
 static bool isRelocationSec(const typename ELFT::Shdr &Sec) {
   return Sec.sh_type == ELF::SHT_REL || Sec.sh_type == ELF::SHT_RELA ||
          Sec.sh_type == ELF::SHT_RELR || Sec.sh_type == ELF::SHT_ANDROID_REL ||
          Sec.sh_type == ELF::SHT_ANDROID_RELA ||
-         Sec.sh_type == ELF::SHT_ANDROID_RELR;
+         Sec.sh_type == ELF::SHT_ANDROID_RELR ||
+         Sec.sh_type == ELF::SHT_AARCH64_AUTH_RELR;
 }
 
 template <class ELFT> void GNUELFDumper<ELFT>::printRelocations() {
   auto GetEntriesNum = [&](const Elf_Shdr &Sec) -> Expected<size_t> {
     // Android's packed relocation section needs to be unpacked first
     // to get the actual number of entries.
     if (Sec.sh_type == ELF::SHT_ANDROID_REL ||
         Sec.sh_type == ELF::SHT_ANDROID_RELA) {
       Expected<std::vector<typename ELFT::Rela>> RelasOrErr =
           this->Obj.android_relas(Sec);
       if (!RelasOrErr)
         return RelasOrErr.takeError();
       return RelasOrErr->size();
     }
 
-    if (!opts::RawRelr && (Sec.sh_type == ELF::SHT_RELR ||
-                           Sec.sh_type == ELF::SHT_ANDROID_RELR)) {
+    if (!opts::RawRelr &&
+        (Sec.sh_type == ELF::SHT_RELR || Sec.sh_type == ELF::SHT_ANDROID_RELR ||
+         Sec.sh_type == ELF::SHT_AARCH64_AUTH_RELR)) {
       Expected<Elf_Relr_Range> RelrsOrErr = this->Obj.relrs(Sec);
       if (!RelrsOrErr)
         return RelrsOrErr.takeError();
       return this->Obj.decode_relrs(*RelrsOrErr).size();
     }
 
     return Sec.getEntityCount();
   };
static bool printAndroidNote(raw_ostream &OS, uint32_t NoteType,
   if (Props.empty())
     return false;
   for (const auto &KV : Props)
     OS << "    " << KV.first << ": " << KV.second << '\n';
   return true;
 }
 
 template <class ELFT>
+static bool printAArch64Note(raw_ostream &OS, uint32_t NoteType,
+                             ArrayRef<uint8_t> Desc) {
+  if (NoteType != NT_ARM_TYPE_PAUTH_ABI_TAG)
+    return false;
+
+  OS << "    AArch64 PAuth ABI tag: ";
+  if (Desc.size() < 16) {
+    OS << format("<corrupted size: expected at least 16, got %d>", Desc.size());
+    return false;
+  }
+
+  uint64_t platform =
+      support::endian::read64<ELFT::TargetEndianness>(Desc.data() + 0);
+  uint64_t version =
+      support::endian::read64<ELFT::TargetEndianness>(Desc.data() + 8);
+  OS << format("platform 0x%x, version 0x%x", platform, version);
+
+  if (Desc.size() > 16)
+    OS << ", additional info 0x"
+       << toHex(ArrayRef<uint8_t>(Desc.data() + 16, Desc.size() - 16));
+
+  return true;
+}
+
+template <class ELFT>
 void GNUELFDumper<ELFT>::printMemtag(
     const ArrayRef<std::pair<std::string, std::string>> DynamicEntries,
     const ArrayRef<uint8_t> AndroidNoteDesc,
     const ArrayRef<std::pair<uint64_t, uint64_t>> Descriptors) {
   OS << "Memtag Dynamic Entries:\n";
   if (DynamicEntries.empty())
     OS << "    < none found >\n";
   for (const auto &DynamicEntryKV : DynamicEntries)

 
 const NoteType AndroidNoteTypes[] = {
     {ELF::NT_ANDROID_TYPE_IDENT, "NT_ANDROID_TYPE_IDENT"},
     {ELF::NT_ANDROID_TYPE_KUSER, "NT_ANDROID_TYPE_KUSER"},
     {ELF::NT_ANDROID_TYPE_MEMTAG,
      "NT_ANDROID_TYPE_MEMTAG (Android memory tagging information)"},
 };
 
+const NoteType ARMNoteTypes[] = {
+    {ELF::NT_ARM_TYPE_PAUTH_ABI_TAG, "NT_ARM_TYPE_PAUTH_ABI_TAG"},
+};
+
 const NoteType CoreNoteTypes[] = {
     {ELF::NT_PRSTATUS, "NT_PRSTATUS (prstatus structure)"},
     {ELF::NT_FPREGSET, "NT_FPREGSET (floating point registers)"},
     {ELF::NT_PRPSINFO, "NT_PRPSINFO (prpsinfo structure)"},
     {ELF::NT_TASKSTRUCT, "NT_TASKSTRUCT (task structure)"},
     {ELF::NT_AUXV, "NT_AUXV (auxiliary vector)"},
     {ELF::NT_PSTATUS, "NT_PSTATUS (pstatus structure)"},
     {ELF::NT_FPREGS, "NT_FPREGS (floating point registers)"},
StringRef getNoteTypeName(const typename ELFT::Note &Note, unsigned ELFType) {
   if (Name == "AMD")
     return FindNote(AMDNoteTypes);
   if (Name == "AMDGPU")
     return FindNote(AMDGPUNoteTypes);
   if (Name == "LLVMOMPOFFLOAD")
     return FindNote(LLVMOMPOFFLOADNoteTypes);
   if (Name == "Android")
     return FindNote(AndroidNoteTypes);
+  if (Name == "ARM")
+    return FindNote(ARMNoteTypes);
 
   if (ELFType == ELF::ET_CORE)
     return FindNote(CoreNoteTypes);
   return FindNote(GenericNoteTypes);
 }
 
 template <class ELFT>
 static void processNotesHelper(
if (Name == "GNU") {
           return Error::success();
         } else {
           return NoteOrErr.takeError();
         }
       }
     } else if (Name == "Android") {
       if (printAndroidNote(OS, Type, Descriptor))
         return Error::success();
+    } else if (Name == "ARM") {
+      if (printAArch64Note<ELFT>(OS, Type, Descriptor))
+        return Error::success();
     }
     if (!Descriptor.empty()) {
       OS << "   description data:";
       for (uint8_t B : Descriptor)
         OS << " " << format("%02x", B);
       OS << '\n';
     }
     return Error::success();
llvm::function_ref<void(const Relocation<ELFT> &, unsigned,
         RelRelaFn,
     llvm::function_ref<void(const Elf_Relr &)> RelrFn) {
   auto Warn = [&](Error &&E,
                   const Twine &Prefix = "unable to read relocations from") {
     this->reportUniqueWarning(Prefix + " " + describe(Sec) + ": " +
                               toString(std::move(E)));
   };
 
-  // SHT_RELR/SHT_ANDROID_RELR sections do not have an associated symbol table.
-  // For them we should not treat the value of the sh_link field as an index of
-  // a symbol table.
+  // SHT_RELR/SHT_ANDROID_RELR/SHT_AARCH64_AUTH_RELR sections do not have an
+  // associated symbol table. For them we should not treat the value of the
+  // sh_link field as an index of a symbol table.
   const Elf_Shdr *SymTab;
-  if (Sec.sh_type != ELF::SHT_RELR && Sec.sh_type != ELF::SHT_ANDROID_RELR) {
+  if (Sec.sh_type != ELF::SHT_RELR && Sec.sh_type != ELF::SHT_ANDROID_RELR &&
+      Sec.sh_type != ELF::SHT_AARCH64_AUTH_RELR) {
     Expected<const Elf_Shdr *> SymTabOrErr = Obj.getSection(Sec.sh_link);
     if (!SymTabOrErr) {
       Warn(SymTabOrErr.takeError(), "unable to locate a symbol table for");
       return;
     }
     SymTab = *SymTabOrErr;
   }
 
void ELFDumper<ELFT>::forEachRelocationDo(
   case ELF::SHT_RELA:
     if (Expected<Elf_Rela_Range> RangeOrErr = Obj.relas(Sec)) {
       for (const Elf_Rela &R : *RangeOrErr)
         RelRelaFn(Relocation<ELFT>(R, IsMips64EL), RelNdx++, Sec, SymTab);
     } else {
       Warn(RangeOrErr.takeError());
     }
     break;
+  case ELF::SHT_AARCH64_AUTH_RELR:
+    if (Obj.getHeader().e_machine != EM_AARCH64) {
+      this->reportUniqueWarning("SHT_AARCH64_AUTH_RELR section in non-AArch64 ELF found, skipping");
+      break;
+    }
+    [[fallthrough]];
   case ELF::SHT_RELR:
   case ELF::SHT_ANDROID_RELR: {
     Expected<Elf_Relr_Range> RangeOrErr = Obj.relrs(Sec);
     if (!RangeOrErr) {
       Warn(RangeOrErr.takeError());
       break;
     }
     if (RawRelr) {
static bool printAndroidNoteLLVMStyle(uint32_t NoteType, ArrayRef<uint8_t> Desc,
   if (Props.empty())
     return false;
   for (const auto &KV : Props)
     W.printString(KV.first, KV.second);
   return true;
 }
 
 template <class ELFT>
+static bool printAarch64NoteLLVMStyle(uint32_t NoteType, ArrayRef<uint8_t> Desc,
+                                      ScopedPrinter &W) {
+  if (NoteType != NT_ARM_TYPE_PAUTH_ABI_TAG)
+    return false;
+
+  if (Desc.size() < 16)
+    return false;
+
+  uint64_t platform =
+      support::endian::read64<ELFT::TargetEndianness>(Desc.data() + 0);
+  uint64_t version =
+      support::endian::read64<ELFT::TargetEndianness>(Desc.data() + 8);
+  W.printNumber("Platform", platform);
+  W.printNumber("Version", version);
+
+  if (Desc.size() > 16)
+    W.printString("Additional info",
+                  toHex(ArrayRef<uint8_t>(Desc.data() + 16, Desc.size() - 16)));
+
+  return true;
+}
+
+template <class ELFT>
 void LLVMELFDumper<ELFT>::printMemtag(
     const ArrayRef<std::pair<std::string, std::string>> DynamicEntries,
     const ArrayRef<uint8_t> AndroidNoteDesc,
     const ArrayRef<std::pair<uint64_t, uint64_t>> Descriptors) {
   {
     ListScope L(W, "Memtag Dynamic Entries:");
     if (DynamicEntries.empty())
       W.printString("< none found >");
if (Name == "GNU") {
           return Error::success();
         } else {
           return N.takeError();
         }
       }
     } else if (Name == "Android") {
       if (printAndroidNoteLLVMStyle(Type, Descriptor, W))
         return Error::success();
+    } else if (Name == "ARM") {
+      if (printAarch64NoteLLVMStyle<ELFT>(Type, Descriptor, W))
+        return Error::success();
     }
     if (!Descriptor.empty()) {
       W.printBinaryBlock("Description data", Descriptor);
     }
     return Error::success();
   };
 
   processNotesHelper(*this, /*StartNotesFn=*/StartNotes,