[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.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d72edb6d8c54c43b6a24bf150e7d89f31e585010..6fe26fb36553bc53d7db6c74b4c219227d1ea765 100644 (file)
--- 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 a93f9b2eae90a5d22f6765cfa857e85691df114e..994ed87cf76ac895dda8232b9d3e352742b05175 100644 (file)
--- 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 9b0593c2c2c9233176a12e7967df4e6bff9347c1..7477a694a235b8901936cb91d40852b1843e41b6 100644 (file)
--- 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 b18a5b1b841fc1eb38e3bb8e6ea800f9e362ba8e..80222915973d3d6a7a91e6ee405ea6588b4ffbbb 100644 (file)
--- 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