[llvm] WIP [readobj][AArch64] Parse AArch64 build attributes (PR #124276)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 17 08:15:17 PST 2025
https://github.com/sivan-shani updated https://github.com/llvm/llvm-project/pull/124276
>From 512784fb28c46c818e8714759d4b1e597d58320b Mon Sep 17 00:00:00 2001
From: Sivan Shani <sivan.shani at arm.com>
Date: Mon, 17 Feb 2025 10:58:15 +0000
Subject: [PATCH 1/7] [AArch64][Build Attributes] Improve testing (delete
previous tests files)
This commit deletes previous tests files, following commits adding new test files.
---
.../aarch64-build-attributes-asm-all.s | 25 -------
.../aarch64-build-attributes-asm-bti.s | 18 -----
.../aarch64-build-attributes-asm-err-attrs.s | 70 -------------------
...aarch64-build-attributes-asm-err-headers.s | 61 ----------------
.../aarch64-build-attributes-asm-gcs.s | 18 -----
.../aarch64-build-attributes-asm-none.s | 25 -------
...ch64-build-attributes-asm-numerical-tags.s | 39 -----------
...arch64-build-attributes-asm-out-of-order.s | 48 -------------
.../aarch64-build-attributes-asm-pac.s | 18 -----
...d-attributes-asm-private-subsections-err.s | 28 --------
...build-attributes-asm-private-subsections.s | 51 --------------
11 files changed, 401 deletions(-)
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-all.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-bti.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-attrs.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-headers.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-gcs.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-none.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-numerical-tags.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-out-of-order.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-pac.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections-err.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections.s
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-all.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-all.s
deleted file mode 100644
index acbd0101e13fa..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-all.s
+++ /dev/null
@@ -1,25 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
-
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_attribute Tag_PAuth_Platform, 1
-// ASM: .aeabi_attribute Tag_PAuth_Schema, 1
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_BTI, 1
-// ASM: .aeabi_attribute Tag_Feature_PAC, 1
-// ASM: .aeabi_attribute Tag_Feature_GCS, 1
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41190000 00616561 62695f70 61757468 A....aeabi_pauth
-// ELF-NEXT: 0x00000010 61626900 00000101 02012300 00006165 abi.......#...ae
-// ELF-NEXT: 0x00000020 6162695f 66656174 7572655f 616e645f abi_feature_and_
-// ELF-NEXT: 0x00000030 62697473 00010000 01010102 01
-
-
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute Tag_PAuth_Platform, 1
-.aeabi_attribute Tag_PAuth_Schema, 1
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_Feature_BTI, 1
-.aeabi_attribute Tag_Feature_PAC, 1
-.aeabi_attribute Tag_Feature_GCS, 1
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-bti.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-bti.s
deleted file mode 100644
index 3897fee99c3ee..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-bti.s
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
-
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_BTI, 1
-// ASM: .aeabi_attribute Tag_Feature_PAC, 0
-// ASM: .aeabi_attribute Tag_Feature_GCS, 0
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
-// ELF-NEXT: 0x00000010 72655f61 6e645f62 69747300 01000001 re_and_bits.....
-// ELF-NEXT: 0x00000020 01000200
-
-
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_Feature_BTI, 1
-.aeabi_attribute Tag_Feature_PAC, 0
-.aeabi_attribute Tag_Feature_GCS, 0
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-attrs.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-attrs.s
deleted file mode 100644
index ddf8feb9428d2..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-attrs.s
+++ /dev/null
@@ -1,70 +0,0 @@
-// RUN: not llvm-mc -triple=aarch64 %s 2>&1 | FileCheck --check-prefix=ERR %s
-
-.aeabi_attribute Tag_Feature_BTI, 1
-// ERR: error: no active subsection, build attribute can not be added
-// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
-
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute Tag_Feature_BTI, 1
-// ERR: error: unknown AArch64 build attribute 'Tag_Feature_BTI' for subsection 'aeabi_pauthabi'
-// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
-
-.aeabi_attribute Tag_PAuth_Platform, 4
-// ERR: error: unknown AArch64 build attributes Value for Tag 'Tag_PAuth_Platform' options are 0|1
-// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, 4
-
-.aeabi_attribute a, 1
-// ERR: error: unknown AArch64 build attribute 'a' for subsection 'aeabi_pauthabi'
-// ERR-NEXT: .aeabi_attribute a, 1
-
-.aeabi_attribute Tag_PAuth_Platform, Tag_PAuth_Platform
-// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
-// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, Tag_PAuth_Platform
-
-.aeabi_attribute Tag_PAuth_Platform, a
-// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
-// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, a
-
-.aeabi_attribute Tag_PAuth_Platform,
-// ERR: error: AArch64 build attributes value not found
-// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform,
-
-.aeabi_attribute Tag_PAuth_Platform
-// ERR: error: expected comma
-// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform
-
-.aeabi_attribute
-// ERR: error: AArch64 build attributes tag not found
-// ERR-NEXT: .aeabi_attribute
-
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_PAuth_Platform, 1
-// ERR: unknown AArch64 build attribute 'Tag_PAuth_Platform' for subsection 'aeabi_feature_and_bits'
-
-.aeabi_attribute a, 1
-// ERR: error: unknown AArch64 build attribute 'a' for subsection 'aeabi_feature_and_bits'
-
-.aeabi_attribute Tag_Feature_BTI, Tag_Feature_BTI
-// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
-// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, Tag_Feature_BTI
-
-.aeabi_attribute Tag_Feature_BTI, a
-// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
-// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, a
-
-.aeabi_attribute Tag_Feature_BTI,
-// ERR: error: AArch64 build attributes value not found
-// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI,
-
-.aeabi_attribute Tag_Feature_BTI
-// ERR: error: expected comma
-// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI
-
-.aeabi_attribute
-// ERR: error: AArch64 build attributes tag not found
-// ERR-NEXT: .aeabi_attribute
-
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute Tag_PAuth_Platform, 1 some_text
-// ERR: error: unexpected token for AArch64 build attributes tag and value attribute directive
-// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, 1 some_text
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-headers.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-headers.s
deleted file mode 100644
index 9e6dca341e9f8..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-headers.s
+++ /dev/null
@@ -1,61 +0,0 @@
-// RUN: not llvm-mc -triple=aarch64 %s 2>&1 | FileCheck --check-prefix=ERR %s
-
-.aeabi_subsection aeabi_pauthabi, optional, uleb128
-// ERR: error: aeabi_pauthabi must be marked as required
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, optional, uleb128
-
-.aeabi_subsection aeabi_pauthabi, required, ntbs
-// ERR: error: aeabi_pauthabi must be marked as ULEB128
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required, ntbs
-
-.aeabi_subsection aeabi_feature_and_bits, required, uleb128
-// ERR: error: aeabi_feature_and_bits must be marked as optional
-// ERR-NEXT: .aeabi_subsection aeabi_feature_and_bits, required, uleb128
-
-.aeabi_subsection aeabi_feature_and_bits, optional, ntbs
-// ERR: error: aeabi_feature_and_bits must be marked as ULEB128
-// ERR-NEXT: .aeabi_subsection aeabi_feature_and_bits, optional, ntbs
-
-.aeabi_subsection 1, required, uleb128
-// ERR: error: subsection name not found
-// ERR-NEXT: .aeabi_subsection 1, required, uleb128
-
-.aeabi_subsection , required, uleb128
-// ERR: error: subsection name not found
-// ERR-NEXT: .aeabi_subsection , required, uleb128
-
-.aeabi_subsection aeabi_pauthabi, a, uleb128
-// ERR: error: unknown AArch64 build attributes optionality, expected required|optional: a
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, a, uleb128
-
-.aeabi_subsection aeabi_pauthabi, a, uleb128
-// ERR: error: unknown AArch64 build attributes optionality, expected required|optional: a
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, a, uleb128
-
-.aeabi_subsection aeabi_pauthabi, 1, uleb128
-// ERR: error: optionality parameter not found, expected required|optional
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, 1, uleb128
-
-.aeabi_subsection aeabi_pauthabi, ,uleb128
-// ERR: error: optionality parameter not found, expected required|optional
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, ,uleb128
-
-.aeabi_subsection aeabi_pauthabi,uleb128
-// ERR: error: unknown AArch64 build attributes optionality, expected required|optional: uleb128
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi,uleb128
-
-.aeabi_subsection aeabi_pauthabi uleb128
-// ERR: expected comma
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi uleb128
-
-.aeabi_subsection aeabi_pauthabi, required
-// ERR: error: expected comma
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required
-
-.aeabi_subsection aeabi_pauthabi, required,
-// ERR: error: type parameter not found, expected uleb128|ntbs
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required,
-
-.aeabi_subsection aeabi_pauthabi, required, a
-// ERR: error: unknown AArch64 build attributes type, expected uleb128|ntbs: a
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required, a
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-gcs.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-gcs.s
deleted file mode 100644
index 5cb7e6835e5c1..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-gcs.s
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
-
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_BTI, 0
-// ASM: .aeabi_attribute Tag_Feature_PAC, 0
-// ASM: .aeabi_attribute Tag_Feature_GCS, 1
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
-// ELF-NEXT: 0x00000010 72655f61 6e645f62 69747300 01000000 re_and_bits.....
-// ELF-NEXT: 0x00000020 01000201
-
-
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_Feature_BTI, 0
-.aeabi_attribute Tag_Feature_PAC, 0
-.aeabi_attribute Tag_Feature_GCS, 1
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-none.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-none.s
deleted file mode 100644
index a3cbbe270dffe..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-none.s
+++ /dev/null
@@ -1,25 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
-
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_attribute Tag_PAuth_Platform, 0
-// ASM: .aeabi_attribute Tag_PAuth_Schema, 0
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_BTI, 0
-// ASM: .aeabi_attribute Tag_Feature_PAC, 0
-// ASM: .aeabi_attribute Tag_Feature_GCS, 0
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41190000 00616561 62695f70 61757468 A....aeabi_pauth
-// ELF-NEXT: 0x00000010 61626900 00000100 02002300 00006165 abi.......#...ae
-// ELF-NEXT: 0x00000020 6162695f 66656174 7572655f 616e645f abi_feature_and_
-// ELF-NEXT: 0x00000030 62697473 00010000 00010002 00
-
-
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute Tag_PAuth_Platform, 0
-.aeabi_attribute Tag_PAuth_Schema, 0
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_Feature_BTI, 0
-.aeabi_attribute Tag_Feature_PAC, 0
-.aeabi_attribute Tag_Feature_GCS, 0
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-numerical-tags.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-numerical-tags.s
deleted file mode 100644
index 047939d2efd6c..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-numerical-tags.s
+++ /dev/null
@@ -1,39 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_attribute 0, 1
-// ASM: .aeabi_attribute Tag_PAuth_Platform, 1
-// ASM: .aeabi_attribute Tag_PAuth_Schema, 1
-// ASM: .aeabi_attribute 3, 1
-// ASM: .aeabi_attribute 4, 1
-// ASM: .aeabi_attribute 5, 1
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_BTI, 1
-// ASM: .aeabi_attribute Tag_Feature_PAC, 1
-// ASM: .aeabi_attribute Tag_Feature_GCS, 1
-// ASM: .aeabi_attribute 3, 1
-// ASM: .aeabi_attribute 4, 1
-// ASM: .aeabi_attribute 5, 1
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41210000 00616561 62695f70 61757468 A!...aeabi_pauth
-// ELF-NEXT: 0x00000010 61626900 00000001 01010201 03010401 abi.............
-// ELF-NEXT: 0x00000020 05012900 00006165 6162695f 66656174 ..)...aeabi_feat
-// ELF-NEXT: 0x00000030 7572655f 616e645f 62697473 00010000 ure_and_bits....
-// ELF-NEXT: 0x00000040 01010102 01030104 010501
-
-
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute 0, 1
-.aeabi_attribute 1, 1
-.aeabi_attribute 2, 1
-.aeabi_attribute 3, 1
-.aeabi_attribute 4, 1
-.aeabi_attribute 5, 1
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute 0, 1
-.aeabi_attribute 1, 1
-.aeabi_attribute 2, 1
-.aeabi_attribute 3, 1
-.aeabi_attribute 4, 1
-.aeabi_attribute 5, 1
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-out-of-order.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-out-of-order.s
deleted file mode 100644
index 2d5d42561aa6f..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-out-of-order.s
+++ /dev/null
@@ -1,48 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
-
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_BTI, 1
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_attribute Tag_PAuth_Schema, 1
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_attribute Tag_PAuth_Platform, 1
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_GCS, 1
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_PAC, 0
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute 7, 1
-// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_attribute 7, 0
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 411b0000 00616561 62695f70 61757468 A....aeabi_pauth
-// ELF-NEXT: 0x00000010 61626900 00000201 01010700 25000000 abi.........%...
-// ELF-NEXT: 0x00000020 61656162 695f6665 61747572 655f616e aeabi_feature_an
-// ELF-NEXT: 0x00000030 645f6269 74730001 00000102 01010007 d_bits..........
-// ELF-NEXT: 0x00000040 01
-
-
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_Feature_BTI, 1
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute Tag_PAuth_Schema, 1
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute Tag_PAuth_Platform, 1
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_Feature_GCS, 1
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_Feature_PAC, 0
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute 7, 1
-.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute 7, 0
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-pac.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-pac.s
deleted file mode 100644
index e3191acf31141..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-pac.s
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
-
-// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-// ASM: .aeabi_attribute Tag_Feature_BTI, 0
-// ASM: .aeabi_attribute Tag_Feature_PAC, 1
-// ASM: .aeabi_attribute Tag_Feature_GCS, 0
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
-// ELF-NEXT: 0x00000010 72655f61 6e645f62 69747300 01000000 re_and_bits.....
-// ELF-NEXT: 0x00000020 01010200
-
-
-.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-.aeabi_attribute Tag_Feature_BTI, 0
-.aeabi_attribute Tag_Feature_PAC, 1
-.aeabi_attribute Tag_Feature_GCS, 0
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections-err.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections-err.s
deleted file mode 100644
index 5884a74f989cc..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections-err.s
+++ /dev/null
@@ -1,28 +0,0 @@
-// RUN: not llvm-mc -triple=aarch64 %s 2>&1 | FileCheck --check-prefix=ERR %s
-
-.aeabi_subsection private_subsection, optional, uleb128
-
-.aeabi_subsection private_subsection, required, uleb128
-// ERR: error: optionality mismatch! subsection 'private_subsection' already exists with optionality defined as 'optional' and not 'required'
-// ERR-NEXT: .aeabi_subsection private_subsection, required, uleb128
-
-.aeabi_subsection private_subsection, optional, ntbs
-// ERR: error: type mismatch! subsection 'private_subsection' already exists with type defined as 'uleb128' and not 'ntbs'
-// ERR-NEXT: .aeabi_subsection private_subsection, optional, ntbs
-
-.aeabi_subsection private_subsection_1, optional, ntbs
-.aeabi_attribute 324, 1
-// ERR: error: active subsection type is NTBS (string), found ULEB128 (unsigned)
-// ERR-NEXT: .aeabi_attribute 324, 1
-
-.aeabi_subsection foo, optional, uleb128
-.aeabi_subsection bar, optional, uleb128
-.aeabi_subsection foo, required, uleb128
-// ERR: error: optionality mismatch! subsection 'foo' already exists with optionality defined as 'optional' and not 'required'
-// ERR-NEXT: .aeabi_subsection foo, required, uleb128
-
-.aeabi_subsection goo, optional, ntbs
-.aeabi_subsection zar, optional, ntbs
-.aeabi_subsection goo, optional, uleb128
-// ERR: error: type mismatch! subsection 'goo' already exists with type defined as 'ntbs' and not 'uleb128'
-// ERR-NEXT: .aeabi_subsection goo, optional, uleb128
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections.s
deleted file mode 100644
index 229033a9f6b70..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections.s
+++ /dev/null
@@ -1,51 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
-
-// ASM: .aeabi_subsection private_subsection_1, optional, uleb128
-// ASM: .aeabi_attribute 12, 257
-// ASM: .aeabi_subsection private_subsection_2, required, uleb128
-// ASM: .aeabi_attribute 76, 257
-// ASM: .aeabi_subsection private_subsection_3, optional, ntbs
-// ASM: .aeabi_attribute 34, hello_llvm
-// ASM: .aeabi_subsection private_subsection_4, required, ntbs
-// ASM: .aeabi_attribute 777, "hello_llvm"
-// ASM: .aeabi_subsection private_subsection_1, optional, uleb128
-// ASM: .aeabi_attribute 876, 257
-// ASM: .aeabi_subsection private_subsection_2, required, uleb128
-// ASM: .aeabi_attribute 876, 257
-// ASM: .aeabi_subsection private_subsection_3, optional, ntbs
-// ASM: .aeabi_attribute 876, "hello_llvm"
-// ASM: .aeabi_subsection private_subsection_4, required, ntbs
-// ASM: .aeabi_attribute 876, hello_llvm
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41220000 00707269 76617465 5f737562 A"...private_sub
-// ELF-NEXT: 0x00000010 73656374 696f6e5f 31000100 0c8102ec section_1.......
-// ELF-NEXT: 0x00000020 06810222 00000070 72697661 74655f73 ..."...private_s
-// ELF-NEXT: 0x00000030 75627365 6374696f 6e5f3200 00004c81 ubsection_2...L.
-// ELF-NEXT: 0x00000040 02ec0681 02360000 00707269 76617465 .....6...private
-// ELF-NEXT: 0x00000050 5f737562 73656374 696f6e5f 33000101 _subsection_3...
-// ELF-NEXT: 0x00000060 2268656c 6c6f5f6c 6c766d00 ec062268 "hello_llvm..."h
-// ELF-NEXT: 0x00000070 656c6c6f 5f6c6c76 6d220037 00000070 ello_llvm".7...p
-// ELF-NEXT: 0x00000080 72697661 74655f73 75627365 6374696f rivate_subsectio
-// ELF-NEXT: 0x00000090 6e5f3400 00018906 2268656c 6c6f5f6c n_4....."hello_l
-// ELF-NEXT: 0x000000a0 6c766d22 00ec0668 656c6c6f 5f6c6c76 lvm"...hello_llv
-// ELF-NEXT: 0x000000b0 6d00 m.
-
-
-.aeabi_subsection private_subsection_1, optional, uleb128
-.aeabi_attribute 12, 257
-.aeabi_subsection private_subsection_2, required, uleb128
-.aeabi_attribute 76, 257
-.aeabi_subsection private_subsection_3, optional, ntbs
-.aeabi_attribute 34, hello_llvm
-.aeabi_subsection private_subsection_4, required, ntbs
-.aeabi_attribute 777, "hello_llvm"
-.aeabi_subsection private_subsection_1, optional, uleb128
-.aeabi_attribute 876, 257
-.aeabi_subsection private_subsection_2, required, uleb128
-.aeabi_attribute 876, 257
-.aeabi_subsection private_subsection_3, optional, ntbs
-.aeabi_attribute 876, "hello_llvm"
-.aeabi_subsection private_subsection_4, required, ntbs
-.aeabi_attribute 876, hello_llvm
>From 506aad316c39dc5e196b66c4df892f084a91155c Mon Sep 17 00:00:00 2001
From: Sivan Shani <sivan.shani at arm.com>
Date: Mon, 17 Feb 2025 11:00:57 +0000
Subject: [PATCH 2/7] [AArch64][Build Attributes] Standardize parsing error
messages
Parsing error message should not print the symbol triggering error.
(Only point to it with the symbol '^')
---
llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 335b46b76688f..283c090ac4c1c 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -7870,8 +7870,7 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
IsOptional = AArch64BuildAttrs::getOptionalID(Optionality);
if (AArch64BuildAttrs::OPTIONAL_NOT_FOUND == IsOptional) {
Error(Parser.getTok().getLoc(),
- AArch64BuildAttrs::getSubsectionOptionalUnknownError() + ": " +
- Optionality);
+ AArch64BuildAttrs::getSubsectionOptionalUnknownError());
return true;
}
if (SubsectionExists) {
@@ -7919,7 +7918,7 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
Type = AArch64BuildAttrs::getTypeID(Name);
if (AArch64BuildAttrs::TYPE_NOT_FOUND == Type) {
Error(Parser.getTok().getLoc(),
- AArch64BuildAttrs::getSubsectionTypeUnknownError() + ": " + Name);
+ AArch64BuildAttrs::getSubsectionTypeUnknownError());
return true;
}
if (SubsectionExists) {
>From 1fb501d18ce1ed4e9fa6206696ab6b8dcad9a50a Mon Sep 17 00:00:00 2001
From: Sivan Shani <sivan.shani at arm.com>
Date: Mon, 17 Feb 2025 11:09:12 +0000
Subject: [PATCH 3/7] [AArch64][Build Attributes] Print Tags as Numbers with
Comments
Print Tags as numbers followed by comments instead of using string representations.
For example:
.aeabi_attribute 0, 1 @ Tag_Feature_BTI
instead of:
.aeabi_attribute Tag_Feature_BTI, 1
This reduces dependencies between compiler and assembler versions.
---
.../Target/AArch64/AsmParser/AArch64AsmParser.cpp | 15 ++++++++++++---
.../AArch64/MCTargetDesc/AArch64ELFStreamer.cpp | 8 ++++----
.../AArch64/aarch64-build-attributes-all.ll | 6 +++---
.../AArch64/aarch64-build-attributes-bti.ll | 6 +++---
.../AArch64/aarch64-build-attributes-gcs.ll | 6 +++---
.../AArch64/aarch64-build-attributes-pac.ll | 6 +++---
.../AArch64/aarch64-build-attributes-pauthabi.ll | 4 ++--
7 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 283c090ac4c1c..58bebdf1f75ce 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -7947,7 +7947,12 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
}
}
Parser.Lex();
- // Parsing finished, check for trailing tokens.
+
+ // Parsing finished, hereafter only accept comments; otherwise no trailing
+ // tokens.
+ if (Parser.getTok().is(llvm::AsmToken::At)) {
+ Parser.parseStringToEndOfStatement();
+ }
if (Parser.getTok().isNot(llvm::AsmToken::EndOfStatement)) {
Error(Parser.getTok().getLoc(), "unexpected token for AArch64 build "
"attributes subsection header directive");
@@ -8070,7 +8075,12 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
}
}
Parser.Lex();
- // Parsing finished, check for trailing tokens.
+
+ // Parsing finished, hereafter only accept comments; otherwise no trailing
+ // tokens.
+ if (Parser.getTok().is(llvm::AsmToken::At)) {
+ Parser.parseStringToEndOfStatement();
+ }
if (Parser.getTok().isNot(llvm::AsmToken::EndOfStatement)) {
Error(Parser.getTok().getLoc(),
"unexpected token for AArch64 build attributes tag and value "
@@ -8082,7 +8092,6 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, ValueInt, "",
false);
}
-
if ("" != ValueStr) {
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, unsigned(-1),
ValueStr, false);
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
index 6b5c5f36cbd4b..2f6a5144a82b4 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
@@ -191,8 +191,8 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
case AArch64BuildAttrs::TAG_FEATURE_BTI:
case AArch64BuildAttrs::TAG_FEATURE_GCS:
case AArch64BuildAttrs::TAG_FEATURE_PAC:
- OS << "\t.aeabi_attribute" << "\t"
- << AArch64BuildAttrs::getFeatureAndBitsTagsStr(Tag) << ", " << Value;
+ OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value << "\t@ "
+ << AArch64BuildAttrs::getFeatureAndBitsTagsStr(Tag);
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
Override);
break;
@@ -210,8 +210,8 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
break;
case AArch64BuildAttrs::TAG_PAUTH_PLATFORM:
case AArch64BuildAttrs::TAG_PAUTH_SCHEMA:
- OS << "\t.aeabi_attribute" << "\t"
- << AArch64BuildAttrs::getPauthABITagsStr(Tag) << ", " << Value;
+ OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value << "\t@ "
+ << AArch64BuildAttrs::getPauthABITagsStr(Tag);
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
Override);
break;
diff --git a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-all.ll b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-all.ll
index aecc74b2ce46d..9eaed09130f15 100644
--- a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-all.ll
+++ b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-all.ll
@@ -2,9 +2,9 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
; ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-; ASM-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
-; ASM-NEXT: .aeabi_attribute Tag_Feature_PAC, 1
-; ASM-NEXT: .aeabi_attribute Tag_Feature_GCS, 1
+; ASM-NEXT: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
+; ASM-NEXT: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
+; ASM-NEXT: .aeabi_attribute 2, 1 @ Tag_Feature_GCS
; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
diff --git a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-bti.ll b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-bti.ll
index 8ec78df13be28..cffb1fb265379 100644
--- a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-bti.ll
+++ b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-bti.ll
@@ -2,9 +2,9 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
; ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-; ASM-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
-; ASM-NEXT: .aeabi_attribute Tag_Feature_PAC, 0
-; ASM-NEXT: .aeabi_attribute Tag_Feature_GCS, 0
+; ASM-NEXT: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
+; ASM-NEXT: .aeabi_attribute 1, 0 @ Tag_Feature_PAC
+; ASM-NEXT: .aeabi_attribute 2, 0 @ Tag_Feature_GCS
; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
diff --git a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-gcs.ll b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-gcs.ll
index be528779e8228..3dbba6a7eeace 100644
--- a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-gcs.ll
+++ b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-gcs.ll
@@ -2,9 +2,9 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
; ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-; ASM-NEXT: .aeabi_attribute Tag_Feature_BTI, 0
-; ASM-NEXT: .aeabi_attribute Tag_Feature_PAC, 0
-; ASM-NEXT: .aeabi_attribute Tag_Feature_GCS, 1
+; ASM-NEXT: .aeabi_attribute 0, 0 @ Tag_Feature_BTI
+; ASM-NEXT: .aeabi_attribute 1, 0 @ Tag_Feature_PAC
+; ASM-NEXT: .aeabi_attribute 2, 1 @ Tag_Feature_GCS
; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
diff --git a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-pac.ll b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-pac.ll
index e3e5933105426..506a821ad9d90 100644
--- a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-pac.ll
+++ b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-pac.ll
@@ -2,9 +2,9 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
; ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
-; ASM-NEXT: .aeabi_attribute Tag_Feature_BTI, 0
-; ASM-NEXT: .aeabi_attribute Tag_Feature_PAC, 1
-; ASM-NEXT: .aeabi_attribute Tag_Feature_GCS, 0
+; ASM-NEXT: .aeabi_attribute 0, 0 @ Tag_Feature_BTI
+; ASM-NEXT: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
+; ASM-NEXT: .aeabi_attribute 2, 0 @ Tag_Feature_GCS
; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
diff --git a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-pauthabi.ll b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-pauthabi.ll
index 35ad514c943a5..a7d9585af4379 100644
--- a/llvm/test/CodeGen/AArch64/aarch64-build-attributes-pauthabi.ll
+++ b/llvm/test/CodeGen/AArch64/aarch64-build-attributes-pauthabi.ll
@@ -2,8 +2,8 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
; ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-; ASM-NEXT: .aeabi_attribute Tag_PAuth_Platform, 2
-; ASM-NEXT: .aeabi_attribute Tag_PAuth_Schema, 31
+; ASM-NEXT: .aeabi_attribute 1, 2 @ Tag_PAuth_Platform
+; ASM-NEXT: .aeabi_attribute 2, 31 @ Tag_PAuth_Schema
; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41190000 00616561 62695f70 61757468 A....aeabi_pauth
>From 083bd48981bb025cdc4afff7b2adacc2b66ca284 Mon Sep 17 00:00:00 2001
From: Sivan Shani <sivan.shani at arm.com>
Date: Mon, 17 Feb 2025 11:16:51 +0000
Subject: [PATCH 4/7] [AArch64][Build Attributes] Fix Parsing of Some Tags and
Values
- Reject strings for unknown tags.
- Allow any value for Tag_PAuth_Platform and Tag_PAuth_Schema.
---
.../AArch64/AsmParser/AArch64AsmParser.cpp | 21 +++++---
...4-build-attributes-asm-aeabi-aeabi-known.s | 43 ++++++++++++++++
...aarch64-build-attributes-asm-aeabi-mixed.s | 48 ++++++++++++++++++
.../aarch64-build-attributes-asm-non_aeabi.s | 49 +++++++++++++++++++
4 files changed, 153 insertions(+), 8 deletions(-)
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-aeabi-known.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-mixed.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi.s
diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 58bebdf1f75ce..16e0883fe0584 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -7990,14 +7990,22 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
StringRef TagStr = "";
unsigned Tag;
- if (Parser.getTok().is(AsmToken::Identifier)) {
+ if (Parser.getTok().is(AsmToken::Integer)) {
+ Tag = getTok().getIntVal();
+ } else if (Parser.getTok().is(AsmToken::Identifier)) {
TagStr = Parser.getTok().getIdentifier();
switch (ActiveSubsectionID) {
default:
+ // Should not happen
assert(0 && "Subsection name error");
break;
case AArch64BuildAttrs::VENDOR_UNKNOWN:
- // Private subsection, accept any tag.
+ // Tag was provided as an unrecognized string instead of an unsigned
+ // integer
+ Error(Parser.getTok().getLoc(), "unrecognized Tag: '" + TagStr +
+ "' \nExcept for public subsections, "
+ "tags have to be an unsigned int.");
+ return true;
break;
case AArch64BuildAttrs::AEABI_PAUTHABI:
Tag = AArch64BuildAttrs::getPauthABITagsID(TagStr);
@@ -8018,8 +8026,6 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
}
break;
}
- } else if (Parser.getTok().is(AsmToken::Integer)) {
- Tag = getTok().getIntVal();
} else {
Error(Parser.getTok().getLoc(), "AArch64 build attributes tag not found");
return true;
@@ -8063,10 +8069,9 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
Error(Parser.getTok().getLoc(), "AArch64 build attributes value not found");
return true;
}
- // Check for possible unaccepted values for known tags (AEABI_PAUTHABI,
- // AEABI_FEATURE_AND_BITS)
- if (!(ActiveSubsectionID == AArch64BuildAttrs::VENDOR_UNKNOWN) &&
- TagStr != "") { // TagStr was a recognized string
+ // Check for possible unaccepted values for known tags
+ // (AEABI_FEATURE_AND_BITS)
+ if (ActiveSubsectionID == AArch64BuildAttrs::AEABI_FEATURE_AND_BITS) {
if (0 != ValueInt && 1 != ValueInt) {
Error(Parser.getTok().getLoc(),
"unknown AArch64 build attributes Value for Tag '" + TagStr +
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-aeabi-known.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-aeabi-known.s
new file mode 100644
index 0000000000000..d81ab72678013
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-aeabi-known.s
@@ -0,0 +1,43 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute 1, 7 @ Tag_PAuth_Platform
+// ASM: .aeabi_attribute 2, 777 @ Tag_PAuth_Schema
+// ASM: .aeabi_attribute 2, 777 @ Tag_PAuth_Schema
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
+// ASM: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
+// ASM: .aeabi_attribute 2, 1 @ Tag_Feature_GCS
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute 1, 7 @ Tag_PAuth_Platform
+// ASM: .aeabi_attribute 2, 777 @ Tag_PAuth_Schema
+// ASM: .aeabi_attribute 2, 777 @ Tag_PAuth_Schema
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
+// ASM: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
+// ASM: .aeabi_attribute 2, 1 @ Tag_Feature_GCS
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF: 0x00000000 411a0000 00616561 62695f70 61757468 A....aeabi_pauth
+// ELF: 0x00000010 61626900 00000107 02890623 00000061 abi........#...a
+// ELF: 0x00000020 65616269 5f666561 74757265 5f616e64 eabi_feature_and
+// ELF: 0x00000030 5f626974 73000100 00010101 0201 _bits.........
+
+
+.aeabi_subsection aeabi_pauthabi, required, uleb128 @ test header comment
+.aeabi_attribute Tag_PAuth_Platform, 7
+.aeabi_attribute Tag_PAuth_Schema, 777
+.aeabi_attribute Tag_PAuth_Schema, 777
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_BTI, 1
+.aeabi_attribute Tag_Feature_PAC, 1
+.aeabi_attribute Tag_Feature_GCS, 1
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute 1, 7 @ Tag_PAuth_Platform
+.aeabi_attribute 2, 777 @ Tag_PAuth_Schema
+.aeabi_attribute 2, 777 @ Tag_PAuth_Schema
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute 0, 1 @ Tag_Feature_BTI
+.aeabi_attribute 1, 1 @ Tag_Feature_PAC
+.aeabi_attribute 2, 1 @ Tag_Feature_GCS
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-mixed.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-mixed.s
new file mode 100644
index 0000000000000..0607861795791
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-mixed.s
@@ -0,0 +1,48 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection subsection_a, optional, uleb128
+// ASM: .aeabi_subsection aeabi_subsection, optional, ntbs
+// ASM: .aeabi_subsection subsection_b, required, uleb128
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute 1, 7 @ Tag_PAuth_Platform
+// ASM: .aeabi_attribute 2, 777 @ Tag_PAuth_Schema
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
+// ASM: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
+// ASM: .aeabi_attribute 2, 1 @ Tag_Feature_GCS
+// ASM: .aeabi_subsection aeabi_subsection, optional, ntbs
+// ASM: .aeabi_attribute 5, "Value"
+// ASM: .aeabi_subsection subsection_b, required, uleb128
+// ASM: .aeabi_attribute 6, 536
+// ASM: .aeabi_subsection subsection_a, optional, uleb128
+// ASM: .aeabi_attribute 7, 11
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF: 0x00000000 41150000 00737562 73656374 696f6e5f A....subsection_
+// ELF: 0x00000010 61000100 070b2000 00006165 6162695f a..... ...aeabi_
+// ELF: 0x00000020 73756273 65637469 6f6e0001 01052256 subsection...."V
+// ELF: 0x00000030 616c7565 22001600 00007375 62736563 alue".....subsec
+// ELF: 0x00000040 74696f6e 5f620000 00069804 1a000000 tion_b..........
+// ELF: 0x00000050 61656162 695f7061 75746861 62690000 aeabi_pauthabi..
+// ELF: 0x00000060 00010702 89062300 00006165 6162695f ......#...aeabi_
+// ELF: 0x00000070 66656174 7572655f 616e645f 62697473 feature_and_bits
+// ELF: 0x00000080 00010000 01010102 01 .........
+
+
+.aeabi_subsection subsection_a, optional, uleb128
+.aeabi_subsection aeabi_subsection, optional, ntbs
+.aeabi_subsection subsection_b, required, uleb128
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute Tag_PAuth_Platform, 7
+.aeabi_attribute Tag_PAuth_Schema, 777
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_BTI, 1
+.aeabi_attribute Tag_Feature_PAC, 1
+.aeabi_attribute Tag_Feature_GCS, 1
+.aeabi_subsection aeabi_subsection, optional, ntbs
+.aeabi_attribute 5, "Value"
+.aeabi_subsection subsection_b, required, uleb128
+.aeabi_attribute 6, 536
+.aeabi_subsection subsection_a, optional, uleb128
+.aeabi_attribute 7, 11
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi.s
new file mode 100644
index 0000000000000..ef55a3cfc89de
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi.s
@@ -0,0 +1,49 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection private_subsection_1, optional, uleb128
+// ASM: .aeabi_attribute 12, 257
+// ASM: .aeabi_subsection aeabi_2, required, uleb128
+// ASM: .aeabi_attribute 76, 257
+// ASM: .aeabi_subsection aeabi_3, optional, ntbs
+// ASM: .aeabi_attribute 34, hello_llvm
+// ASM: .aeabi_subsection private_subsection_4, required, ntbs
+// ASM: .aeabi_attribute 777, "hello_llvm"
+// ASM: .aeabi_subsection private_subsection_1, optional, uleb128
+// ASM: .aeabi_attribute 876, 257
+// ASM: .aeabi_subsection aeabi_2, required, uleb128
+// ASM: .aeabi_attribute 876, 257
+// ASM: .aeabi_subsection aeabi_3, optional, ntbs
+// ASM: .aeabi_attribute 876, "hello_llvm"
+// ASM: .aeabi_subsection private_subsection_4, required, ntbs
+// ASM: .aeabi_attribute 876, hello_llvm
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF: 0x00000000 41220000 00707269 76617465 5f737562 A"...private_sub
+// ELF: 0x00000010 73656374 696f6e5f 31000100 0c8102ec section_1.......
+// ELF: 0x00000020 06810215 00000061 65616269 5f320000 .......aeabi_2..
+// ELF: 0x00000030 004c8102 ec068102 29000000 61656162 .L......)...aeab
+// ELF: 0x00000040 695f3300 01012268 656c6c6f 5f6c6c76 i_3..."hello_llv
+// ELF: 0x00000050 6d00ec06 2268656c 6c6f5f6c 6c766d22 m..."hello_llvm"
+// ELF: 0x00000060 00370000 00707269 76617465 5f737562 .7...private_sub
+// ELF: 0x00000070 73656374 696f6e5f 34000001 89062268 section_4....."h
+// ELF: 0x00000080 656c6c6f 5f6c6c76 6d2200ec 0668656c ello_llvm"...hel
+// ELF: 0x00000090 6c6f5f6c 6c766d00 lo_llvm.
+
+
+.aeabi_subsection private_subsection_1, optional, uleb128
+.aeabi_attribute 12, 257
+.aeabi_subsection aeabi_2, required, uleb128
+.aeabi_attribute 76, 257
+.aeabi_subsection aeabi_3, optional, ntbs
+.aeabi_attribute 34, hello_llvm
+.aeabi_subsection private_subsection_4, required, ntbs
+.aeabi_attribute 777, "hello_llvm"
+.aeabi_subsection private_subsection_1, optional, uleb128
+.aeabi_attribute 876, 257
+.aeabi_subsection aeabi_2, required, uleb128
+.aeabi_attribute 876, 257
+.aeabi_subsection aeabi_3, optional, ntbs
+.aeabi_attribute 876, "hello_llvm"
+.aeabi_subsection private_subsection_4, required, ntbs
+.aeabi_attribute 876, hello_llvm
>From a126df16932f76a8914e153c1977c5d01a210c9c Mon Sep 17 00:00:00 2001
From: Sivan Shani <sivan.shani at arm.com>
Date: Mon, 17 Feb 2025 11:24:29 +0000
Subject: [PATCH 5/7] [AArch64][Build Attributes] Remove Assertion for
Duplicate Values
Adding the same value twice is valid, so the assertion has been removed.
---
.../Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
index 1ed4a81a97673..01b74e55116f9 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
@@ -222,13 +222,9 @@ void AArch64TargetStreamer::emitAttribute(StringRef VendorName, unsigned Tag,
"Can not add AArch64 build attribute: An attribute with "
"the same tag and a different value already exists");
return;
- } else {
- // Case Item.IntValue == Value, no need to emit twice
- assert(0 &&
- "AArch64 build attribute: An attribute with the same tag "
- "and a same value already exists");
- return;
}
+ // Case Item.IntValue == Value is permited.
+ return;
}
}
}
>From e453ae00d311961ac2469054892838fc2a4bd087 Mon Sep 17 00:00:00 2001
From: Sivan Shani <sivan.shani at arm.com>
Date: Mon, 17 Feb 2025 11:26:41 +0000
Subject: [PATCH 6/7] [AArch64][Build Attributes] Add test files
Add test files
---
.../aarch64-build-attributes-asm-aeabi-bti.s | 18 +++++
...h64-build-attributes-asm-aeabi-err-attrs.s | 69 +++++++++++++++++++
...4-build-attributes-asm-aeabi-err-headers.s | 64 +++++++++++++++++
.../aarch64-build-attributes-asm-aeabi-gcs.s | 18 +++++
.../aarch64-build-attributes-asm-aeabi-none.s | 25 +++++++
...uild-attributes-asm-aeabi-numerical-tags.s | 39 +++++++++++
...-build-attributes-asm-aeabi-out-of-order.s | 48 +++++++++++++
.../aarch64-build-attributes-asm-aeabi-pac.s | 18 +++++
...rch64-build-attributes-asm-non_aeabi-err.s | 33 +++++++++
9 files changed, 332 insertions(+)
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-bti.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-attrs.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-headers.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-gcs.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-none.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-numerical-tags.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-out-of-order.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-pac.s
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi-err.s
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-bti.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-bti.s
new file mode 100644
index 0000000000000..c760cf1558578
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-bti.s
@@ -0,0 +1,18 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
+// ASM: .aeabi_attribute 1, 0 @ Tag_Feature_PAC
+// ASM: .aeabi_attribute 2, 0 @ Tag_Feature_GCS
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
+// ELF-NEXT: 0x00000010 72655f61 6e645f62 69747300 01000001 re_and_bits.....
+// ELF-NEXT: 0x00000020 01000200
+
+
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_BTI, 1
+.aeabi_attribute Tag_Feature_PAC, 0
+.aeabi_attribute Tag_Feature_GCS, 0
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-attrs.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-attrs.s
new file mode 100644
index 0000000000000..d509974f508d0
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-attrs.s
@@ -0,0 +1,69 @@
+// RUN: not llvm-mc -triple=aarch64 %s 2>&1 | FileCheck --check-prefix=ERR %s
+
+// Test logic and type mismatch
+.aeabi_attribute Tag_Feature_BTI, 1
+// ERR: error: no active subsection, build attribute can not be added
+// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
+
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute Tag_Feature_BTI, 1
+// ERR: error: unknown AArch64 build attribute 'Tag_Feature_BTI' for subsection 'aeabi_pauthabi'
+// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
+
+.aeabi_attribute a, 1
+// ERR: error: unknown AArch64 build attribute 'a' for subsection 'aeabi_pauthabi'
+// ERR-NEXT: .aeabi_attribute a, 1
+
+.aeabi_attribute Tag_PAuth_Platform, Tag_PAuth_Platform
+// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
+// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, Tag_PAuth_Platform
+
+.aeabi_attribute Tag_PAuth_Platform, a
+// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
+// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, a
+
+
+// Test syntax errors
+.aeabi_attribute Tag_PAuth_Platform,
+// ERR: error: AArch64 build attributes value not found
+// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform,
+
+.aeabi_attribute Tag_PAuth_Platform
+// ERR: error: expected comma
+// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform
+
+.aeabi_attribute
+// ERR: error: AArch64 build attributes tag not found
+// ERR-NEXT: .aeabi_attribute
+
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_PAuth_Platform, 1
+// ERR: unknown AArch64 build attribute 'Tag_PAuth_Platform' for subsection 'aeabi_feature_and_bits'
+
+.aeabi_attribute a, 1
+// ERR: error: unknown AArch64 build attribute 'a' for subsection 'aeabi_feature_and_bits'
+
+.aeabi_attribute Tag_Feature_BTI, Tag_Feature_BTI
+// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
+// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, Tag_Feature_BTI
+
+.aeabi_attribute Tag_Feature_BTI, a
+// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
+// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, a
+
+.aeabi_attribute Tag_Feature_BTI,
+// ERR: error: AArch64 build attributes value not found
+// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI,
+
+.aeabi_attribute Tag_Feature_BTI
+// ERR: error: expected comma
+// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI
+
+.aeabi_attribute
+// ERR: error: AArch64 build attributes tag not found
+// ERR-NEXT: .aeabi_attribute
+
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute Tag_PAuth_Platform, 1 some_text
+// ERR: error: unexpected token for AArch64 build attributes tag and value attribute directive
+// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, 1 some_text
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-headers.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-headers.s
new file mode 100644
index 0000000000000..501958a17bed3
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-headers.s
@@ -0,0 +1,64 @@
+// RUN: not llvm-mc -triple=aarch64 %s 2>&1 | FileCheck --check-prefix=ERR %s
+
+// Test syntax errors
+.aeabi_subsection 1, required, uleb128
+// ERR: error: subsection name not found
+// ERR-NEXT: .aeabi_subsection 1, required, uleb128
+
+.aeabi_subsection , required, uleb128
+// ERR: error: subsection name not found
+// ERR-NEXT: .aeabi_subsection , required, uleb128
+
+.aeabi_subsection aeabi_pauthabi, a, uleb128
+// ERR: error: unknown AArch64 build attributes optionality, expected required|optional
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, a, uleb128
+
+.aeabi_subsection aeabi_pauthabi, 1, uleb128
+// ERR: error: optionality parameter not found, expected required|optional
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, 1, uleb128
+
+.aeabi_subsection aeabi_pauthabi, ,uleb128
+// ERR: error: optionality parameter not found, expected required|optional
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, ,uleb128
+
+.aeabi_subsection aeabi_pauthabi,uleb128
+// ERR: error: unknown AArch64 build attributes optionality, expected required|optional
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi,uleb128
+
+.aeabi_subsection aeabi_pauthabi uleb128
+// ERR: expected comma
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi uleb128
+
+.aeabi_subsection aeabi_pauthabi, required
+// ERR: error: expected comma
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required
+
+.aeabi_subsection aeabi_pauthabi, required,
+// ERR: error: type parameter not found, expected uleb128|ntbs
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required,
+
+.aeabi_subsection aeabi_pauthabi, required, a
+// ERR: error: unknown AArch64 build attributes type, expected uleb128|ntbs
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required, a
+
+.aeabi_subsection aeabi_pauthabi, optional, uleb128
+// ERR: error: aeabi_pauthabi must be marked as required
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, optional, uleb128
+
+
+// Test types mismatch
+.aeabi_subsection aeabi_pauthabi, optional, uleb128
+// ERR: error: aeabi_pauthabi must be marked as required
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, optional, uleb128
+
+.aeabi_subsection aeabi_pauthabi, required, ntbs
+// ERR: error: aeabi_pauthabi must be marked as ULEB128
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required, ntbs
+
+.aeabi_subsection aeabi_feature_and_bits, required, uleb128
+// ERR: error: aeabi_feature_and_bits must be marked as optional
+// ERR-NEXT: .aeabi_subsection aeabi_feature_and_bits, required, uleb128
+
+.aeabi_subsection aeabi_feature_and_bits, optional, ntbs
+// ERR: error: aeabi_feature_and_bits must be marked as ULEB128
+// ERR-NEXT: .aeabi_subsection aeabi_feature_and_bits, optional, ntbs
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-gcs.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-gcs.s
new file mode 100644
index 0000000000000..5c5551a2133cd
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-gcs.s
@@ -0,0 +1,18 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 0 @ Tag_Feature_BTI
+// ASM: .aeabi_attribute 1, 0 @ Tag_Feature_PAC
+// ASM: .aeabi_attribute 2, 1 @ Tag_Feature_GCS
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
+// ELF-NEXT: 0x00000010 72655f61 6e645f62 69747300 01000000 re_and_bits.....
+// ELF-NEXT: 0x00000020 01000201
+
+
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_BTI, 0
+.aeabi_attribute Tag_Feature_PAC, 0
+.aeabi_attribute Tag_Feature_GCS, 1
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-none.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-none.s
new file mode 100644
index 0000000000000..e029e43c0934a
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-none.s
@@ -0,0 +1,25 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute 1, 0 @ Tag_PAuth_Platform
+// ASM: .aeabi_attribute 2, 0 @ Tag_PAuth_Schema
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 0 @ Tag_Feature_BTI
+// ASM: .aeabi_attribute 1, 0 @ Tag_Feature_PAC
+// ASM: .aeabi_attribute 2, 0 @ Tag_Feature_GCS
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF-NEXT: 0x00000000 41190000 00616561 62695f70 61757468 A....aeabi_pauth
+// ELF-NEXT: 0x00000010 61626900 00000100 02002300 00006165 abi.......#...ae
+// ELF-NEXT: 0x00000020 6162695f 66656174 7572655f 616e645f abi_feature_and_
+// ELF-NEXT: 0x00000030 62697473 00010000 00010002 00
+
+
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute Tag_PAuth_Platform, 0
+.aeabi_attribute Tag_PAuth_Schema, 0
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_BTI, 0
+.aeabi_attribute Tag_Feature_PAC, 0
+.aeabi_attribute Tag_Feature_GCS, 0
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-numerical-tags.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-numerical-tags.s
new file mode 100644
index 0000000000000..71e28baa7fc73
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-numerical-tags.s
@@ -0,0 +1,39 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute 0, 1
+// ASM: .aeabi_attribute 1, 1 @ Tag_PAuth_Platform
+// ASM: .aeabi_attribute 2, 1 @ Tag_PAuth_Schema
+// ASM: .aeabi_attribute 3, 1
+// ASM: .aeabi_attribute 4, 1
+// ASM: .aeabi_attribute 5, 1
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
+// ASM: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
+// ASM: .aeabi_attribute 2, 1 @ Tag_Feature_GCS
+// ASM: .aeabi_attribute 3, 1
+// ASM: .aeabi_attribute 4, 1
+// ASM: .aeabi_attribute 5, 1
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF-NEXT: 0x00000000 41210000 00616561 62695f70 61757468 A!...aeabi_pauth
+// ELF-NEXT: 0x00000010 61626900 00000001 01010201 03010401 abi.............
+// ELF-NEXT: 0x00000020 05012900 00006165 6162695f 66656174 ..)...aeabi_feat
+// ELF-NEXT: 0x00000030 7572655f 616e645f 62697473 00010000 ure_and_bits....
+// ELF-NEXT: 0x00000040 01010102 01030104 010501
+
+
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute 0, 1
+.aeabi_attribute 1, 1
+.aeabi_attribute 2, 1
+.aeabi_attribute 3, 1
+.aeabi_attribute 4, 1
+.aeabi_attribute 5, 1
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute 0, 1
+.aeabi_attribute 1, 1
+.aeabi_attribute 2, 1
+.aeabi_attribute 3, 1
+.aeabi_attribute 4, 1
+.aeabi_attribute 5, 1
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-out-of-order.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-out-of-order.s
new file mode 100644
index 0000000000000..197b7cfd52038
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-out-of-order.s
@@ -0,0 +1,48 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute 2, 1 @ Tag_PAuth_Schema
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute 1, 1 @ Tag_PAuth_Platform
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 2, 1 @ Tag_Feature_GCS
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 1, 0 @ Tag_Feature_PAC
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 7, 1
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute 7, 0
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF-NEXT: 0x00000000 411b0000 00616561 62695f70 61757468 A....aeabi_pauth
+// ELF-NEXT: 0x00000010 61626900 00000201 01010700 25000000 abi.........%...
+// ELF-NEXT: 0x00000020 61656162 695f6665 61747572 655f616e aeabi_feature_an
+// ELF-NEXT: 0x00000030 645f6269 74730001 00000102 01010007 d_bits..........
+// ELF-NEXT: 0x00000040 01
+
+
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_BTI, 1
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute Tag_PAuth_Schema, 1
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute Tag_PAuth_Platform, 1
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_GCS, 1
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_PAC, 0
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute 7, 1
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute 7, 0
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-pac.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-pac.s
new file mode 100644
index 0000000000000..1b86081355ab9
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-pac.s
@@ -0,0 +1,18 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute 0, 0 @ Tag_Feature_BTI
+// ASM: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
+// ASM: .aeabi_attribute 2, 0 @ Tag_Feature_GCS
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
+// ELF-NEXT: 0x00000010 72655f61 6e645f62 69747300 01000000 re_and_bits.....
+// ELF-NEXT: 0x00000020 01010200
+
+
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute 0, 0 @ Tag_Feature_BTI
+.aeabi_attribute 1, 1 @ Tag_Feature_PAC
+.aeabi_attribute 2, 0 @ Tag_Feature_GCS
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi-err.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi-err.s
new file mode 100644
index 0000000000000..6e28481aeb97b
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi-err.s
@@ -0,0 +1,33 @@
+// RUN: not llvm-mc -triple=aarch64 %s 2>&1 | FileCheck --check-prefix=ERR %s
+
+.aeabi_subsection private_subsection, optional, uleb128
+
+.aeabi_subsection private_subsection, required, uleb128
+// ERR: error: optionality mismatch! subsection 'private_subsection' already exists with optionality defined as 'optional' and not 'required'
+// ERR-NEXT: .aeabi_subsection private_subsection, required, uleb128
+
+.aeabi_subsection private_subsection, optional, ntbs
+// ERR: error: type mismatch! subsection 'private_subsection' already exists with type defined as 'uleb128' and not 'ntbs'
+// ERR-NEXT: .aeabi_subsection private_subsection, optional, ntbs
+
+.aeabi_subsection private_subsection_1, optional, ntbs
+.aeabi_attribute 324, 1
+// ERR: error: active subsection type is NTBS (string), found ULEB128 (unsigned)
+// ERR-NEXT: .aeabi_attribute 324, 1
+
+.aeabi_attribute str_not_int, "1"
+// ERR: error: unrecognized Tag: 'str_not_int'
+// ERR-NEXT: Except for public subsections, tags have to be an unsigned int.
+// ERR-NEXT: .aeabi_attribute str_not_int, "1"
+
+.aeabi_subsection foo, optional, uleb128
+.aeabi_subsection bar, optional, uleb128
+.aeabi_subsection foo, required, uleb128
+// ERR: error: optionality mismatch! subsection 'foo' already exists with optionality defined as 'optional' and not 'required'
+// ERR-NEXT: .aeabi_subsection foo, required, uleb128
+
+.aeabi_subsection goo, optional, ntbs
+.aeabi_subsection zar, optional, ntbs
+.aeabi_subsection goo, optional, uleb128
+// ERR: error: type mismatch! subsection 'goo' already exists with type defined as 'ntbs' and not 'uleb128'
+// ERR-NEXT: .aeabi_subsection goo, optional, uleb128
>From b57cce1fd76475876e079243509b43504ed52679 Mon Sep 17 00:00:00 2001
From: Sivan Shani <sivan.shani at arm.com>
Date: Thu, 23 Jan 2025 18:00:32 +0000
Subject: [PATCH 7/7] [readobj][AArch64] Support Parsing AArch64 Build
Attributes
Added support for parsing AArch64 build attributes in llvm-readobj.
---
llvm/include/llvm/Object/ELFObjectFile.h | 3 +
.../llvm/Support/AArch64AttributeParser.h | 32 ++++
.../llvm/Support/AArch64BuildAttributes.h | 4 +-
.../include/llvm/Support/ELFAttributeParser.h | 4 +-
llvm/lib/Support/AArch64AttributeParser.cpp | 152 ++++++++++++++++++
llvm/lib/Support/AArch64BuildAttributes.cpp | 26 +--
llvm/lib/Support/CMakeLists.txt | 1 +
llvm/lib/Support/ELFAttributeParser.cpp | 5 +-
llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp | 70 ++++----
.../AArch64/AsmParser/AArch64AsmParser.cpp | 86 +++++-----
.../MCTargetDesc/AArch64ELFStreamer.cpp | 49 +++---
.../MCTargetDesc/AArch64TargetStreamer.cpp | 4 +-
.../MCTargetDesc/AArch64TargetStreamer.h | 9 +-
.../aarch64-build-attributes-comprehensive.s | 56 +++++++
.../AArch64/aarch64-build-attributes-err.s | 5 +
llvm/tools/llvm-readobj/ELFDumper.cpp | 7 +
.../Support/ELFAttributeParserTest.cpp | 3 +
17 files changed, 395 insertions(+), 121 deletions(-)
create mode 100644 llvm/include/llvm/Support/AArch64AttributeParser.h
create mode 100644 llvm/lib/Support/AArch64AttributeParser.cpp
create mode 100644 llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-build-attributes-comprehensive.s
create mode 100644 llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-build-attributes-err.s
diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h
index 60c72062a3f6a..bafc92cafe539 100644
--- a/llvm/include/llvm/Object/ELFObjectFile.h
+++ b/llvm/include/llvm/Object/ELFObjectFile.h
@@ -410,6 +410,9 @@ template <class ELFT> class ELFObjectFile : public ELFObjectFileBase {
case ELF::EM_ARM:
Type = ELF::SHT_ARM_ATTRIBUTES;
break;
+ case ELF::EM_AARCH64:
+ Type = ELF::SHT_AARCH64_ATTRIBUTES;
+ break;
case ELF::EM_RISCV:
Type = ELF::SHT_RISCV_ATTRIBUTES;
break;
diff --git a/llvm/include/llvm/Support/AArch64AttributeParser.h b/llvm/include/llvm/Support/AArch64AttributeParser.h
new file mode 100644
index 0000000000000..655cf749d22d2
--- /dev/null
+++ b/llvm/include/llvm/Support/AArch64AttributeParser.h
@@ -0,0 +1,32 @@
+//=== - AArch64AttributeParser.h-AArch64 Attribute Information Printer - ===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===--------------------------------------------------------------------===//
+
+#ifndef LLVM_SUPPORT_AARCH64ATTRIBUTEPARSER_H
+#define LLVM_SUPPORT_AARCH64ATTRIBUTEPARSER_H
+
+#include "ELFAttributeParser.h"
+#include "llvm/Support/Error.h"
+
+namespace llvm {
+
+class ScopedPrinter;
+
+class AArch64AttributeParser : public ELFAttributeParser {
+ Error handler(uint64_t Tag, bool &Handled) override {
+ return Error::success();
+ }
+
+public:
+ Error parse(ArrayRef<uint8_t> Section, llvm::endianness Endian) override;
+
+ AArch64AttributeParser(ScopedPrinter *Sw) : ELFAttributeParser(Sw) {}
+ AArch64AttributeParser() {}
+};
+} // namespace llvm
+
+#endif // LLVM_SUPPORT_AARCH64ATTRIBUTEPARSER_H
diff --git a/llvm/include/llvm/Support/AArch64BuildAttributes.h b/llvm/include/llvm/Support/AArch64BuildAttributes.h
index 2479992cf8e79..ea293b72f9bb1 100644
--- a/llvm/include/llvm/Support/AArch64BuildAttributes.h
+++ b/llvm/include/llvm/Support/AArch64BuildAttributes.h
@@ -22,7 +22,7 @@
namespace llvm {
-namespace AArch64BuildAttrs {
+namespace AArch64BuildAttributes {
/// AArch64 build attributes vendors IDs (a.k.a subsection name)
enum VendorID : unsigned {
@@ -69,7 +69,7 @@ enum FeatureAndBitsFlag : unsigned {
Feature_PAC_Flag = 1 << 1,
Feature_GCS_Flag = 1 << 2
};
-} // namespace AArch64BuildAttrs
+} // namespace AArch64BuildAttributes
} // namespace llvm
#endif // LLVM_SUPPORT_AARCH64BUILDATTRIBUTES_H
\ No newline at end of file
diff --git a/llvm/include/llvm/Support/ELFAttributeParser.h b/llvm/include/llvm/Support/ELFAttributeParser.h
index ffb92468fb37e..1aa1e7883f7f6 100644
--- a/llvm/include/llvm/Support/ELFAttributeParser.h
+++ b/llvm/include/llvm/Support/ELFAttributeParser.h
@@ -56,8 +56,10 @@ class ELFAttributeParser {
ELFAttributeParser(TagNameMap tagNameMap, StringRef vendor)
: vendor(vendor), sw(nullptr), tagToStringMap(tagNameMap) {}
+ ELFAttributeParser(ScopedPrinter *sw) : sw(sw) {}
+ ELFAttributeParser() : sw(nullptr) {}
- Error parse(ArrayRef<uint8_t> section, llvm::endianness endian);
+ virtual Error parse(ArrayRef<uint8_t> section, llvm::endianness endian);
std::optional<unsigned> getAttributeValue(unsigned tag) const {
auto I = attributes.find(tag);
diff --git a/llvm/lib/Support/AArch64AttributeParser.cpp b/llvm/lib/Support/AArch64AttributeParser.cpp
new file mode 100644
index 0000000000000..4c0f33799df08
--- /dev/null
+++ b/llvm/lib/Support/AArch64AttributeParser.cpp
@@ -0,0 +1,152 @@
+//===-AArch64AttributeParser.cpp-AArch64 Attribute Information Printer-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
+// Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===------------------------------------------------------------------===//
+
+#include "llvm/Support/AArch64AttributeParser.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/AArch64BuildAttributes.h"
+#include "llvm/Support/Errc.h"
+#include "llvm/Support/Error.h"
+#include "llvm/Support/ScopedPrinter.h"
+#include "llvm/Support/raw_ostream.h"
+#include <cstdint>
+
+using namespace llvm;
+
+Error AArch64AttributeParser::parse(ArrayRef<uint8_t> Section,
+ llvm::endianness Endian) {
+
+ unsigned SectionNumber = 0;
+ de = DataExtractor(Section, Endian == llvm::endianness::little, 0);
+
+ // Early returns have specific errors. Consume the Error in cursor.
+ struct ClearCursorError {
+ DataExtractor::Cursor &Cursor;
+ ~ClearCursorError() { consumeError(Cursor.takeError()); }
+ } Clear{cursor};
+
+ /*
+ AArch64 build attributes layout:
+ <format-version: ‘A’> --> There is only one version, 'A' (0x41)
+ [ <uint32: subsection-length> <NTBS: vendor-name> <bytes: vendor-data> ]
+ --> subsection-length: the offset from the start of this subsection to the
+ start of the next one.
+ --> vendor-name: NUL-terminated byte string.
+ --> vendor-data expands to:
+ [ <uint8: optional> <uint8: parameter type> <attribute>*]
+ --> optional: 0- required, 1- optional
+ --> type: 0- ULEB128, 1- NTBS
+ --> attribute: <tag, value>* pair. Tag is ULEB128, value is <parameter
+ type> type.
+ */
+
+ // Get format-version
+ uint8_t FormatVersion = de.getU8(cursor);
+ if (ELFAttrs::Format_Version != FormatVersion)
+ return createStringError(errc::invalid_argument,
+ "unrecognized format-version: 0x" +
+ utohexstr(FormatVersion));
+
+ while (!de.eof(cursor)) {
+ uint32_t BASubsectionLength = de.getU32(cursor);
+ // Minimal valid BA subsection header size is at least 8: length(4) name(at
+ // least a single char + null) optionality(1) and type(1)
+ if (BASubsectionLength < 8)
+ return createStringError(
+ errc::invalid_argument,
+ "invalid AArch64 build attribute subsection size at offset: " +
+ utohexstr(cursor.tell() - 4));
+
+ StringRef VendorName = de.getCStrRef(cursor);
+ // The layout of a private subsection (--> vendor name does not starts with
+ // 'aeabi') is unknown, skip)
+ if (!VendorName.starts_with("aeabi")) {
+ sw->startLine()
+ << "** Skipping private AArch64 build attributes subsection: "
+ << VendorName << "\n";
+ // Offset in Section
+ uint64_t OffsetInSection = cursor.tell();
+ // Size: 4 bytes, Vendor Name: VendorName.size() + 1 (null termination)
+ uint32_t BytesForLengthName = 4 + (VendorName.size() + 1);
+ cursor.seek(OffsetInSection + BASubsectionLength - BytesForLengthName);
+ continue;
+ }
+ // All public subsections names must be known
+ if (VendorName.starts_with("aeabi")) {
+ if (!("aeabi_feature_and_bits" == VendorName ||
+ "aeabi_pauthabi" == VendorName)) {
+ return createStringError(
+ errc::invalid_argument,
+ "unknown public AArch64 build attribute subsection name at "
+ "offset: " +
+ utohexstr(cursor.tell() - (VendorName.size() + 1)));
+ }
+ }
+
+ uint8_t IsOptional = de.getU8(cursor);
+ StringRef IsOptionalStr = IsOptional ? "optional" : "required";
+ uint8_t Type = de.getU8(cursor);
+ StringRef TypeStr = Type ? "ntbs" : "uleb128";
+
+ if (sw) {
+ sw->startLine() << "Section " << ++SectionNumber << " {\n";
+ sw->indent();
+ sw->printNumber("SectionLength", BASubsectionLength);
+ sw->startLine() << "VendorName" << ": " << VendorName
+ << " Optionality: " << IsOptionalStr
+ << " Type: " << TypeStr << "\n";
+ sw->startLine() << "Attributes {\n";
+ sw->indent();
+ }
+
+ // Offset in Section
+ uint64_t OffsetInSection = cursor.tell();
+ // Size: 4 bytes, Vendor Name: VendorName.size() + 1 (null termination),
+ // optionality: 1, size: 1
+ uint32_t BytesAllButAttributes = 4 + (VendorName.size() + 1) + 1 + 1;
+ while (cursor.tell() <
+ (OffsetInSection + BASubsectionLength - BytesAllButAttributes)) {
+
+ uint64_t Tag = de.getULEB128(cursor);
+ std::string Str = utostr(Tag);
+ StringRef TagStr(Str);
+ if ("aeabi_feature_and_bits" == VendorName) {
+ StringRef TagAsString =
+ AArch64BuildAttributes::getFeatureAndBitsTagsStr(Tag);
+ if ("" != TagAsString)
+ TagStr = TagAsString;
+ }
+ if ("aeabi_pauthabi" == VendorName) {
+ StringRef TagAsString = AArch64BuildAttributes::getPauthABITagsStr(Tag);
+ if ("" != TagAsString)
+ TagStr = TagAsString;
+ }
+
+ if (Type) { // type==1 --> ntbs
+ StringRef Value = de.getCStrRef(cursor);
+ if (sw)
+ sw->printString(TagStr, Value);
+ } else { // type==0 --> uleb128
+ uint64_t Value = de.getULEB128(cursor);
+ if (sw)
+ sw->printNumber(TagStr, Value);
+ }
+ }
+ if (sw) {
+ // Close 'Attributes'
+ sw->unindent();
+ sw->startLine() << "}\n";
+ // Close 'Section'
+ sw->unindent();
+ sw->startLine() << "}\n";
+ }
+ }
+
+ return cursor.takeError();
+}
diff --git a/llvm/lib/Support/AArch64BuildAttributes.cpp b/llvm/lib/Support/AArch64BuildAttributes.cpp
index e36667ca711e0..4a6b2fd538803 100644
--- a/llvm/lib/Support/AArch64BuildAttributes.cpp
+++ b/llvm/lib/Support/AArch64BuildAttributes.cpp
@@ -10,9 +10,9 @@
#include "llvm/ADT/StringSwitch.h"
using namespace llvm;
-using namespace llvm::AArch64BuildAttrs;
+using namespace llvm::AArch64BuildAttributes;
-StringRef AArch64BuildAttrs::getVendorName(unsigned Vendor) {
+StringRef AArch64BuildAttributes::getVendorName(unsigned Vendor) {
switch (Vendor) {
case AEABI_FEATURE_AND_BITS:
return "aeabi_feature_and_bits";
@@ -25,14 +25,14 @@ StringRef AArch64BuildAttrs::getVendorName(unsigned Vendor) {
return "";
}
}
-VendorID AArch64BuildAttrs::getVendorID(StringRef Vendor) {
+VendorID AArch64BuildAttributes::getVendorID(StringRef Vendor) {
return StringSwitch<VendorID>(Vendor)
.Case("aeabi_feature_and_bits", AEABI_FEATURE_AND_BITS)
.Case("aeabi_pauthabi", AEABI_PAUTHABI)
.Default(VENDOR_UNKNOWN);
}
-StringRef AArch64BuildAttrs::getOptionalStr(unsigned Optional) {
+StringRef AArch64BuildAttributes::getOptionalStr(unsigned Optional) {
switch (Optional) {
case REQUIRED:
return "required";
@@ -43,18 +43,18 @@ StringRef AArch64BuildAttrs::getOptionalStr(unsigned Optional) {
return "";
}
}
-SubsectionOptional AArch64BuildAttrs::getOptionalID(StringRef Optional) {
+SubsectionOptional AArch64BuildAttributes::getOptionalID(StringRef Optional) {
return StringSwitch<SubsectionOptional>(Optional)
.Case("required", REQUIRED)
.Case("optional", OPTIONAL)
.Default(OPTIONAL_NOT_FOUND);
}
-StringRef AArch64BuildAttrs::getSubsectionOptionalUnknownError() {
+StringRef AArch64BuildAttributes::getSubsectionOptionalUnknownError() {
return "unknown AArch64 build attributes optionality, expected "
"required|optional";
}
-StringRef AArch64BuildAttrs::getTypeStr(unsigned Type) {
+StringRef AArch64BuildAttributes::getTypeStr(unsigned Type) {
switch (Type) {
case ULEB128:
return "uleb128";
@@ -65,17 +65,17 @@ StringRef AArch64BuildAttrs::getTypeStr(unsigned Type) {
return "";
}
}
-SubsectionType AArch64BuildAttrs::getTypeID(StringRef Type) {
+SubsectionType AArch64BuildAttributes::getTypeID(StringRef Type) {
return StringSwitch<SubsectionType>(Type)
.Cases("uleb128", "ULEB128", ULEB128)
.Cases("ntbs", "NTBS", NTBS)
.Default(TYPE_NOT_FOUND);
}
-StringRef AArch64BuildAttrs::getSubsectionTypeUnknownError() {
+StringRef AArch64BuildAttributes::getSubsectionTypeUnknownError() {
return "unknown AArch64 build attributes type, expected uleb128|ntbs";
}
-StringRef AArch64BuildAttrs::getPauthABITagsStr(unsigned PauthABITag) {
+StringRef AArch64BuildAttributes::getPauthABITagsStr(unsigned PauthABITag) {
switch (PauthABITag) {
case TAG_PAUTH_PLATFORM:
return "Tag_PAuth_Platform";
@@ -87,7 +87,7 @@ StringRef AArch64BuildAttrs::getPauthABITagsStr(unsigned PauthABITag) {
}
}
-PauthABITags AArch64BuildAttrs::getPauthABITagsID(StringRef PauthABITag) {
+PauthABITags AArch64BuildAttributes::getPauthABITagsID(StringRef PauthABITag) {
return StringSwitch<PauthABITags>(PauthABITag)
.Case("Tag_PAuth_Platform", TAG_PAUTH_PLATFORM)
.Case("Tag_PAuth_Schema", TAG_PAUTH_SCHEMA)
@@ -95,7 +95,7 @@ PauthABITags AArch64BuildAttrs::getPauthABITagsID(StringRef PauthABITag) {
}
StringRef
-AArch64BuildAttrs::getFeatureAndBitsTagsStr(unsigned FeatureAndBitsTag) {
+AArch64BuildAttributes::getFeatureAndBitsTagsStr(unsigned FeatureAndBitsTag) {
switch (FeatureAndBitsTag) {
case TAG_FEATURE_BTI:
return "Tag_Feature_BTI";
@@ -110,7 +110,7 @@ AArch64BuildAttrs::getFeatureAndBitsTagsStr(unsigned FeatureAndBitsTag) {
}
FeatureAndBitsTags
-AArch64BuildAttrs::getFeatureAndBitsTagsID(StringRef FeatureAndBitsTag) {
+AArch64BuildAttributes::getFeatureAndBitsTagsID(StringRef FeatureAndBitsTag) {
return StringSwitch<FeatureAndBitsTags>(FeatureAndBitsTag)
.Case("Tag_Feature_BTI", TAG_FEATURE_BTI)
.Case("Tag_Feature_PAC", TAG_FEATURE_PAC)
diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index a6d8a25818866..64305acd4145a 100644
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/lib/Support/CMakeLists.txt
@@ -146,6 +146,7 @@ add_llvm_component_library(LLVMSupport
ARMBuildAttributes.cpp
AArch64BuildAttributes.cpp
ARMAttributeParser.cpp
+ AArch64AttributeParser.cpp
ARMWinEH.cpp
Allocator.cpp
AutoConvert.cpp
diff --git a/llvm/lib/Support/ELFAttributeParser.cpp b/llvm/lib/Support/ELFAttributeParser.cpp
index 26c3d54e17ade..47055b6fda2f8 100644
--- a/llvm/lib/Support/ELFAttributeParser.cpp
+++ b/llvm/lib/Support/ELFAttributeParser.cpp
@@ -128,9 +128,8 @@ Error ELFAttributeParser::parseSubsection(uint32_t length) {
}
// Handle a subsection with an unrecognized vendor-name by skipping
- // over it to the next subsection. ADDENDA32 in the Arm ABI defines
- // that vendor attribute sections must not affect compatibility, so
- // this should always be safe.
+ // over it to the next subsection. vendor attribute sections must not
+ // affect compatibility, so this should always be safe.
if (vendorName.lower() != vendor) {
cursor.seek(end);
return Error::success();
diff --git a/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp b/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp
index f1f25b65fc53f..982555527ac78 100644
--- a/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp
+++ b/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp
@@ -358,7 +358,7 @@ void AArch64AsmPrinter::emitStartOfAsmFile(Module &M) {
if (const auto *BTE = mdconst::extract_or_null<ConstantInt>(
M.getModuleFlag("branch-target-enforcement"))) {
if (!BTE->isZero()) {
- BAFlags |= AArch64BuildAttrs::FeatureAndBitsFlag::Feature_BTI_Flag;
+ BAFlags |= AArch64BuildAttributes::FeatureAndBitsFlag::Feature_BTI_Flag;
GNUFlags |= ELF::GNU_PROPERTY_AARCH64_FEATURE_1_BTI;
}
}
@@ -366,7 +366,7 @@ void AArch64AsmPrinter::emitStartOfAsmFile(Module &M) {
if (const auto *GCS = mdconst::extract_or_null<ConstantInt>(
M.getModuleFlag("guarded-control-stack"))) {
if (!GCS->isZero()) {
- BAFlags |= AArch64BuildAttrs::FeatureAndBitsFlag::Feature_GCS_Flag;
+ BAFlags |= AArch64BuildAttributes::FeatureAndBitsFlag::Feature_GCS_Flag;
GNUFlags |= ELF::GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
}
}
@@ -374,7 +374,7 @@ void AArch64AsmPrinter::emitStartOfAsmFile(Module &M) {
if (const auto *Sign = mdconst::extract_or_null<ConstantInt>(
M.getModuleFlag("sign-return-address"))) {
if (!Sign->isZero()) {
- BAFlags |= AArch64BuildAttrs::FeatureAndBitsFlag::Feature_PAC_Flag;
+ BAFlags |= AArch64BuildAttributes::FeatureAndBitsFlag::Feature_PAC_Flag;
GNUFlags |= ELF::GNU_PROPERTY_AARCH64_FEATURE_1_PAC;
}
}
@@ -477,35 +477,45 @@ void AArch64AsmPrinter::emitAttributes(unsigned Flags,
if (PAuthABIPlatform || PAuthABIVersion) {
TS->emitAtributesSubsection(
- AArch64BuildAttrs::getVendorName(AArch64BuildAttrs::AEABI_PAUTHABI),
- AArch64BuildAttrs::SubsectionOptional::REQUIRED,
- AArch64BuildAttrs::SubsectionType::ULEB128);
- TS->emitAttribute(
- AArch64BuildAttrs::getVendorName(AArch64BuildAttrs::AEABI_PAUTHABI),
- AArch64BuildAttrs::TAG_PAUTH_PLATFORM, PAuthABIPlatform, "", false);
- TS->emitAttribute(
- AArch64BuildAttrs::getVendorName(AArch64BuildAttrs::AEABI_PAUTHABI),
- AArch64BuildAttrs::TAG_PAUTH_SCHEMA, PAuthABIVersion, "", false);
- }
-
- unsigned BTIValue = (Flags & AArch64BuildAttrs::Feature_BTI_Flag) ? 1 : 0;
- unsigned PACValue = (Flags & AArch64BuildAttrs::Feature_PAC_Flag) ? 1 : 0;
- unsigned GCSValue = (Flags & AArch64BuildAttrs::Feature_GCS_Flag) ? 1 : 0;
+ AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_PAUTHABI),
+ AArch64BuildAttributes::SubsectionOptional::REQUIRED,
+ AArch64BuildAttributes::SubsectionType::ULEB128);
+ TS->emitAttribute(AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_PAUTHABI),
+ AArch64BuildAttributes::TAG_PAUTH_PLATFORM,
+ PAuthABIPlatform, "", false);
+ TS->emitAttribute(AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_PAUTHABI),
+ AArch64BuildAttributes::TAG_PAUTH_SCHEMA, PAuthABIVersion,
+ "", false);
+ }
+
+ unsigned BTIValue =
+ (Flags & AArch64BuildAttributes::Feature_BTI_Flag) ? 1 : 0;
+ unsigned PACValue =
+ (Flags & AArch64BuildAttributes::Feature_PAC_Flag) ? 1 : 0;
+ unsigned GCSValue =
+ (Flags & AArch64BuildAttributes::Feature_GCS_Flag) ? 1 : 0;
if (BTIValue || PACValue || GCSValue) {
- TS->emitAtributesSubsection(AArch64BuildAttrs::getVendorName(
- AArch64BuildAttrs::AEABI_FEATURE_AND_BITS),
- AArch64BuildAttrs::SubsectionOptional::OPTIONAL,
- AArch64BuildAttrs::SubsectionType::ULEB128);
- TS->emitAttribute(AArch64BuildAttrs::getVendorName(
- AArch64BuildAttrs::AEABI_FEATURE_AND_BITS),
- AArch64BuildAttrs::TAG_FEATURE_BTI, BTIValue, "", false);
- TS->emitAttribute(AArch64BuildAttrs::getVendorName(
- AArch64BuildAttrs::AEABI_FEATURE_AND_BITS),
- AArch64BuildAttrs::TAG_FEATURE_PAC, PACValue, "", false);
- TS->emitAttribute(AArch64BuildAttrs::getVendorName(
- AArch64BuildAttrs::AEABI_FEATURE_AND_BITS),
- AArch64BuildAttrs::TAG_FEATURE_GCS, GCSValue, "", false);
+ TS->emitAtributesSubsection(
+ AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_FEATURE_AND_BITS),
+ AArch64BuildAttributes::SubsectionOptional::OPTIONAL,
+ AArch64BuildAttributes::SubsectionType::ULEB128);
+ TS->emitAttribute(AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_FEATURE_AND_BITS),
+ AArch64BuildAttributes::TAG_FEATURE_BTI, BTIValue, "",
+ false);
+ TS->emitAttribute(AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_FEATURE_AND_BITS),
+ AArch64BuildAttributes::TAG_FEATURE_PAC, PACValue, "",
+ false);
+ TS->emitAttribute(AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_FEATURE_AND_BITS),
+ AArch64BuildAttributes::TAG_FEATURE_GCS, GCSValue, "",
+ false);
}
}
diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 16e0883fe0584..5b42a7e2b512f 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -7843,10 +7843,10 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
// Consume the name (subsection name)
StringRef SubsectionName;
- AArch64BuildAttrs::VendorID SubsectionNameID;
+ AArch64BuildAttributes::VendorID SubsectionNameID;
if (Parser.getTok().is(AsmToken::Identifier)) {
SubsectionName = Parser.getTok().getIdentifier();
- SubsectionNameID = AArch64BuildAttrs::getVendorID(SubsectionName);
+ SubsectionNameID = AArch64BuildAttributes::getVendorID(SubsectionName);
} else {
Error(Parser.getTok().getLoc(), "subsection name not found");
return true;
@@ -7863,14 +7863,14 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
getTargetStreamer().getAtributesSubsectionByName(SubsectionName);
// Consume the first parameter (optionality parameter)
- AArch64BuildAttrs::SubsectionOptional IsOptional;
+ AArch64BuildAttributes::SubsectionOptional IsOptional;
// options: optional/required
if (Parser.getTok().is(AsmToken::Identifier)) {
StringRef Optionality = Parser.getTok().getIdentifier();
- IsOptional = AArch64BuildAttrs::getOptionalID(Optionality);
- if (AArch64BuildAttrs::OPTIONAL_NOT_FOUND == IsOptional) {
+ IsOptional = AArch64BuildAttributes::getOptionalID(Optionality);
+ if (AArch64BuildAttributes::OPTIONAL_NOT_FOUND == IsOptional) {
Error(Parser.getTok().getLoc(),
- AArch64BuildAttrs::getSubsectionOptionalUnknownError());
+ AArch64BuildAttributes::getSubsectionOptionalUnknownError());
return true;
}
if (SubsectionExists) {
@@ -7878,10 +7878,10 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
Error(Parser.getTok().getLoc(),
"optionality mismatch! subsection '" + SubsectionName +
"' already exists with optionality defined as '" +
- AArch64BuildAttrs::getOptionalStr(
+ AArch64BuildAttributes::getOptionalStr(
SubsectionExists->IsOptional) +
"' and not '" +
- AArch64BuildAttrs::getOptionalStr(IsOptional) + "'");
+ AArch64BuildAttributes::getOptionalStr(IsOptional) + "'");
return true;
}
}
@@ -7891,15 +7891,15 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
return true;
}
// Check for possible IsOptional unaccepted values for known subsections
- if (AArch64BuildAttrs::AEABI_FEATURE_AND_BITS == SubsectionNameID) {
- if (AArch64BuildAttrs::REQUIRED == IsOptional) {
+ if (AArch64BuildAttributes::AEABI_FEATURE_AND_BITS == SubsectionNameID) {
+ if (AArch64BuildAttributes::REQUIRED == IsOptional) {
Error(Parser.getTok().getLoc(),
"aeabi_feature_and_bits must be marked as optional");
return true;
}
}
- if (AArch64BuildAttrs::AEABI_PAUTHABI == SubsectionNameID) {
- if (AArch64BuildAttrs::OPTIONAL == IsOptional) {
+ if (AArch64BuildAttributes::AEABI_PAUTHABI == SubsectionNameID) {
+ if (AArch64BuildAttributes::OPTIONAL == IsOptional) {
Error(Parser.getTok().getLoc(),
"aeabi_pauthabi must be marked as required");
return true;
@@ -7912,23 +7912,24 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
}
// Consume the second parameter (type parameter)
- AArch64BuildAttrs::SubsectionType Type;
+ AArch64BuildAttributes::SubsectionType Type;
if (Parser.getTok().is(AsmToken::Identifier)) {
StringRef Name = Parser.getTok().getIdentifier();
- Type = AArch64BuildAttrs::getTypeID(Name);
- if (AArch64BuildAttrs::TYPE_NOT_FOUND == Type) {
+ Type = AArch64BuildAttributes::getTypeID(Name);
+ if (AArch64BuildAttributes::TYPE_NOT_FOUND == Type) {
Error(Parser.getTok().getLoc(),
- AArch64BuildAttrs::getSubsectionTypeUnknownError());
+ AArch64BuildAttributes::getSubsectionTypeUnknownError());
return true;
}
if (SubsectionExists) {
if (Type != SubsectionExists->ParameterType) {
- Error(
- Parser.getTok().getLoc(),
- "type mismatch! subsection '" + SubsectionName +
- "' already exists with type defined as '" +
- AArch64BuildAttrs::getTypeStr(SubsectionExists->ParameterType) +
- "' and not '" + AArch64BuildAttrs::getTypeStr(Type) + "'");
+ Error(Parser.getTok().getLoc(),
+ "type mismatch! subsection '" + SubsectionName +
+ "' already exists with type defined as '" +
+ AArch64BuildAttributes::getTypeStr(
+ SubsectionExists->ParameterType) +
+ "' and not '" + AArch64BuildAttributes::getTypeStr(Type) +
+ "'");
return true;
}
}
@@ -7938,9 +7939,9 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
return true;
}
// Check for possible unaccepted 'type' values for known subsections
- if (AArch64BuildAttrs::AEABI_FEATURE_AND_BITS == SubsectionNameID ||
- AArch64BuildAttrs::AEABI_PAUTHABI == SubsectionNameID) {
- if (AArch64BuildAttrs::NTBS == Type) {
+ if (AArch64BuildAttributes::AEABI_FEATURE_AND_BITS == SubsectionNameID ||
+ AArch64BuildAttributes::AEABI_PAUTHABI == SubsectionNameID) {
+ if (AArch64BuildAttributes::NTBS == Type) {
Error(Parser.getTok().getLoc(),
SubsectionName + " must be marked as ULEB128");
return true;
@@ -7980,13 +7981,14 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
StringRef ActiveSubsectionName = ActiveSubsection->VendorName;
unsigned ActiveSubsectionType = ActiveSubsection->ParameterType;
- unsigned ActiveSubsectionID = AArch64BuildAttrs::VENDOR_UNKNOWN;
- if (AArch64BuildAttrs::getVendorName(AArch64BuildAttrs::AEABI_PAUTHABI) ==
+ unsigned ActiveSubsectionID = AArch64BuildAttributes::VENDOR_UNKNOWN;
+ if (AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_PAUTHABI) == ActiveSubsectionName)
+ ActiveSubsectionID = AArch64BuildAttributes::AEABI_PAUTHABI;
+ if (AArch64BuildAttributes::getVendorName(
+ AArch64BuildAttributes::AEABI_FEATURE_AND_BITS) ==
ActiveSubsectionName)
- ActiveSubsectionID = AArch64BuildAttrs::AEABI_PAUTHABI;
- if (AArch64BuildAttrs::getVendorName(
- AArch64BuildAttrs::AEABI_FEATURE_AND_BITS) == ActiveSubsectionName)
- ActiveSubsectionID = AArch64BuildAttrs::AEABI_FEATURE_AND_BITS;
+ ActiveSubsectionID = AArch64BuildAttributes::AEABI_FEATURE_AND_BITS;
StringRef TagStr = "";
unsigned Tag;
@@ -7999,7 +8001,7 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
// Should not happen
assert(0 && "Subsection name error");
break;
- case AArch64BuildAttrs::VENDOR_UNKNOWN:
+ case AArch64BuildAttributes::VENDOR_UNKNOWN:
// Tag was provided as an unrecognized string instead of an unsigned
// integer
Error(Parser.getTok().getLoc(), "unrecognized Tag: '" + TagStr +
@@ -8007,18 +8009,18 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
"tags have to be an unsigned int.");
return true;
break;
- case AArch64BuildAttrs::AEABI_PAUTHABI:
- Tag = AArch64BuildAttrs::getPauthABITagsID(TagStr);
- if (AArch64BuildAttrs::PAUTHABI_TAG_NOT_FOUND == Tag) {
+ case AArch64BuildAttributes::AEABI_PAUTHABI:
+ Tag = AArch64BuildAttributes::getPauthABITagsID(TagStr);
+ if (AArch64BuildAttributes::PAUTHABI_TAG_NOT_FOUND == Tag) {
Error(Parser.getTok().getLoc(), "unknown AArch64 build attribute '" +
TagStr + "' for subsection '" +
ActiveSubsectionName + "'");
return true;
}
break;
- case AArch64BuildAttrs::AEABI_FEATURE_AND_BITS:
- Tag = AArch64BuildAttrs::getFeatureAndBitsTagsID(TagStr);
- if (AArch64BuildAttrs::FEATURE_AND_BITS_TAG_NOT_FOUND == Tag) {
+ case AArch64BuildAttributes::AEABI_FEATURE_AND_BITS:
+ Tag = AArch64BuildAttributes::getFeatureAndBitsTagsID(TagStr);
+ if (AArch64BuildAttributes::FEATURE_AND_BITS_TAG_NOT_FOUND == Tag) {
Error(Parser.getTok().getLoc(), "unknown AArch64 build attribute '" +
TagStr + "' for subsection '" +
ActiveSubsectionName + "'");
@@ -8042,7 +8044,7 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
unsigned ValueInt = unsigned(-1);
std::string ValueStr = "";
if (Parser.getTok().is(AsmToken::Integer)) {
- if (AArch64BuildAttrs::NTBS == ActiveSubsectionType) {
+ if (AArch64BuildAttributes::NTBS == ActiveSubsectionType) {
Error(
Parser.getTok().getLoc(),
"active subsection type is NTBS (string), found ULEB128 (unsigned)");
@@ -8050,7 +8052,7 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
}
ValueInt = getTok().getIntVal();
} else if (Parser.getTok().is(AsmToken::Identifier)) {
- if (AArch64BuildAttrs::ULEB128 == ActiveSubsectionType) {
+ if (AArch64BuildAttributes::ULEB128 == ActiveSubsectionType) {
Error(
Parser.getTok().getLoc(),
"active subsection type is ULEB128 (unsigned), found NTBS (string)");
@@ -8058,7 +8060,7 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
}
ValueStr = Parser.getTok().getIdentifier();
} else if (Parser.getTok().is(AsmToken::String)) {
- if (AArch64BuildAttrs::ULEB128 == ActiveSubsectionType) {
+ if (AArch64BuildAttributes::ULEB128 == ActiveSubsectionType) {
Error(
Parser.getTok().getLoc(),
"active subsection type is ULEB128 (unsigned), found NTBS (string)");
@@ -8071,7 +8073,7 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
}
// Check for possible unaccepted values for known tags
// (AEABI_FEATURE_AND_BITS)
- if (ActiveSubsectionID == AArch64BuildAttrs::AEABI_FEATURE_AND_BITS) {
+ if (ActiveSubsectionID == AArch64BuildAttributes::AEABI_FEATURE_AND_BITS) {
if (0 != ValueInt && 1 != ValueInt) {
Error(Parser.getTok().getLoc(),
"unknown AArch64 build attributes Value for Tag '" + TagStr +
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
index 2f6a5144a82b4..bdb4454b02d4b 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
@@ -160,13 +160,13 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
return;
}
- unsigned VendorID = AArch64BuildAttrs::getVendorID(VendorName);
+ unsigned VendorID = AArch64BuildAttributes::getVendorID(VendorName);
switch (VendorID) {
default:
assert(0 && "Subsection name error");
break;
- case AArch64BuildAttrs::VENDOR_UNKNOWN:
+ case AArch64BuildAttributes::VENDOR_UNKNOWN:
if (unsigned(-1) != Value) {
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value;
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
@@ -179,7 +179,7 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
}
break;
// Note: AEABI_FEATURE_AND_BITS takes only unsigned values
- case AArch64BuildAttrs::AEABI_FEATURE_AND_BITS:
+ case AArch64BuildAttributes::AEABI_FEATURE_AND_BITS:
switch (Tag) {
default: // allow emitting any attribute by number
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value;
@@ -188,18 +188,18 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
Override);
break;
- case AArch64BuildAttrs::TAG_FEATURE_BTI:
- case AArch64BuildAttrs::TAG_FEATURE_GCS:
- case AArch64BuildAttrs::TAG_FEATURE_PAC:
+ case AArch64BuildAttributes::TAG_FEATURE_BTI:
+ case AArch64BuildAttributes::TAG_FEATURE_GCS:
+ case AArch64BuildAttributes::TAG_FEATURE_PAC:
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value << "\t@ "
- << AArch64BuildAttrs::getFeatureAndBitsTagsStr(Tag);
+ << AArch64BuildAttributes::getFeatureAndBitsTagsStr(Tag);
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
Override);
break;
}
break;
// Note: AEABI_PAUTHABI takes only unsigned values
- case AArch64BuildAttrs::AEABI_PAUTHABI:
+ case AArch64BuildAttributes::AEABI_PAUTHABI:
switch (Tag) {
default: // allow emitting any attribute by number
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value;
@@ -208,10 +208,10 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
Override);
break;
- case AArch64BuildAttrs::TAG_PAUTH_PLATFORM:
- case AArch64BuildAttrs::TAG_PAUTH_SCHEMA:
+ case AArch64BuildAttributes::TAG_PAUTH_PLATFORM:
+ case AArch64BuildAttributes::TAG_PAUTH_SCHEMA:
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value << "\t@ "
- << AArch64BuildAttrs::getPauthABITagsStr(Tag);
+ << AArch64BuildAttributes::getPauthABITagsStr(Tag);
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
Override);
break;
@@ -222,18 +222,19 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
}
void emitAtributesSubsection(
- StringRef SubsectionName, AArch64BuildAttrs::SubsectionOptional Optional,
- AArch64BuildAttrs::SubsectionType ParameterType) override {
+ StringRef SubsectionName,
+ AArch64BuildAttributes::SubsectionOptional Optional,
+ AArch64BuildAttributes::SubsectionType ParameterType) override {
// The AArch64 build attributes assembly subsection header format:
// ".aeabi_subsection name, optional, parameter type"
// optional: required (0) optional (1)
// parameter type: uleb128 or ULEB128 (0) ntbs or NTBS (1)
- unsigned SubsectionID = AArch64BuildAttrs::getVendorID(SubsectionName);
+ unsigned SubsectionID = AArch64BuildAttributes::getVendorID(SubsectionName);
assert((0 == Optional || 1 == Optional) &&
- AArch64BuildAttrs::getSubsectionOptionalUnknownError().data());
+ AArch64BuildAttributes::getSubsectionOptionalUnknownError().data());
assert((0 == ParameterType || 1 == ParameterType) &&
- AArch64BuildAttrs::getSubsectionTypeUnknownError().data());
+ AArch64BuildAttributes::getSubsectionTypeUnknownError().data());
std::string SubsectionTag = ".aeabi_subsection";
StringRef OptionalStr = getOptionalStr(Optional);
@@ -244,20 +245,20 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
// Treated as a private subsection
break;
}
- case AArch64BuildAttrs::AEABI_PAUTHABI: {
- assert(AArch64BuildAttrs::REQUIRED == Optional &&
+ case AArch64BuildAttributes::AEABI_PAUTHABI: {
+ assert(AArch64BuildAttributes::REQUIRED == Optional &&
"subsection .aeabi-pauthabi should be marked as "
"required and not as optional");
- assert(AArch64BuildAttrs::ULEB128 == ParameterType &&
+ assert(AArch64BuildAttributes::ULEB128 == ParameterType &&
"subsection .aeabi-pauthabi should be "
"marked as uleb128 and not as ntbs");
break;
}
- case AArch64BuildAttrs::AEABI_FEATURE_AND_BITS: {
- assert(AArch64BuildAttrs::OPTIONAL == Optional &&
+ case AArch64BuildAttributes::AEABI_FEATURE_AND_BITS: {
+ assert(AArch64BuildAttributes::OPTIONAL == Optional &&
"subsection .aeabi_feature_and_bits should be "
"marked as optional and not as required");
- assert(AArch64BuildAttrs::ULEB128 == ParameterType &&
+ assert(AArch64BuildAttributes::ULEB128 == ParameterType &&
"subsection .aeabi_feature_and_bits should "
"be marked as uleb128 and not as ntbs");
break;
@@ -419,8 +420,8 @@ AArch64ELFStreamer &AArch64TargetELFStreamer::getStreamer() {
}
void AArch64TargetELFStreamer::emitAtributesSubsection(
- StringRef VendorName, AArch64BuildAttrs::SubsectionOptional IsOptional,
- AArch64BuildAttrs::SubsectionType ParameterType) {
+ StringRef VendorName, AArch64BuildAttributes::SubsectionOptional IsOptional,
+ AArch64BuildAttributes::SubsectionType ParameterType) {
AArch64TargetStreamer::emitAtributesSubsection(VendorName, IsOptional,
ParameterType);
}
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
index 01b74e55116f9..62a8542dde82e 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
@@ -153,8 +153,8 @@ MCTargetStreamer *llvm::createAArch64NullTargetStreamer(MCStreamer &S) {
}
void AArch64TargetStreamer::emitAtributesSubsection(
- StringRef VendorName, AArch64BuildAttrs::SubsectionOptional IsOptional,
- AArch64BuildAttrs::SubsectionType ParameterType) {
+ StringRef VendorName, AArch64BuildAttributes::SubsectionOptional IsOptional,
+ AArch64BuildAttributes::SubsectionType ParameterType) {
// If exists, return.
for (MCELFStreamer::AttributeSubSection &SubSection : AttributeSubSections) {
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h
index 9183fb4cc5f56..0e450bdd9a09c 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h
@@ -97,8 +97,8 @@ class AArch64TargetStreamer : public MCTargetStreamer {
/// Build attributes implementation
virtual void
emitAtributesSubsection(StringRef VendorName,
- AArch64BuildAttrs::SubsectionOptional IsOptional,
- AArch64BuildAttrs::SubsectionType ParameterType);
+ AArch64BuildAttributes::SubsectionOptional IsOptional,
+ AArch64BuildAttributes::SubsectionType ParameterType);
virtual void emitAttribute(StringRef VendorName, unsigned Tag, unsigned Value,
std::string String, bool Override);
void activateAtributesSubsection(StringRef VendorName);
@@ -124,8 +124,9 @@ class AArch64TargetELFStreamer : public AArch64TargetStreamer {
/// Build attributes implementation
void emitAtributesSubsection(
- StringRef VendorName, AArch64BuildAttrs::SubsectionOptional IsOptional,
- AArch64BuildAttrs::SubsectionType ParameterType) override;
+ StringRef VendorName,
+ AArch64BuildAttributes::SubsectionOptional IsOptional,
+ AArch64BuildAttributes::SubsectionType ParameterType) override;
void emitAttribute(StringRef VendorName, unsigned Tag, unsigned Value,
std::string String, bool Override = false) override;
void emitInst(uint32_t Inst) override;
diff --git a/llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-build-attributes-comprehensive.s b/llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-build-attributes-comprehensive.s
new file mode 100644
index 0000000000000..253148ba93ca7
--- /dev/null
+++ b/llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-build-attributes-comprehensive.s
@@ -0,0 +1,56 @@
+# RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --arch-specific - | FileCheck %s --check-prefix=ATTR
+
+# ATTR: BuildAttributes {
+# ATTR-NEXT: FormatVersion: 0x41
+# ATTR-NEXT: ** Skipping private AArch64 build attributes subsection: private_subsection_1
+# ATTR-NEXT: Section 1 {
+# ATTR-NEXT: SectionLength: 37
+# ATTR-NEXT: VendorName: aeabi_feature_and_bits Optionality: optional Type: uleb128
+# ATTR-NEXT: Attributes {
+# ATTR-NEXT: Tag_Feature_BTI: 1
+# ATTR-NEXT: Tag_Feature_PAC: 1
+# ATTR-NEXT: Tag_Feature_GCS: 1
+# ATTR-NEXT: 3: 1
+# ATTR-NEXT: }
+# ATTR-NEXT: }
+# ATTR-NEXT: ** Skipping private AArch64 build attributes subsection: private_subsection_3
+# ATTR-NEXT: Section 2 {
+# ATTR-NEXT: SectionLength: 35
+# ATTR-NEXT: VendorName: aeabi_pauthabi Optionality: required Type: uleb128
+# ATTR-NEXT: Attributes {
+# ATTR-NEXT: Tag_PAuth_Schema: 1
+# ATTR-NEXT: Tag_PAuth_Platform: 1
+# ATTR-NEXT: 5: 1
+# ATTR-NEXT: 6: 1
+# ATTR-NEXT: 7: 1
+# ATTR-NEXT: 8: 1
+# ATTR-NEXT: 9: 1
+# ATTR-NEXT: }
+# ATTR-NEXT: }
+# ATTR-NEXT: ** Skipping private AArch64 build attributes subsection: private_subsection_4
+# ATTR-NEXT: ** Skipping private AArch64 build attributes subsection: private_subsection_2
+# ATTR-NEXT: }
+
+
+.aeabi_subsection private_subsection_1, optional, uleb128
+.aeabi_attribute 1, 1
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_BTI, 1
+.aeabi_attribute 1, 1
+.aeabi_attribute 2, 1
+.aeabi_attribute 3, 1
+.aeabi_subsection private_subsection_3, optional, ntbs
+.aeabi_attribute 1, "1"
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute Tag_PAuth_Schema, 1
+.aeabi_attribute Tag_PAuth_Platform, 1
+.aeabi_attribute 5, 1
+.aeabi_attribute 6, 1
+.aeabi_attribute 7, 1
+.aeabi_attribute 8, 1
+.aeabi_attribute 9, 1
+.aeabi_subsection private_subsection_4, required, ntbs
+.aeabi_attribute 1, "1"
+.aeabi_subsection private_subsection_2, required, uleb128
+.aeabi_attribute 1, 1
+.aeabi_attribute 2, 1
diff --git a/llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-build-attributes-err.s b/llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-build-attributes-err.s
new file mode 100644
index 0000000000000..30502c79cf7a3
--- /dev/null
+++ b/llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-build-attributes-err.s
@@ -0,0 +1,5 @@
+# RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --arch-specific - 2>&1 | FileCheck %s --check-prefix=ERR
+
+# ERR: unable to dump attributes from the Unknown section with index 3: unknown public AArch64 build attribute subsection name at offset: 5
+
+.aeabi_subsection aeabi_a, optional, uleb128
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 7806eea6a0c52..32ec191199f79 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -39,6 +39,7 @@
#include "llvm/Object/ObjectFile.h"
#include "llvm/Object/RelocationResolver.h"
#include "llvm/Object/StackMapParser.h"
+#include "llvm/Support/AArch64AttributeParser.h"
#include "llvm/Support/AMDGPUMetadata.h"
#include "llvm/Support/ARMAttributeParser.h"
#include "llvm/Support/ARMBuildAttributes.h"
@@ -2872,6 +2873,12 @@ template <class ELFT> void ELFDumper<ELFT>::printArchSpecificInfo() {
ELF::SHT_ARM_ATTRIBUTES, std::make_unique<ARMAttributeParser>(&W),
Obj.isLE() ? llvm::endianness::little : llvm::endianness::big);
break;
+ case EM_AARCH64:
+ printAttributes(ELF::SHT_AARCH64_ATTRIBUTES,
+ std::make_unique<AArch64AttributeParser>(&W),
+ Obj.isLE() ? llvm::endianness::little
+ : llvm::endianness::big);
+ break;
case EM_RISCV:
if (Obj.isLE())
printAttributes(ELF::SHT_RISCV_ATTRIBUTES,
diff --git a/llvm/unittests/Support/ELFAttributeParserTest.cpp b/llvm/unittests/Support/ELFAttributeParserTest.cpp
index 38e7b09cc3c7d..0e034814c4d85 100644
--- a/llvm/unittests/Support/ELFAttributeParserTest.cpp
+++ b/llvm/unittests/Support/ELFAttributeParserTest.cpp
@@ -27,6 +27,9 @@ class AttributeHeaderParser : public ELFAttributeParser {
AttributeHeaderParser(ScopedPrinter *printer)
: ELFAttributeParser(printer, emptyTagNameMap, "test") {}
AttributeHeaderParser() : ELFAttributeParser(emptyTagNameMap, "test") {}
+ Error parse(ArrayRef<uint8_t> section, llvm::endianness endian) override {
+ return ELFAttributeParser::parse(section, endian);
+ }
};
static void testParseError(ArrayRef<uint8_t> bytes, const char *msg) {
More information about the llvm-commits
mailing list