From 01852cc865c9c53fa3ba6627c1b7abd2446f48c1 Mon Sep 17 00:00:00 2001
From: David Edelsohn <dje.gcc@gmail.com>
Date: Sun, 9 Aug 2020 14:26:44 -0400
Subject: [PATCH] testsuite: Remove unnecessary DWARF2 xfails on AIX

A number of DWARF2 testsuite xfails no longer trigger on AIX.  This patch
removes the unnecessary XFAIL decorations that cause extraneous notices
that clutter the testsuite output.

gcc/testsuite/ChangeLog:

2020-09-29  David Edelsohn  <dje.gcc@gmail.com>

	* g++.dg/debug/dwarf2/align-1.C: Remove AIX XFAIL.
	* g++.dg/debug/dwarf2/align-2.C: Same.
	* g++.dg/debug/dwarf2/align-3.C: Same.
	* g++.dg/debug/dwarf2/align-4.C: Same.
	* g++.dg/debug/dwarf2/align-5.C: Same.
	* g++.dg/debug/dwarf2/align-6.C: Same.
	* g++.dg/debug/dwarf2/defaulted-member-function-1.C: Same.
	* g++.dg/debug/dwarf2/defaulted-member-function-2.C: Same.
	* g++.dg/debug/dwarf2/defaulted-member-function-3.C: Same.
	* g++.dg/debug/dwarf2/inline-var-1.C: Same.
	* g++.dg/debug/dwarf2/inline-var-2.C: Same.
	* g++.dg/debug/dwarf2/inline-var-3.C: Same.
	* g++.dg/debug/dwarf2/noreturn-function.C: Same.
	* g++.dg/debug/dwarf2/ptrdmem-1.C: Same.
	* g++.dg/debug/dwarf2/ref-2.C: Same.
	* g++.dg/debug/dwarf2/ref-3.C: Same.
	* g++.dg/debug/dwarf2/ref-4.C: Same.
	* g++.dg/debug/dwarf2/refqual-1.C: Same.
	* g++.dg/debug/dwarf2/refqual-2.C: Same.
	* gcc.dg/debug/dwarf2/align-1.c: Same.
	* gcc.dg/debug/dwarf2/align-2.c: Same.
	* gcc.dg/debug/dwarf2/align-3.c: Same.
	* gcc.dg/debug/dwarf2/align-4.c: Same.
	* gcc.dg/debug/dwarf2/align-5.c: Same.
	* gcc.dg/debug/dwarf2/align-6.c: Same.
	* gcc.dg/debug/dwarf2/align-as-1.c: Same.
	* gcc.dg/debug/dwarf2/dwarf2-macro.c: Same.
	* gcc.dg/debug/dwarf2/dwarf2-macro2.c: Same.
	* gcc.dg/debug/dwarf2/lang-c89.c: Same.
	* gcc.dg/debug/dwarf2/noreturn-function-attribute.c: Same.
	* gcc.dg/debug/dwarf2/noreturn-function-keyword.c: Same.
	* gcc.dg/debug/dwarf2/pr71855.c: Same.
	* gcc.dg/debug/dwarf2/inline5.c: Add XFAIL on AIX.
---
 gcc/testsuite/g++.dg/debug/dwarf2/align-1.C          |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/align-2.C          |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/align-3.C          |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/align-4.C          |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/align-5.C          |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/align-6.C          |  2 +-
 .../debug/dwarf2/defaulted-member-function-1.C       |  2 +-
 .../debug/dwarf2/defaulted-member-function-2.C       |  2 +-
 .../debug/dwarf2/defaulted-member-function-3.C       |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/inline-var-1.C     | 10 +++++-----
 gcc/testsuite/g++.dg/debug/dwarf2/inline-var-2.C     |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/inline-var-3.C     | 12 ++++++------
 .../g++.dg/debug/dwarf2/noreturn-function.C          |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/ptrdmem-1.C        |  4 ++--
 gcc/testsuite/g++.dg/debug/dwarf2/ref-2.C            |  4 ++--
 gcc/testsuite/g++.dg/debug/dwarf2/ref-3.C            | 10 +++++-----
 gcc/testsuite/g++.dg/debug/dwarf2/ref-4.C            |  6 +++---
 gcc/testsuite/g++.dg/debug/dwarf2/refqual-1.C        |  4 ++--
 gcc/testsuite/g++.dg/debug/dwarf2/refqual-2.C        |  4 ++--
 gcc/testsuite/gcc.dg/debug/dwarf2/align-1.c          |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/align-2.c          |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/align-3.c          |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/align-4.c          |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/align-5.c          |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/align-6.c          |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/align-as-1.c       |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c     |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro2.c    |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/inline5.c          |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/lang-c89.c         |  2 +-
 .../debug/dwarf2/noreturn-function-attribute.c       |  2 +-
 .../gcc.dg/debug/dwarf2/noreturn-function-keyword.c  |  2 +-
 gcc/testsuite/gcc.dg/debug/dwarf2/pr71855.c          |  2 +-
 33 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/align-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/align-1.C
index fec0fec67f3..c87a998cebf 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/align-1.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/align-1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 int __attribute__((__aligned__(64))) i;
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/align-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/align-2.C
index c5b74db5791..3b0f4629e69 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/align-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/align-2.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 typedef int __attribute__((__aligned__(64))) i_t;
 i_t i;
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/align-3.C b/gcc/testsuite/g++.dg/debug/dwarf2/align-3.C
index eceee077468..32cb390de82 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/align-3.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/align-3.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 typedef int int_t;
 typedef int_t __attribute__((__aligned__(64))) i_t;
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/align-4.C b/gcc/testsuite/g++.dg/debug/dwarf2/align-4.C
index 851a58c44ad..a2905d03b66 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/align-4.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/align-4.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 2 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 2 } }
 
 struct tt {
   int __attribute__((__aligned__(64))) i;
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/align-5.C b/gcc/testsuite/g++.dg/debug/dwarf2/align-5.C
index e74146ce078..5e883b5eafe 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/align-5.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/align-5.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 struct tt {
   int i;
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/align-6.C b/gcc/testsuite/g++.dg/debug/dwarf2/align-6.C
index ff118e43ff8..3384ce78d02 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/align-6.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/align-6.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 struct tt {
   int i;
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-1.C
index e798b490367..6127dcd6b0b 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-1.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-1.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -std=c++11 -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times "0x1\[ \t\]\[^\n\]* DW_AT_defaulted" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "0x1\[ \t\]\[^\n\]* DW_AT_defaulted" 1 } }
 
 struct Foo
 {
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-2.C
index 5b569494952..73c37b01c5f 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-2.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -std=c++11 -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times "0x2\[ \t\]\[^\n\]* DW_AT_defaulted" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "0x2\[ \t\]\[^\n\]* DW_AT_defaulted" 1 } }
 
 struct Foo
 {
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-3.C b/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-3.C
index 190fe50845d..5537eddbe64 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-3.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/defaulted-member-function-3.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -std=c++11 -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-not " DW_AT_defaulted" { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-not " DW_AT_defaulted" } }
 
 struct Foo
 {
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-1.C
index 9a88e28cbe0..85f74a91521 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-1.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-1.C
@@ -1,11 +1,11 @@
 // { dg-do compile { target c++17 } }
 // { dg-options "-O -gdwarf-2 -dA -gno-strict-dwarf -fno-eliminate-unused-debug-symbols" }
 // { dg-require-weak "" }
-// { dg-final { scan-assembler-times "0x3\[^\n\r]* DW_AT_inline" 6 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times "0x1\[^\n\r]* DW_AT_inline" 2 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_declaration" 6 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_specification" 6 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_\[^\n\r]*linkage_name" 7 { xfail *-*-aix* } } }
+// { dg-final { scan-assembler-times "0x3\[^\n\r]* DW_AT_inline" 6 } }
+// { dg-final { scan-assembler-times "0x1\[^\n\r]* DW_AT_inline" 2 } }
+// { dg-final { scan-assembler-times " DW_AT_declaration" 6 } }
+// { dg-final { scan-assembler-times " DW_AT_specification" 6 } }
+// { dg-final { scan-assembler-times " DW_AT_\[^\n\r]*linkage_name" 7 } }
 
 inline int a;
 struct S
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-2.C
index cdb2696a86d..63052d6bebb 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-2.C
@@ -1,7 +1,7 @@
 // { dg-do compile { target c++17 } }
 // { dg-options "-O -gdwarf-5 -dA -gno-strict-dwarf" }
 // { dg-require-weak "" }
-// { dg-final { scan-assembler-not "DW_TAG_member" { xfail *-*-aix* } } }
+// { dg-final { scan-assembler-not "DW_TAG_member" } }
 
 inline int a;
 struct S
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-3.C b/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-3.C
index 52ed5b6912f..72252588b0d 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-3.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/inline-var-3.C
@@ -2,12 +2,12 @@
 // { dg-do compile { target c++17 } }
 // { dg-options "-O -gdwarf-5 -dA -gno-strict-dwarf -fno-eliminate-unused-debug-symbols" }
 // { dg-require-weak "" }
-// { dg-final { scan-assembler-times " DW_AT_inline \\(0x3\\)" 2 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times "0x3\[^\n\r]* DW_AT_inline" 4 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times "0x1\[^\n\r]* DW_AT_inline" 2 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_declaration" 6 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_specification" 6 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_\[^\n\r]*linkage_name" 7 { xfail *-*-aix* } } }
+// { dg-final { scan-assembler-times " DW_AT_inline \\(0x3\\)" 2 } }
+// { dg-final { scan-assembler-times "0x3\[^\n\r]* DW_AT_inline" 4 } }
+// { dg-final { scan-assembler-times "0x1\[^\n\r]* DW_AT_inline" 2 } }
+// { dg-final { scan-assembler-times " DW_AT_declaration" 6 } }
+// { dg-final { scan-assembler-times " DW_AT_specification" 6 } }
+// { dg-final { scan-assembler-times " DW_AT_\[^\n\r]*linkage_name" 7 } }
 
 inline int a;
 struct S
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/noreturn-function.C b/gcc/testsuite/g++.dg/debug/dwarf2/noreturn-function.C
index 722ee13a89b..73a0af49ca4 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/noreturn-function.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/noreturn-function.C
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -std=c++11 -g -dA -gno-strict-dwarf" }
 // Expect DW_AT_noreturn once in .debug_info and once in .debug_abbrev
-// { dg-final { scan-assembler-times "DW_AT_noreturn" 2 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "DW_AT_noreturn" 2 } }
 
 class Foo
 {
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/ptrdmem-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/ptrdmem-1.C
index bebf7fb5bd5..79c7baad2b3 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/ptrdmem-1.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/ptrdmem-1.C
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -std=c++11 -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 1 { xfail { powerpc-ibm-aix* } } } }
-// { dg-final { scan-assembler-times " DW_AT_use_location" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 1 } }
+// { dg-final { scan-assembler-times " DW_AT_use_location" 1 } }
 // { dg-final { scan-assembler-not " DW_AT_reference" } }
 
 struct S;
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/ref-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/ref-2.C
index 43939c9d697..dd1f457d3ec 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/ref-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/ref-2.C
@@ -1,7 +1,7 @@
 // { dg-do compile { target c++11 } }
 // { dg-options "-g -gno-strict-dwarf -dA" }
-// { dg-final { scan-assembler-times " DW_AT_reference" 1 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_rvalue_reference" 1 { xfail *-*-aix* } } }
+// { dg-final { scan-assembler-times " DW_AT_reference" 1 } }
+// { dg-final { scan-assembler-times " DW_AT_rvalue_reference" 1 } }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/ref-3.C b/gcc/testsuite/g++.dg/debug/dwarf2/ref-3.C
index d7932d8a237..6294d023d51 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/ref-3.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/ref-3.C
@@ -1,10 +1,10 @@
 // { dg-do compile { target c++11 } }
 // { dg-options "-g -gno-strict-dwarf -dA" }
-// { dg-final { scan-assembler-times " DW_AT_reference" 5 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_rvalue_reference" 5 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_subroutine_type" 6 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 7 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times " DW_AT_use_location" 1 { xfail *-*-aix* } } }
+// { dg-final { scan-assembler-times " DW_AT_reference" 5 } }
+// { dg-final { scan-assembler-times " DW_AT_rvalue_reference" 5 } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_subroutine_type" 6 } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 7 } }
+// { dg-final { scan-assembler-times " DW_AT_use_location" 1 } }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/ref-4.C b/gcc/testsuite/g++.dg/debug/dwarf2/ref-4.C
index 00cf81f4bcc..b1fe0e4bce9 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/ref-4.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/ref-4.C
@@ -1,8 +1,8 @@
 // { dg-do compile { target c++11 } }
 // { dg-options "-g -gno-strict-dwarf -dA" }
-// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_typedef" 2 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 2 { xfail *-*-aix* } } }
-// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_subroutine_type" 1 { xfail *-*-aix* } } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_typedef" 2 } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 2 } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_subroutine_type" 1 } }
 
 struct A { void foo (); int a; };
 typedef void (A::*PMF) ();
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/refqual-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/refqual-1.C
index aba02b06198..046e401928e 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/refqual-1.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/refqual-1.C
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -std=c++11 -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 1 { xfail { powerpc-ibm-aix* } } } }
-// { dg-final { scan-assembler-times " DW_AT_reference" 2 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 1 } }
+// { dg-final { scan-assembler-times " DW_AT_reference" 2 } }
 // { dg-final { scan-assembler-not " DW_AT_use_location" } }
 /* It is not clear what if anything we should output for
    DW_AT_use_location in a pointer to member function, so we don't
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/refqual-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/refqual-2.C
index 3cd424e882b..f77af6317e2 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/refqual-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/refqual-2.C
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -std=c++11 -g -dA -gno-strict-dwarf" }
-// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 1 { xfail { powerpc-ibm-aix* } } } }
-// { dg-final { scan-assembler-times " DW_AT_rvalue_reference" 2 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_ptr_to_member_type" 1 } }
+// { dg-final { scan-assembler-times " DW_AT_rvalue_reference" 2 } }
 // { dg-final { scan-assembler-not " DW_AT_use_location" } }
 /* It is not clear what if anything we should output for
    DW_AT_use_location in a pointer to member function, so we don't
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/align-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/align-1.c
index a00404260a1..8802bd186ce 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/align-1.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/align-1.c
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
 // { dg-additional-options "-fno-common" { target hppa*-*-hpux* } }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 int __attribute__((__aligned__(64))) i;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/align-2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/align-2.c
index 439a7da0dea..0de960eb90c 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/align-2.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/align-2.c
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
 // { dg-additional-options "-fno-common" { target hppa*-*-hpux* } }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 typedef int __attribute__((__aligned__(64))) i_t;
 i_t i;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/align-3.c b/gcc/testsuite/gcc.dg/debug/dwarf2/align-3.c
index 01c19cdd365..94db58843c7 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/align-3.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/align-3.c
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
 // { dg-additional-options "-fno-common" { target hppa*-*-hpux* } }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 typedef int int_t;
 typedef int_t __attribute__((__aligned__(64))) i_t;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/align-4.c b/gcc/testsuite/gcc.dg/debug/dwarf2/align-4.c
index 84182749d7a..bc3c5165a93 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/align-4.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/align-4.c
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
 // { dg-additional-options "-fno-common" { target hppa*-*-hpux* } }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 2 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 2 } }
 
 struct tt {
   int __attribute__((__aligned__(64))) i;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/align-5.c b/gcc/testsuite/gcc.dg/debug/dwarf2/align-5.c
index 322ac50cb5d..86cd3a9609e 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/align-5.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/align-5.c
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
 // { dg-additional-options "-fno-common" { target hppa*-*-hpux* } }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 struct tt {
   int i;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/align-6.c b/gcc/testsuite/gcc.dg/debug/dwarf2/align-6.c
index 784f213ca10..bb1895f3a29 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/align-6.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/align-6.c
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
 // { dg-additional-options "-fno-common" { target hppa*-*-hpux* } }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 struct tt {
   int i;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/align-as-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/align-as-1.c
index 5ef02c378c1..0b2358046de 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/align-as-1.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/align-as-1.c
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-O -g -dA -gno-strict-dwarf" }
 // { dg-additional-options "-fno-common" { target hppa*-*-hpux* } }
-// { dg-final { scan-assembler-times " DW_AT_alignment" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times " DW_AT_alignment" 1 } }
 
 int _Alignas(64) i;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c
index 24b598e153c..fd61296b2f1 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c
@@ -1,7 +1,7 @@
 /* Test to make sure the mcaro info includes a start file command for the main source */
 /* { dg-do compile } */
 /* { dg-options "-g3 -gdwarf -dA -fverbose-asm" } */
-/* { dg-final { scan-assembler "Start new file" { xfail { powerpc-ibm-aix* } } } } */
+/* { dg-final { scan-assembler "Start new file" } } */
 
 #define ADD(x) (M + x)
 
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro2.c
index 5204342adf7..3dfa2908ef3 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro2.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro2.c
@@ -1,7 +1,7 @@
 /* Test to make sure the macro info includes the predefined macros with line number 0.  */
 /* { dg-do compile } */
 /* { dg-options "-g3 -gdwarf -dA -fverbose-asm" } */
-/* { dg-final { scan-assembler "At line number 0" { xfail { powerpc-ibm-aix* } } } } */
+/* { dg-final { scan-assembler "At line number 0" } } */
 
 #define FOO 1
 int i;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/inline5.c b/gcc/testsuite/gcc.dg/debug/dwarf2/inline5.c
index 7587a283a7d..bd34f0da5a6 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/inline5.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/inline5.c
@@ -9,7 +9,7 @@
 /* We do not know which is output first so look for both invalid abstract
    origins on the lexical blocks (knowing that the abstract instance has
    no attribute following the DW_TAG_lexical_block.  */
-/* { dg-final { scan-assembler-not "\\(DIE \\(0x(\[0-9a-f\]*)\\) DW_TAG_lexical_block\\)\[^#/!@;\\|\]*\[#/!@;\\|\]+ +\[^(\].*DW_TAG_lexical_block\\)\[^#/!@;\\|x\]*x\\1\[^#/!@;\\|\]*\[#/!@;\\|\] +DW_AT_abstract_origin" { xfail { *-*-solaris2.* && { ! gas } } } } } */
+/* { dg-final { scan-assembler-not "\\(DIE \\(0x(\[0-9a-f\]*)\\) DW_TAG_lexical_block\\)\[^#/!@;\\|\]*\[#/!@;\\|\]+ +\[^(\].*DW_TAG_lexical_block\\)\[^#/!@;\\|x\]*x\\1\[^#/!@;\\|\]*\[#/!@;\\|\] +DW_AT_abstract_origin" { xfail { { *-*-aix* || *-*-solaris2.* } && { ! gas } } } } } */
 /* { dg-final { scan-assembler-not "DW_TAG_lexical_block\\)\[^#/!@;\\|x\]*x(\[0-9a-f\]*)\[^#/!@;\\|\]*\[#/!@;\\|\]+ +DW_AT_abstract_origin.*\\(DIE \\(0x\\1\\) DW_TAG_lexical_block\\)\[^#/!@;\\|\]*\[#/!@;\\|\]+ +DW_AT" } } */
 
 int foo (int i)
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/lang-c89.c b/gcc/testsuite/gcc.dg/debug/dwarf2/lang-c89.c
index b6b4a89ff8e..6292cf8f9c9 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/lang-c89.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/lang-c89.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O -std=c89 -g -dA" } */
 /* DW_LANG_C89 = 0x0001 */
-/* { dg-final { scan-assembler "0x1.*DW_AT_language" { xfail { powerpc-ibm-aix* } } } } */
+/* { dg-final { scan-assembler "0x1.*DW_AT_language" } } */
 
 int version;
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/noreturn-function-attribute.c b/gcc/testsuite/gcc.dg/debug/dwarf2/noreturn-function-attribute.c
index bc2cfa52073..7c8924a6ca5 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/noreturn-function-attribute.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/noreturn-function-attribute.c
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -std=c99 -g -dA -gno-strict-dwarf" }
 // Expect DW_AT_noreturn once in .debug_info and once in .debug_abbrev
-// { dg-final { scan-assembler-times "DW_AT_noreturn" 2 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "DW_AT_noreturn" 2 } }
 
 void __attribute__ ((noreturn))
 baz (void)
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/noreturn-function-keyword.c b/gcc/testsuite/gcc.dg/debug/dwarf2/noreturn-function-keyword.c
index 0105e6c3a15..ced96d19799 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/noreturn-function-keyword.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/noreturn-function-keyword.c
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -std=c11 -g -dA -gno-strict-dwarf" }
 // Expect DW_AT_noreturn once in .debug_info and once in .debug_abbrev
-// { dg-final { scan-assembler-times "DW_AT_noreturn" 2 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "DW_AT_noreturn" 2 } }
 
 _Noreturn void exit (int);
 
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr71855.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr71855.c
index 3842dbc0270..4fd8b74f329 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr71855.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr71855.c
@@ -8,4 +8,4 @@ foo (const char *format, ...)
 {
 }
 
-// { dg-final { scan-assembler-times "DIE.*DW_TAG_unspecified_parameters" 1 { xfail { powerpc-ibm-aix* } } } }
+// { dg-final { scan-assembler-times "DIE.*DW_TAG_unspecified_parameters" 1 } }
-- 
2.30.2