From: Matthieu Longo <matthieu.longo@arm.com>
Date: Fri, 29 Nov 2024 15:27:04 +0000 (+0000)
Subject: aarch64: adapt bti-plt-so to use selectable GNU properties
X-Git-Tag: gdb-16-branchpoint~248
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db61887f969b4947f32d616225491bc1d7758a8f;p=thirdparty%2Fbinutils-gdb.git

aarch64: adapt bti-plt-so to use selectable GNU properties
---

diff --git a/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp b/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp
index 233384da523..471afa13a63 100644
--- a/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp
+++ b/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp
@@ -40,7 +40,7 @@ foreach test_lp64 $test_lp64_list {
 set aarch64elflinktests {
   {"Build bti-plt-so for PLT tests"
    "-shared" ""
-   ""
+   "-I$srcdir/$subdir -defsym __property_bti__=1"
    {bti-plt-so.s} {} "libbti-plt-so.so"}
 }
 
diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-so.s b/ld/testsuite/ld-aarch64/protections/bti-plt-so.s
index 2c11356dba8..45d827023f4 100644
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-so.s
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-so.s
@@ -24,18 +24,5 @@ bar:
 	add	sp, sp, 16
 	ret
 	.size	bar, .-bar
-	.section ".note.gnu.property", "a"
-	.p2align 3
-	.long 1f - 0f		/* name length */
-	.long 5f - 2f		/* data length */
-	.long 5			/* note type */
-0:	.asciz "GNU"		/* vendor name */
-1:
-	.p2align 3
-2:	.long 0xc0000000	/* pr_type.  */
-	.long 4f - 3f		/* pr_datasz.  */
-3:
-	.long 0x1		/* BTI.  */
-4:
-	.p2align 3
-5:
+
+.include "gnu-note-properties-selectable-merged.inc"