diff --git a/ld/testsuite/ld-aarch64/ifunc-1-local.d b/ld/testsuite/ld-aarch64/ifunc-1-local.d
index 0cce7f6..09f692b 100644
--- a/ld/testsuite/ld-aarch64/ifunc-1-local.d
+++ b/ld/testsuite/ld-aarch64/ifunc-1-local.d
@@ -1,6 +1,6 @@
 #ld: -shared
 #objdump: -dw
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x2a0@plt>
diff --git a/ld/testsuite/ld-aarch64/ifunc-1.d b/ld/testsuite/ld-aarch64/ifunc-1.d
index 8a17cd7..133d03a 100644
--- a/ld/testsuite/ld-aarch64/ifunc-1.d
+++ b/ld/testsuite/ld-aarch64/ifunc-1.d
@@ -1,6 +1,6 @@
 #ld: -shared
 #objdump: -dw
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x2c0@plt>
diff --git a/ld/testsuite/ld-aarch64/ifunc-10.d b/ld/testsuite/ld-aarch64/ifunc-10.d
index 6931c7f..782b078 100644
--- a/ld/testsuite/ld-aarch64/ifunc-10.d
+++ b/ld/testsuite/ld-aarch64/ifunc-10.d
@@ -1,5 +1,5 @@
 #ld: -e bar --gc-sections
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 There are no relocations in this file.
diff --git a/ld/testsuite/ld-aarch64/ifunc-11.d b/ld/testsuite/ld-aarch64/ifunc-11.d
index 6931c7f..782b078 100644
--- a/ld/testsuite/ld-aarch64/ifunc-11.d
+++ b/ld/testsuite/ld-aarch64/ifunc-11.d
@@ -1,5 +1,5 @@
 #ld: -e bar --gc-sections
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 There are no relocations in this file.
diff --git a/ld/testsuite/ld-aarch64/ifunc-12.d b/ld/testsuite/ld-aarch64/ifunc-12.d
index 55fe925..8fa8ce0 100644
--- a/ld/testsuite/ld-aarch64/ifunc-12.d
+++ b/ld/testsuite/ld-aarch64/ifunc-12.d
@@ -1,5 +1,5 @@
 #ld: -shared -e bar --gc-sections
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 There are no relocations in this file.
diff --git a/ld/testsuite/ld-aarch64/ifunc-13.d b/ld/testsuite/ld-aarch64/ifunc-13.d
index 191d839..e1b5c10 100644
--- a/ld/testsuite/ld-aarch64/ifunc-13.d
+++ b/ld/testsuite/ld-aarch64/ifunc-13.d
@@ -2,7 +2,7 @@
 #source: ifunc-13b.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.ifunc' at offset 0x[0-9a-f]+ contains 1 entries:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-14a.d b/ld/testsuite/ld-aarch64/ifunc-14a.d
index 174d20f..ff580d0 100644
--- a/ld/testsuite/ld-aarch64/ifunc-14a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-14a.d
@@ -2,7 +2,7 @@
 #source: ifunc-14b.s
 #ld: -shared -z nocombreloc
 #readelf: -d
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #failif
 #...
diff --git a/ld/testsuite/ld-aarch64/ifunc-14b.d b/ld/testsuite/ld-aarch64/ifunc-14b.d
index 509a3a2..52ed2b4 100644
--- a/ld/testsuite/ld-aarch64/ifunc-14b.d
+++ b/ld/testsuite/ld-aarch64/ifunc-14b.d
@@ -2,7 +2,7 @@
 #source: ifunc-14a.s
 #ld: -shared -z nocombreloc
 #readelf: -d
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #failif
 #...
diff --git a/ld/testsuite/ld-aarch64/ifunc-14c.d b/ld/testsuite/ld-aarch64/ifunc-14c.d
index 0b63753..a83126f 100644
--- a/ld/testsuite/ld-aarch64/ifunc-14c.d
+++ b/ld/testsuite/ld-aarch64/ifunc-14c.d
@@ -2,7 +2,7 @@
 #source: ifunc-14b.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #failif
 #...
diff --git a/ld/testsuite/ld-aarch64/ifunc-14d.d b/ld/testsuite/ld-aarch64/ifunc-14d.d
index fd08f03..4ae88d2 100644
--- a/ld/testsuite/ld-aarch64/ifunc-14d.d
+++ b/ld/testsuite/ld-aarch64/ifunc-14d.d
@@ -2,7 +2,7 @@
 #source: ifunc-14a.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #failif
 #...
diff --git a/ld/testsuite/ld-aarch64/ifunc-14e.d b/ld/testsuite/ld-aarch64/ifunc-14e.d
index 37c470b..62de35e 100644
--- a/ld/testsuite/ld-aarch64/ifunc-14e.d
+++ b/ld/testsuite/ld-aarch64/ifunc-14e.d
@@ -3,7 +3,7 @@
 #source: ifunc-14b.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #failif
 #...
diff --git a/ld/testsuite/ld-aarch64/ifunc-14f.d b/ld/testsuite/ld-aarch64/ifunc-14f.d
index 3fad96f..ab8bdbf 100644
--- a/ld/testsuite/ld-aarch64/ifunc-14f.d
+++ b/ld/testsuite/ld-aarch64/ifunc-14f.d
@@ -3,7 +3,7 @@
 #source: ifunc-14c.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #failif
 #...
diff --git a/ld/testsuite/ld-aarch64/ifunc-15.d b/ld/testsuite/ld-aarch64/ifunc-15.d
index 79a9a77..51d9242 100644
--- a/ld/testsuite/ld-aarch64/ifunc-15.d
+++ b/ld/testsuite/ld-aarch64/ifunc-15.d
@@ -1,7 +1,7 @@
 #source: ifunc-15.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.got' at offset 0x[0-9a-f]+ contains 1 entries:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-16.d b/ld/testsuite/ld-aarch64/ifunc-16.d
index 1336257..31ec162 100644
--- a/ld/testsuite/ld-aarch64/ifunc-16.d
+++ b/ld/testsuite/ld-aarch64/ifunc-16.d
@@ -1,7 +1,7 @@
 #source: ifunc-16.s
 #ld: -shared
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-17a.d b/ld/testsuite/ld-aarch64/ifunc-17a.d
index b414be3..a87de7c 100644
--- a/ld/testsuite/ld-aarch64/ifunc-17a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-17a.d
@@ -2,7 +2,7 @@
 #source: ifunc-17b.s
 #ld: -static
 #readelf: -s --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
  +[0-9]+: +[0-9a-f]+ +4 +OBJECT +GLOBAL +DEFAULT +[1-9] foo
diff --git a/ld/testsuite/ld-aarch64/ifunc-17b.d b/ld/testsuite/ld-aarch64/ifunc-17b.d
index 1566bcb..9286a9f 100644
--- a/ld/testsuite/ld-aarch64/ifunc-17b.d
+++ b/ld/testsuite/ld-aarch64/ifunc-17b.d
@@ -2,7 +2,7 @@
 #source: ifunc-17a.s
 #ld: -static
 #readelf: -s --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
  +[0-9]+: +[0-9a-f]+ +4 +OBJECT +GLOBAL +DEFAULT +[1-9] foo
diff --git a/ld/testsuite/ld-aarch64/ifunc-18a.d b/ld/testsuite/ld-aarch64/ifunc-18a.d
index 682e7a3..3db91d3 100644
--- a/ld/testsuite/ld-aarch64/ifunc-18a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-18a.d
@@ -2,7 +2,7 @@
 #source: ifunc-18b.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-18b.d b/ld/testsuite/ld-aarch64/ifunc-18b.d
index 40b39e1..b27f526 100644
--- a/ld/testsuite/ld-aarch64/ifunc-18b.d
+++ b/ld/testsuite/ld-aarch64/ifunc-18b.d
@@ -2,7 +2,7 @@
 #source: ifunc-18a.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-19a.d b/ld/testsuite/ld-aarch64/ifunc-19a.d
index 9f083c9..dd82b24 100644
--- a/ld/testsuite/ld-aarch64/ifunc-19a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-19a.d
@@ -2,7 +2,7 @@
 #source: ifunc-19b.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-19b.d b/ld/testsuite/ld-aarch64/ifunc-19b.d
index dea5b16..1e0819c 100644
--- a/ld/testsuite/ld-aarch64/ifunc-19b.d
+++ b/ld/testsuite/ld-aarch64/ifunc-19b.d
@@ -2,7 +2,7 @@
 #source: ifunc-19a.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-2-local.d b/ld/testsuite/ld-aarch64/ifunc-2-local.d
index 07616ca..54ffa3a 100644
--- a/ld/testsuite/ld-aarch64/ifunc-2-local.d
+++ b/ld/testsuite/ld-aarch64/ifunc-2-local.d
@@ -1,6 +1,6 @@
 #ld: -shared
 #objdump: -dw
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x2c0@plt>
diff --git a/ld/testsuite/ld-aarch64/ifunc-2.d b/ld/testsuite/ld-aarch64/ifunc-2.d
index 07616ca..54ffa3a 100644
--- a/ld/testsuite/ld-aarch64/ifunc-2.d
+++ b/ld/testsuite/ld-aarch64/ifunc-2.d
@@ -1,6 +1,6 @@
 #ld: -shared
 #objdump: -dw
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x2c0@plt>
diff --git a/ld/testsuite/ld-aarch64/ifunc-20.d b/ld/testsuite/ld-aarch64/ifunc-20.d
index cee34bf..3380479 100644
--- a/ld/testsuite/ld-aarch64/ifunc-20.d
+++ b/ld/testsuite/ld-aarch64/ifunc-20.d
@@ -1,7 +1,7 @@
 #source: ifunc-20.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.ifunc' at offset 0x[0-9a-f]+ contains 1 entries:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-3a.d b/ld/testsuite/ld-aarch64/ifunc-3a.d
index 1335480..9f27cff 100644
--- a/ld/testsuite/ld-aarch64/ifunc-3a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-3a.d
@@ -1,7 +1,7 @@
 #source: ifunc-3.s
 #ld: -shared
 #objdump: -dw
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x2e0@plt>
diff --git a/ld/testsuite/ld-aarch64/ifunc-3b.d b/ld/testsuite/ld-aarch64/ifunc-3b.d
index d90ed5c..7e177a6 100644
--- a/ld/testsuite/ld-aarch64/ifunc-3b.d
+++ b/ld/testsuite/ld-aarch64/ifunc-3b.d
@@ -1,7 +1,7 @@
 #source: ifunc-3.s
 #ld: -shared
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
 [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_[_0-9A-Z]+_IRELATIVE[ ]*[0-9a-f]*
diff --git a/ld/testsuite/ld-aarch64/ifunc-4.d b/ld/testsuite/ld-aarch64/ifunc-4.d
index 9a3e308..5e69b05 100644
--- a/ld/testsuite/ld-aarch64/ifunc-4.d
+++ b/ld/testsuite/ld-aarch64/ifunc-4.d
@@ -1,6 +1,6 @@
 #ld:
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 #...
 [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_[_0-9A-Z]+_IRELATIVE[ ]*[0-9a-f]*
diff --git a/ld/testsuite/ld-aarch64/ifunc-4a.d b/ld/testsuite/ld-aarch64/ifunc-4a.d
index 3329782..801e6cd 100644
--- a/ld/testsuite/ld-aarch64/ifunc-4a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-4a.d
@@ -1,6 +1,6 @@
 #ld: -s
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*
 #source: ifunc-4.s

 #...
diff --git a/ld/testsuite/ld-aarch64/ifunc-5a-local.d b/ld/testsuite/ld-aarch64/ifunc-5a-local.d
index 8bc6862..9693585 100644
--- a/ld/testsuite/ld-aarch64/ifunc-5a-local.d
+++ b/ld/testsuite/ld-aarch64/ifunc-5a-local.d
@@ -1,7 +1,7 @@
 #source: ifunc-5-local.s
 #ld:
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-5a.d b/ld/testsuite/ld-aarch64/ifunc-5a.d
index 781db3c..f0ee59f 100644
--- a/ld/testsuite/ld-aarch64/ifunc-5a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-5a.d
@@ -1,7 +1,7 @@
 #source: ifunc-5.s
 #ld:
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-5b-local.d b/ld/testsuite/ld-aarch64/ifunc-5b-local.d
index b0d6dda..e8e620c 100644
--- a/ld/testsuite/ld-aarch64/ifunc-5b-local.d
+++ b/ld/testsuite/ld-aarch64/ifunc-5b-local.d
@@ -1,7 +1,7 @@
 #source: ifunc-5-local.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-5b.d b/ld/testsuite/ld-aarch64/ifunc-5b.d
index 82c5479..0175982 100644
--- a/ld/testsuite/ld-aarch64/ifunc-5b.d
+++ b/ld/testsuite/ld-aarch64/ifunc-5b.d
@@ -1,7 +1,7 @@
 #source: ifunc-5.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.got' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-5r-local.d b/ld/testsuite/ld-aarch64/ifunc-5r-local.d
index 1c87ec1..463cd25 100644
--- a/ld/testsuite/ld-aarch64/ifunc-5r-local.d
+++ b/ld/testsuite/ld-aarch64/ifunc-5r-local.d
@@ -1,7 +1,7 @@
 #source: ifunc-5-local.s
 #ld: -r
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.text' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-6a.d b/ld/testsuite/ld-aarch64/ifunc-6a.d
index 06b9042..a50ad3a 100644
--- a/ld/testsuite/ld-aarch64/ifunc-6a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-6a.d
@@ -1,7 +1,7 @@
 #source: ifunc-6.s
 #ld:
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-6b.d b/ld/testsuite/ld-aarch64/ifunc-6b.d
index 8f06cd1..c415bc3 100644
--- a/ld/testsuite/ld-aarch64/ifunc-6b.d
+++ b/ld/testsuite/ld-aarch64/ifunc-6b.d
@@ -1,7 +1,7 @@
 #source: ifunc-6.s
 #ld: -shared -z nocombreloc
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.got' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-7a.d b/ld/testsuite/ld-aarch64/ifunc-7a.d
index e462f90..c246c99 100644
--- a/ld/testsuite/ld-aarch64/ifunc-7a.d
+++ b/ld/testsuite/ld-aarch64/ifunc-7a.d
@@ -1,7 +1,7 @@
 #source: ifunc-7.s
 #ld:
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-7b.d b/ld/testsuite/ld-aarch64/ifunc-7b.d
index 3f6060c..efdd379 100644
--- a/ld/testsuite/ld-aarch64/ifunc-7b.d
+++ b/ld/testsuite/ld-aarch64/ifunc-7b.d
@@ -1,7 +1,7 @@
 #source: ifunc-7.s
 #ld: -shared
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-8.d b/ld/testsuite/ld-aarch64/ifunc-8.d
index 97201bf..8aadc51 100644
--- a/ld/testsuite/ld-aarch64/ifunc-8.d
+++ b/ld/testsuite/ld-aarch64/ifunc-8.d
@@ -2,7 +2,7 @@
 #source: ifunc-8b.s
 #ld:
 #readelf: -r --wide
-#target: aarch64-*-*
+#target: aarch64*-*-*

 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-aarch64/ifunc-9.d b/ld/testsuite/ld-aarch64/ifunc-9.d
index 85f5e61..3b4e995 100644
--- a/ld/testsuite/ld-aarch64/ifunc-9.d
+++ b/ld/testsuite/ld-aarch64/ifunc-9.d
@@ -1,3 +1,3 @@
 #ld: --export-dynamic
 #error: .*dynamic STT_GNU_IFUNC symbol `foo' with pointer equality in `.*.o' can not be used when making an executable; recompile with -fPIE and relink with -pie
-#target: aarch64-*-*
+#target: aarch64*-*-*
diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp
index a4cc06d..1d64efc 100644
--- a/ld/testsuite/ld-ifunc/ifunc.exp
+++ b/ld/testsuite/ld-ifunc/ifunc.exp
@@ -28,7 +28,7 @@
 if {!(([istarget "i?86-*-*"]
        || [istarget "x86_64-*-*"]
        || [istarget "powerpc*-*-*"]
-       || [istarget "aarch64-*-*"]
+       || [istarget "aarch64*-*-*"]
        || [istarget "sparc*-*-*"])
       && ([istarget "*-*-elf*"]
 	  || [istarget "*-*-nacl*"]
