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 233384da5231eecc4ba9b8921b74d45ebfd28e0c..471afa13a63f5d881b7390cf1c32feb5e7df3a4d 100644 (file)
--- 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 2c11356dba80cc0a0717a515a6aedf6887a094fa..45d827023f4ae903a54ea184d27489d4157ee8b5 100644 (file)
--- 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"