summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiong Wang <jiong.wang@arm.com>2016-02-26 16:48:03 +0000
committerJiong Wang <jiong.wang@arm.com>2016-02-26 16:53:00 +0000
commit79bf9766e9c7c18343d1e007e21e3f7e222ccf4d (patch)
tree9954c1769bdc9c6a7c4976edfbc6d6f4d09851d7
parentaae60b2c1f276263ad100952e3c3364c7baa6a2b (diff)
downloadbinutils-gdb-79bf9766e9c7c18343d1e007e21e3f7e222ccf4d.tar.gz
[Testsuite] Fix running unique tests on ARM
Backport from master: 2014-10-30 Will Newton <will.newton@linaro.org> ld/testsuite/ChangeLog: * ld-unique/unique.exp: Use a wider glob for matching ARM targets. * ld-unique/unique.s: Use % instead of @ in .type directive. * ld-unique/unique_shared.s: Likewise.
-rw-r--r--ld/testsuite/ChangeLog10
-rw-r--r--ld/testsuite/ld-unique/unique.exp2
-rw-r--r--ld/testsuite/ld-unique/unique.s2
-rw-r--r--ld/testsuite/ld-unique/unique_shared.s2
4 files changed, 13 insertions, 3 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d72edb6d8c5..6fe26fb3655 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2016-02-26 Jiong Wang <jiong.wang@arm.com>
+
+ Backport from master:
+ 2014-10-30 Will Newton <will.newton@linaro.org>
+
+ * ld-unique/unique.exp: Use a wider glob for matching ARM
+ targets.
+ * ld-unique/unique.s: Use % instead of @ in .type directive.
+ * ld-unique/unique_shared.s: Likewise.
+
2015-07-10 Alan Modra <amodra@gmail.com>
Apply from master
diff --git a/ld/testsuite/ld-unique/unique.exp b/ld/testsuite/ld-unique/unique.exp
index a93f9b2eae9..994ed87cf76 100644
--- a/ld/testsuite/ld-unique/unique.exp
+++ b/ld/testsuite/ld-unique/unique.exp
@@ -28,7 +28,7 @@
# arm, powerpc, and sparc so far.
if {!(([istarget "i?86-*-*"]
|| [istarget "x86_64-*-*"]
- || [istarget "arm-*-*"]
+ || [istarget "arm*-*-*"]
|| [istarget "powerpc*-*-*"]
|| [istarget "sparc*-*-*"])
&& ([istarget "*-*-elf*"]
diff --git a/ld/testsuite/ld-unique/unique.s b/ld/testsuite/ld-unique/unique.s
index 9b0593c2c2c..7477a694a23 100644
--- a/ld/testsuite/ld-unique/unique.s
+++ b/ld/testsuite/ld-unique/unique.s
@@ -1,4 +1,4 @@
- .type a, @gnu_unique_object
+ .type a, %gnu_unique_object
a: .long 0
.size a, .-a
diff --git a/ld/testsuite/ld-unique/unique_shared.s b/ld/testsuite/ld-unique/unique_shared.s
index b18a5b1b841..80222915973 100644
--- a/ld/testsuite/ld-unique/unique_shared.s
+++ b/ld/testsuite/ld-unique/unique_shared.s
@@ -1,3 +1,3 @@
- .type b, @gnu_unique_object
+ .type b, %gnu_unique_object
b: .long 0
.size b, .-b