diff options
| author | Roland McGrath <mcgrathr@google.com> | 2018-07-24 16:31:14 -0700 |
|---|---|---|
| committer | Roland McGrath <mcgrathr@google.com> | 2018-07-24 16:32:10 -0700 |
| commit | c720dd3764bfdce699782352d25541309b072b53 (patch) | |
| tree | bba324e0e4b5c3b356ecbc9890eb3d6088a03b42 | |
| parent | 29153520a85046471f8e75453c10a93c8ad535a4 (diff) | |
| download | binutils-gdb-users/roland/2.31/aarch64-elf-ld-check-regressions.tar.gz | |
Fix spurious check-ld failures on aarch64-elfusers/roland/2.31/aarch64-elf-ld-check-regressions
ld/
* testsuite/ld-aarch64/ifunc-1-local.d: Adjust regexps to match
the offsets emitted by aarch64-elf configurations.
* 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.
(cherry picked from commit e87de5c93dfcdbffed70896f62a3c2b6b30fd214)
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/ifunc-1-local.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/ifunc-1.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/ifunc-2-local.d | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/ifunc-2.d | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/ifunc-21.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/ifunc-3a.d | 4 |
7 files changed, 24 insertions, 14 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index cfadbd43a1c..16a74af7295 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +2018-07-24 Roland McGrath <mcgrathr@google.com> + + * testsuite/ld-aarch64/ifunc-1-local.d: Adjust regexps to match + the offsets emitted by aarch64-elf configurations. + * 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. + 2018-07-23 H.J. Lu <hongjiu.lu@intel.com> PR ld/23428 diff --git a/ld/testsuite/ld-aarch64/ifunc-1-local.d b/ld/testsuite/ld-aarch64/ifunc-1-local.d index bcba0aa0255..17836378654 100644 --- a/ld/testsuite/ld-aarch64/ifunc-1-local.d +++ b/ld/testsuite/ld-aarch64/ifunc-1-local.d @@ -3,7 +3,7 @@ #target: aarch64*-*-* #... -0+(110|180) <__GI_foo>: +0+(110|180|1a0) <(__GI_)?foo>: #... -[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+(0x110|0x180)@plt> +[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+(0x110|0x180|0x1a0)@plt> #pass diff --git a/ld/testsuite/ld-aarch64/ifunc-1.d b/ld/testsuite/ld-aarch64/ifunc-1.d index f408bfff787..0274ac0094e 100644 --- a/ld/testsuite/ld-aarch64/ifunc-1.d +++ b/ld/testsuite/ld-aarch64/ifunc-1.d @@ -3,7 +3,7 @@ #target: aarch64*-*-* #... -0+(130|1a0) <foo>: +0+(130|1a0|1c8) <foo>: #... -[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0)@plt> +[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8)@plt> #pass diff --git a/ld/testsuite/ld-aarch64/ifunc-2-local.d b/ld/testsuite/ld-aarch64/ifunc-2-local.d index fb1bb40e386..a3d9e15f8b6 100644 --- a/ld/testsuite/ld-aarch64/ifunc-2-local.d +++ b/ld/testsuite/ld-aarch64/ifunc-2-local.d @@ -3,9 +3,9 @@ #target: aarch64*-*-* #... -0+(110|180) <__GI_foo>: +0+(110|180|1a0) <__GI_foo>: #... -[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(110|180)@plt> +[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(110|180|1a0)@plt> [ \t0-9a-f]+:[ \t0-9a-f]+adrp[ \t]+x0, 0 <.*> -[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(100|170) +[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(100|170|190) #pass diff --git a/ld/testsuite/ld-aarch64/ifunc-2.d b/ld/testsuite/ld-aarch64/ifunc-2.d index 16c75ead407..eb6fa0ccf0b 100644 --- a/ld/testsuite/ld-aarch64/ifunc-2.d +++ b/ld/testsuite/ld-aarch64/ifunc-2.d @@ -3,9 +3,9 @@ #target: aarch64*-*-* #... -0+(130|1a0) <foo>: +0+(130|1a0|1c8) <foo>: #... -[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0)@plt> +[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8)@plt> [ \t0-9a-f]+:[ \t0-9a-f]+adrp[ \t]+x0, 0 <.*> -[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(120|190) +[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(120|190|1b8) #pass diff --git a/ld/testsuite/ld-aarch64/ifunc-21.d b/ld/testsuite/ld-aarch64/ifunc-21.d index b501bd6712b..a16186b587e 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 0+ 0+ [0-9a-f]+ [0-9a-f]+ .* + (10298|102b8) 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\] + .*: .* ldr x0, \[x0, #(672|704)\] .*: d65f03c0 ret #pass diff --git a/ld/testsuite/ld-aarch64/ifunc-3a.d b/ld/testsuite/ld-aarch64/ifunc-3a.d index a01a75c904f..4919d968928 100644 --- a/ld/testsuite/ld-aarch64/ifunc-3a.d +++ b/ld/testsuite/ld-aarch64/ifunc-3a.d @@ -4,7 +4,7 @@ #target: aarch64*-*-* #... -0+(150|1d0) <__GI_foo>: +0+(150|1d0|1e8) <__GI_foo>: #... -[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(150|1d0)@plt> +[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(150|1d0|1e8)@plt> #pass |