ld: aarch64: Use lp64 abi in recent BTI stub tests

The tests are not compatible with ilp32 abi: the GNU property
note is ABI dependent (size changes) and the disasm is ABI
dependent too.  Making the test portable between the ABIs is
not trivial.

For now force lp64 abi.

diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index fa5ac3a2cdd8b4cc8a5549fa16e45c4a6bbdec4a..37e3b82af5739ac79ef9f173088343224b988052 100644 (file)
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -463,10 +463,10 @@ run_dump_test "bti-warn"
 run_dump_test "weak-tls"
 run_dump_test "undef-tls"
 
-run_dump_test "bti-far-1"
-run_dump_test "bti-far-2"
-run_dump_test "bti-far-opt"
-run_dump_test "bti-far-3"
+run_dump_test_lp64 "bti-far-1"
+run_dump_test_lp64 "bti-far-2"
+run_dump_test_lp64 "bti-far-opt"
+run_dump_test_lp64 "bti-far-3"
 
 if { ![skip_sframe_tests] } {
   run_dump_test "sframe-simple-1"

diff --git a/ld/testsuite/ld-aarch64/bti-far-1.d b/ld/testsuite/ld-aarch64/bti-far-1.d
index d2dbc9db11075d2895e46fc13df8263485a244b9..3ca3f1654bd84c005d4bab57eefcc2fb67d56125 100644 (file)
--- a/ld/testsuite/ld-aarch64/bti-far-1.d
+++ b/ld/testsuite/ld-aarch64/bti-far-1.d
@@ -1,7 +1,6 @@
 #name: Check linker stubs with indirect calls handle BTI (shared lib).
 #source: bti-far.s
 #target: [check_shared_lib_support]
-#as: -mabi=lp64
 #ld: -shared -T bti-far.ld
 #objdump: -dr
 

diff --git a/ld/testsuite/ld-aarch64/bti-far-2.d b/ld/testsuite/ld-aarch64/bti-far-2.d
index b859e6ce3998867da8b7c2d1dc5d10149db69c28..ec26e368900c09e0d13c49b5b3783c6afa2ef7ec 100644 (file)
--- a/ld/testsuite/ld-aarch64/bti-far-2.d
+++ b/ld/testsuite/ld-aarch64/bti-far-2.d
@@ -1,6 +1,5 @@
 #name: Check linker stubs with indirect calls handle BTI (exe).
 #source: bti-far.s
-#as: -mabi=lp64
 #ld: -T bti-far.ld
 #objdump: -dr
 

diff --git a/ld/testsuite/ld-aarch64/bti-far-3.d b/ld/testsuite/ld-aarch64/bti-far-3.d
index 1410b1389b2c6484e6c730296530af28f35bdc6a..b27d8b56548f9b191e2f45f7c0411e60e9b644cf 100644 (file)
--- a/ld/testsuite/ld-aarch64/bti-far-3.d
+++ b/ld/testsuite/ld-aarch64/bti-far-3.d
@@ -2,7 +2,6 @@
 #source: bti-far-3a.s
 #source: bti-far-3b.s
 #source: bti-far-3c.s
-#as: -mabi=lp64
 #ld: -shared -T bti-far-3.ld
 #objdump: -dr
 

diff --git a/ld/testsuite/ld-aarch64/bti-far-opt.d b/ld/testsuite/ld-aarch64/bti-far-opt.d
index ff20d0c2825ceb6e19c1dd2931c6a2a4147132db..d06532da2d2ffa6068924b80ef5651b86b9a3480 100644 (file)
--- a/ld/testsuite/ld-aarch64/bti-far-opt.d
+++ b/ld/testsuite/ld-aarch64/bti-far-opt.d
@@ -1,7 +1,6 @@
 #name: Check linker stubs with indirect calls handle BTI when target has BTI.
 #source: bti-far-opt.s
 #target: [check_shared_lib_support]
-#as: -mabi=lp64
 #ld: -shared -T bti-far.ld
 #objdump: -dr