Fix AArch64 linker testsuite failures triggered by differences in build environments.

	PR 29843
	* testsuite/ld-aarch64/bti-plt-5.d: Relax regxps slightly to allow
	for differences in build environments.
	* testsuite/ld-aarch64/tls-relax-gdesc-le-now.d: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d81b2ec..3219e70 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-04  Andreas K. Huettel  <dilfridge@gentoo.org>
+
+       PR 29843
+       * testsuite/ld-aarch64/bti-plt-5.d: Relax regxps slightly to allow
+       for differences in build environments.
+       * testsuite/ld-aarch64/tls-relax-gdesc-le-now.d: Likewise.
+
 2023-01-03  Nick Clifton  <nickc@redhat.com>
 
        * po/uk.po: Updated Ukrainian translation.

diff --git a/ld/testsuite/ld-aarch64/bti-plt-5.d b/ld/testsuite/ld-aarch64/bti-plt-5.d
index 12abbc2..ed0029b 100644 (file)
--- a/ld/testsuite/ld-aarch64/bti-plt-5.d
+++ b/ld/testsuite/ld-aarch64/bti-plt-5.d
@@ -13,8 +13,8 @@ Disassembly of section \.plt:
 .*:    d503245f        bti     c
 .*:    a9bf7bf0        stp     x16, x30, \[sp, #-16\]!
 .*:    90000090        adrp    x16, 410000 <.*>
-.*:    f9421611        ldr     x17, \[x16, #1064\]
-.*:    9110a210        add     x16, x16, #0x428
+.*:    f9......        ldr     x17, \[x16, #....\]
+.*:    91......        add     x16, x16, #0x...
 .*:    d61f0220        br      x17
 .*:    d503201f        nop
 .*:    d503201f        nop
@@ -22,7 +22,7 @@ Disassembly of section \.plt:
 [0-9a-f]+ <.*>:
 .*:    d503245f        bti     c
 .*:    90000090        adrp    x16, 410000 <.*>
-.*:    f9421a11        ldr     x17, \[x16, #1072\]
-.*:    9110c210        add     x16, x16, #0x430
+.*:    f9......        ldr     x17, \[x16, #....\]
+.*:    91......        add     x16, x16, #0x...
 .*:    d61f0220        br      x17
 .*:    d503201f        nop

diff --git a/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d b/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d
index 8b6dcef..dcf9134 100644 (file)
--- a/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d
+++ b/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d
@@ -11,7 +11,7 @@
  0x.+ \(PLTRELSZ\) \s+.+ \(bytes\)
  0x.+ \(PLTREL\)   \s+RELA
  0x.+ \(JMPREL\)   \s+0x.+
- 0x.+ \(BIND_NOW\) \s+
+ 0x.+ (\(BIND_NOW\) \s+|\(FLAGS\)  \s+   BIND_NOW)
  0x.+ \(FLAGS_1\)  \s+   Flags: NOW
  0x.+ \(NULL\)     \s+   0x0