From 4bb646c3990a837326df606a836741ea9a294caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= <chigot@adacore.com>
Date: Mon, 31 Oct 2022 15:36:36 +0100
Subject: ld/testsuite: adjust ld-aarch64 tests for aarch64nto address

Some tests are refering to the address of their symbols. These are
dependent of the emulation and must be adjusted when enabling them for a
new one.

ld/ChangeLog:

        * testsuite/ld-aarch64/ifunc-1-local.d: Adjust for aarch64nto
        addresses.
        * testsuite/ld-aarch64/ifunc-1.d: Likewise.
        * testsuite/ld-aarch64/ifunc-2-local.d: Likewise.
        * testsuite/ld-aarch64/ifunc-2.d: Likewise.
        * testsuite/ld-aarch64/ifunc-21.d: Likewise.
        * testsuite/ld-aarch64/ifunc-3a.d: Likewise.
---
 ld/testsuite/ld-aarch64/ifunc-1-local.d | 4 ++--
 ld/testsuite/ld-aarch64/ifunc-1.d       | 4 ++--
 ld/testsuite/ld-aarch64/ifunc-2-local.d | 6 +++---
 ld/testsuite/ld-aarch64/ifunc-2.d       | 6 +++---
 ld/testsuite/ld-aarch64/ifunc-21.d      | 4 ++--
 ld/testsuite/ld-aarch64/ifunc-3a.d      | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ld/testsuite/ld-aarch64/ifunc-1-local.d b/ld/testsuite/ld-aarch64/ifunc-1-local.d
index ebd798b..89a3b78 100644
--- a/ld/testsuite/ld-aarch64/ifunc-1-local.d
+++ b/ld/testsuite/ld-aarch64/ifunc-1-local.d
@@ -3,7 +3,7 @@
 #objdump: -dw
 
 #...
-0+(110|180|1a0) <((__GI_)?foo|_btext)>:
+0+(110|180|1a0|240) <((__GI_)?foo|_btext)>:
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+(0x110|0x180|0x1a0)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+(0x110|0x180|0x1a0|0x240)@plt>
 #pass
diff --git a/ld/testsuite/ld-aarch64/ifunc-1.d b/ld/testsuite/ld-aarch64/ifunc-1.d
index 0f7a3fa..57c5935 100644
--- a/ld/testsuite/ld-aarch64/ifunc-1.d
+++ b/ld/testsuite/ld-aarch64/ifunc-1.d
@@ -3,7 +3,7 @@
 #objdump: -dw
 
 #...
-0+(130|1a0|1c8) <foo>:
+0+(130|1a0|1c8|1d0) <foo>:
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8|1d0)@plt>
 #pass
diff --git a/ld/testsuite/ld-aarch64/ifunc-2-local.d b/ld/testsuite/ld-aarch64/ifunc-2-local.d
index cb130a6..968039f 100644
--- a/ld/testsuite/ld-aarch64/ifunc-2-local.d
+++ b/ld/testsuite/ld-aarch64/ifunc-2-local.d
@@ -3,9 +3,9 @@
 #objdump: -dw
 
 #...
-0+(110|180|1a0) <(__GI_foo|_btext)>:
+0+(110|180|1a0|240) <(__GI_foo|_btext)>:
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(110|180|1a0)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(110|180|1a0|240)@plt>
 [ \t0-9a-f]+:[ \t0-9a-f]+adrp[ \t]+x0, 0 <.*>
-[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(100|170|190)
+[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(100|170|190|230)
 #pass
diff --git a/ld/testsuite/ld-aarch64/ifunc-2.d b/ld/testsuite/ld-aarch64/ifunc-2.d
index ed8d47d..463facb 100644
--- a/ld/testsuite/ld-aarch64/ifunc-2.d
+++ b/ld/testsuite/ld-aarch64/ifunc-2.d
@@ -3,9 +3,9 @@
 #objdump: -dw
 
 #...
-0+(130|1a0|1c8) <foo>:
+0+(130|1a0|1c8|1d0) <foo>:
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8|1d0)@plt>
 [ \t0-9a-f]+:[ \t0-9a-f]+adrp[ \t]+x0, 0 <.*>
-[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(120|190|1b8)
+[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(120|190|1b8|1c0)
 #pass
diff --git a/ld/testsuite/ld-aarch64/ifunc-21.d b/ld/testsuite/ld-aarch64/ifunc-21.d
index ff4a82a..62203aa 100644
--- a/ld/testsuite/ld-aarch64/ifunc-21.d
+++ b/ld/testsuite/ld-aarch64/ifunc-21.d
@@ -11,7 +11,7 @@ Contents of section .text:
  [0-9a-f]+ .*
 Contents of section .got.plt:
  [0-9a-f]+ 0+ 0+ 0+ 0+  .*
- (10298|102b8) 0+ 0+ [0-9a-f]+ [0-9a-f]+  .*
+ (10298|102b8|10358) 0+ 0+ [0-9a-f]+ [0-9a-f]+  .*
 
 Disassembly of section .text:
 
@@ -20,7 +20,7 @@ Disassembly of section .text:
 
 .* <bar>:
  .*:	90000080 	adrp	x0, 10000 <.*>
- .*:	.* 	ldr	x0, \[x0, #(672|704)\]
+ .*:	.* 	ldr	x0, \[x0, #(672|704|864)\]
  .*:	d65f03c0 	ret
 
 #pass
diff --git a/ld/testsuite/ld-aarch64/ifunc-3a.d b/ld/testsuite/ld-aarch64/ifunc-3a.d
index 7cb854d..ba02dbd 100644
--- a/ld/testsuite/ld-aarch64/ifunc-3a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-3a.d
@@ -4,7 +4,7 @@
 #objdump: -dw
 
 #...
-0+(150|1d0|1e8) <(__GI_foo|_btext)>:
+0+(150|1d0|1e8|1f0) <(__GI_foo|_btext)>:
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(150|1d0|1e8)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(150|1d0|1e8|1f0)@plt>
 #pass
-- 
cgit v1.1