From 62cf91a31e4086abbee7bae5cb1b6d9f5133aaad Mon Sep 17 00:00:00 2001 From: Will Newton Date: Thu, 23 Oct 2014 18:20:27 +0100 Subject: [PATCH] ld/testsuite/ld-unique: Fix running unique tests on ARM The @ character is a comment character on ARM, so use % instead. Also use a wider glob for matching ARM targets to make sure the test gets run. ld/testsuite/ChangeLog: 2014-10-30 Will Newton * 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. --- ld/testsuite/ChangeLog | 7 +++++++ ld/testsuite/ld-unique/unique.exp | 2 +- ld/testsuite/ld-unique/unique.s | 2 +- ld/testsuite/ld-unique/unique_shared.s | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index d0ab7f5..54afd1c 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-10-30 Will Newton + + * 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. + 2014-10-24 Tejas Belagod * ld-aarch64/aarch64-elf.exp (aarch64elftests): Drive erratum diff --git a/ld/testsuite/ld-unique/unique.exp b/ld/testsuite/ld-unique/unique.exp index a93f9b2..994ed87 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 9b0593c..7477a69 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 b18a5b1..8022291 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 -- 2.7.4