diff options
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-arm/tls-gdesc-neg.d | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 3d474a866bb..7a1ccf29a4f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2020-01-17 Szabolcs Nagy <szabolcs.nagy@arm.com> + + Backport from master. + 2019-10-07 Alan Modra <amodra@gmail.com> + + * testsuite/ld-arm/tls-gdesc-neg.d: Relax target match. + 2020-01-15 Tamar Christina <tamar.christina@arm.com> Backport from master. diff --git a/ld/testsuite/ld-arm/tls-gdesc-neg.d b/ld/testsuite/ld-arm/tls-gdesc-neg.d index 4bbd0124e75..f4debb15c2c 100644 --- a/ld/testsuite/ld-arm/tls-gdesc-neg.d +++ b/ld/testsuite/ld-arm/tls-gdesc-neg.d @@ -1,5 +1,5 @@ -tmpdir/tls-lib2-neg.so: file format elf32-littlearm +.*: file format .* architecture: armv.*, flags 0x[0-9a-f]+: HAS_SYMS, DYNAMIC, D_PAGED start address 0x[0-9a-f]+ |