1 files changed, 7 insertions, 6 deletions
diff --git a/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp
index 4a424bd271..511e07451b 100644
--- a/gas/testsuite/gas/macros/macros.exp
+++ b/gas/testsuite/gas/macros/macros.exp
@@ -28,12 +28,13 @@ case $target_triplet in {
 
 if { ![istarget hppa*-*-*] || [istarget *-*-linux*]} {
     # FIXME: Due to macro mishandling of ONLY_STANDARD_ESCAPES.
-    setup_xfail cris-*-*
-    setup_xfail powerpc-*-aix*
-    setup_xfail sh*-*-*
-    setup_xfail z8k*-*-*
-    setup_xfail h8300*-*-*
+    setup_xfail "avr-*" "cris-*"
+
+    # These fail due to NO_STRING_ESCAPES
+    setup_xfail "powerpc*-*-aix*" "powerpc*-*-beos*" "powerpc*-*-macos*"
+    setup_xfail "powerpc*-*-mpw*" "powerpc*-*-pe" "powerpc*-*-*win*"
+
     # FIXME: Due to difference in what "consecutive octets" means.
-    setup_xfail *c54x*-*-*
+    setup_xfail "*c54x*-*"
     run_dump_test strings
 }