summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2019-10-07 13:14:11 +1030
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2020-01-17 16:33:51 +0000
commit43f209c984f8c310aa2564879e77aca8c960951b (patch)
tree1c7bc7d6bf3274d38fcb0cf4b2c2105d5326f225
parent1c71e324d8d5a8487d439993d2ff0c57eabc03f5 (diff)
downloadbinutils-gdb-43f209c984f8c310aa2564879e77aca8c960951b.tar.gz
ld-arm/tls-gdesc-neg test
Fixes a failure on armeb-linuxeabi. Backport from master. 2019-10-07 Alan Modra <amodra@gmail.com> * testsuite/ld-arm/tls-gdesc-neg.d: Relax target match.
-rw-r--r--ld/ChangeLog7
-rw-r--r--ld/testsuite/ld-arm/tls-gdesc-neg.d2
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]+