From: David Edelsohn <dje.gcc@gmail.com>
Date: Thu, 9 Apr 2020 16:43:22 +0000 (-0400)
Subject: rs6000: Don't push stack frame for AIX when debugging and -fcompare-debug.
X-Git-Tag: basepoints/gcc-11~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50929dd318a8171bad96b748491e9678f828e25e;p=thirdparty%2Fgcc.git

rs6000: Don't push stack frame for AIX when debugging and -fcompare-debug.

AIX pushes a stack frame when debugging is enabled.  With -fcompare-debug
this generates comparison failures because code geneation is different.
This patch disables the stack push for -fcompare-debug that only is used
for internal testing and not for normal debug information generation that
will be consumed by AIX tools.

This patch also removes xfails from testsuite testcases that use
-fcompare-debug and no longer fail on AIX without the stack push difference.

        * config/rs6000/rs6000-logue.c (rs6000_stack_info): Don't push a
        stack frame when debugging and flag_compare_debug is enabled.

testsuite/
        * g++.dg/debug/dwarf2/pr61433.C: Unfail AIX.
        * g++.dg/opt/pr48549.C: Same.
        * g++.dg/opt/pr60002.C: Same.
        * g++.dg/opt/pr80436.C: Same.
        * g++.dg/opt/pr83084.C: Same.
        * g++.dg/other/pr42685.C: Same.
        * gcc.dg/pr41241.c: Same.
        * gcc.dg/pr42629.c: Same.
        * gcc.dg/pr42630.c: Same.
        * gcc.dg/pr42719.c: Same.
        * gcc.dg/pr42728.c: Same.
        * gcc.dg/pr42889.c: Same.
        * gcc.dg/pr42916.c: Same.
        * gcc.dg/pr43084.c: Same.
        * gcc.dg/pr43670.c: Same.
        * gcc.dg/pr44023.c: Same.
        * gcc.dg/pr44971.c: Same.
        * gcc.dg/pr45449.c: Same.
        * gcc.dg/pr46771.c: Same.
        * gcc.dg/pr47684.c: Same.
        * gcc.dg/pr47881.c: Same.
        * gcc.dg/pr48768.c: Same.
        * gcc.dg/pr50017.c: Same.
        * gcc.dg/pr56023.c: Same.
        * gcc.dg/pr64935-1.c: Same.
        * gcc.dg/pr64935-2.c: Same.
        * gcc.dg/pr65521.c: Same.
        * gcc.dg/pr65779.c: Same.
        * gcc.dg/pr65980.c: Same.
        * gcc.dg/pr66688.c: Same.
        * gcc.dg/pr70405.c: Same.
        * gcc.dg/vect/pr49352.c: Same.
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d91fcd1cadb..38dd5837e208 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-25  David Edelsohn  <dje.gcc@gmail.com>
+
+	* config/rs6000/rs6000-logue.c (rs6000_stack_info): Don't push a
+	stack frame when debugging and flag_compare_debug is enabled.
+
 2020-04-25  Michael Meissner  <meissner@linux.ibm.com>
 
 	* config/rs6000/linux64.h (PCREL_SUPPORTED_BY_OS): Define to
diff --git a/gcc/config/rs6000/rs6000-logue.c b/gcc/config/rs6000/rs6000-logue.c
index 4cbf228eb79f..7226319459e3 100644
--- a/gcc/config/rs6000/rs6000-logue.c
+++ b/gcc/config/rs6000/rs6000-logue.c
@@ -909,7 +909,7 @@ rs6000_stack_info (void)
   else if (frame_pointer_needed)
     info->push_p = 1;
 
-  else if (TARGET_XCOFF && write_symbols != NO_DEBUG)
+  else if (TARGET_XCOFF && write_symbols != NO_DEBUG && !flag_compare_debug)
     info->push_p = 1;
 
   else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3a44abfb4c55..1035425733f7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,38 @@
+2020-04-25  David Edelsohn  <dje.gcc@gmail.com>
+
+	* g++.dg/debug/dwarf2/pr61433.C: Unfail AIX.
+	* g++.dg/opt/pr48549.C: Same.
+	* g++.dg/opt/pr60002.C: Same.
+	* g++.dg/opt/pr80436.C: Same.
+	* g++.dg/opt/pr83084.C: Same.
+	* g++.dg/other/pr42685.C: Same.
+	* gcc.dg/pr41241.c: Same.
+	* gcc.dg/pr42629.c: Same.
+	* gcc.dg/pr42630.c: Same.
+	* gcc.dg/pr42719.c: Same.
+	* gcc.dg/pr42728.c: Same.
+	* gcc.dg/pr42889.c: Same.
+	* gcc.dg/pr42916.c: Same.
+	* gcc.dg/pr43084.c: Same.
+	* gcc.dg/pr43670.c: Same.
+	* gcc.dg/pr44023.c: Same.
+	* gcc.dg/pr44971.c: Same.
+	* gcc.dg/pr45449.c: Same.
+	* gcc.dg/pr46771.c: Same.
+	* gcc.dg/pr47684.c: Same.
+	* gcc.dg/pr47881.c: Same.
+	* gcc.dg/pr48768.c: Same.
+	* gcc.dg/pr50017.c: Same.
+	* gcc.dg/pr56023.c: Same.
+	* gcc.dg/pr64935-1.c: Same.
+	* gcc.dg/pr64935-2.c: Same.
+	* gcc.dg/pr65521.c: Same.
+	* gcc.dg/pr65779.c: Same.
+	* gcc.dg/pr65980.c: Same.
+	* gcc.dg/pr66688.c: Same.
+	* gcc.dg/pr70405.c: Same.
+	* gcc.dg/vect/pr49352.c: Same.
+
 2020-04-25  David Edelsohn  <dje.gcc@gmail.com>
 
 	* gcc.dg/ipa/ipa-sra-19.c: Add -Wno-psabi option on AIX.
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pr61433.C b/gcc/testsuite/g++.dg/debug/dwarf2/pr61433.C
index ef2479f0cd9c..12181d0fdb0a 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/pr61433.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/pr61433.C
@@ -1,6 +1,5 @@
 // PR c++/61433
 // { dg-do compile { target c++11 } }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
 // { dg-options "-O -fcompare-debug -fno-inline -fno-ipa-pure-const -fipa-sra" }
 // { dg-additional-options "-Wno-return-type" }
 
diff --git a/gcc/testsuite/g++.dg/debug/pr46583.C b/gcc/testsuite/g++.dg/debug/pr46583.C
index 04b1fbf76b87..c869576057f2 100644
--- a/gcc/testsuite/g++.dg/debug/pr46583.C
+++ b/gcc/testsuite/g++.dg/debug/pr46583.C
@@ -1,7 +1,7 @@
 // PR debug/46583
 // { dg-do compile }
 // { dg-options "-O -fno-inline -fipa-cp -fipa-cp-clone -fcompare-debug" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
+// { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } }
 
 template < typename = unsigned long >struct A
 {
diff --git a/gcc/testsuite/g++.dg/debug/pr47106.C b/gcc/testsuite/g++.dg/debug/pr47106.C
index 84c6e3f87be4..33c6e177f0ab 100644
--- a/gcc/testsuite/g++.dg/debug/pr47106.C
+++ b/gcc/testsuite/g++.dg/debug/pr47106.C
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-O -fpartial-inlining -flto -fconserve-stack -fcompare-debug" }
 // { dg-require-effective-target lto }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
+// { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } }
 
 void end (int, int) __attribute__ ((__noreturn__));
 
diff --git a/gcc/testsuite/g++.dg/debug/pr56294.C b/gcc/testsuite/g++.dg/debug/pr56294.C
index 301fcb1a1003..d31ed1cb73e9 100644
--- a/gcc/testsuite/g++.dg/debug/pr56294.C
+++ b/gcc/testsuite/g++.dg/debug/pr56294.C
@@ -1,6 +1,6 @@
 // { dg-do compile }
 // { dg-options "-fno-ipa-sra -fcompare-debug" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
+// { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } }
 
 struct comp_cost { int cost; unsigned complexity; };
 struct cost_pair { struct iv_cand *cand; };
diff --git a/gcc/testsuite/g++.dg/debug/pr56819.C b/gcc/testsuite/g++.dg/debug/pr56819.C
index 4aa86b03ef02..b442c8e0ea38 100644
--- a/gcc/testsuite/g++.dg/debug/pr56819.C
+++ b/gcc/testsuite/g++.dg/debug/pr56819.C
@@ -1,7 +1,7 @@
 // PR debug/56819
 // { dg-do compile }
 // { dg-options "-fcompare-debug" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
+// { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } }
 
 template <typename>
 struct A
diff --git a/gcc/testsuite/g++.dg/debug/pr71432.C b/gcc/testsuite/g++.dg/debug/pr71432.C
index e9bc88ca863a..00473be72f6c 100644
--- a/gcc/testsuite/g++.dg/debug/pr71432.C
+++ b/gcc/testsuite/g++.dg/debug/pr71432.C
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
+/* { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } } */
 
 namespace std
 {
diff --git a/gcc/testsuite/g++.dg/debug/pr84704.C b/gcc/testsuite/g++.dg/debug/pr84704.C
index b9d4c5ffb869..b7d29eb32525 100644
--- a/gcc/testsuite/g++.dg/debug/pr84704.C
+++ b/gcc/testsuite/g++.dg/debug/pr84704.C
@@ -1,7 +1,7 @@
 // PR c++/84704
 // { dg-do compile }
 // { dg-options "-g -fcompare-debug -O2" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
+// { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } }
 
 int a[1] = { 0 };
 
diff --git a/gcc/testsuite/g++.dg/opt/pr48549.C b/gcc/testsuite/g++.dg/opt/pr48549.C
index e113b1592997..93a38e409b43 100644
--- a/gcc/testsuite/g++.dg/opt/pr48549.C
+++ b/gcc/testsuite/g++.dg/opt/pr48549.C
@@ -1,7 +1,6 @@
 // PR rtl-optimization/48549
 // { dg-do compile }
 // { dg-options "-fcompare-debug -O2" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
 
 __extension__ typedef __PTRDIFF_TYPE__ pdiff_t;
 
diff --git a/gcc/testsuite/g++.dg/opt/pr60002.C b/gcc/testsuite/g++.dg/opt/pr60002.C
index ceba0b7afb3e..753f579dd9a1 100644
--- a/gcc/testsuite/g++.dg/opt/pr60002.C
+++ b/gcc/testsuite/g++.dg/opt/pr60002.C
@@ -1,7 +1,6 @@
 // PR tree-optimization/60002
 // { dg-do compile }
 // { dg-options "-O2 -fcompare-debug -fdeclone-ctor-dtor -fipa-cp-clone" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
 
 struct A {};
 
diff --git a/gcc/testsuite/g++.dg/opt/pr80436.C b/gcc/testsuite/g++.dg/opt/pr80436.C
index b269b75b9b40..b5879bf813d6 100644
--- a/gcc/testsuite/g++.dg/opt/pr80436.C
+++ b/gcc/testsuite/g++.dg/opt/pr80436.C
@@ -1,7 +1,6 @@
 // PR debug/80436
 // { dg-do compile { target c++11 } }
 // { dg-options "-O3 -fcompare-debug" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
 
 void fn (...);
 void foo (int, int, int);
diff --git a/gcc/testsuite/g++.dg/opt/pr83084.C b/gcc/testsuite/g++.dg/opt/pr83084.C
index 1e7abf64dc6f..d21e30878ec2 100644
--- a/gcc/testsuite/g++.dg/opt/pr83084.C
+++ b/gcc/testsuite/g++.dg/opt/pr83084.C
@@ -1,7 +1,6 @@
 // PR debug/83084
 // { dg-do compile }
 // { dg-options "-O2 -fcompare-debug -Wno-return-type" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
 
 enum E { F };
 template <E = F> struct A {
diff --git a/gcc/testsuite/g++.dg/other/pr42685.C b/gcc/testsuite/g++.dg/other/pr42685.C
index dd070c424102..b8b1ad63b1b4 100644
--- a/gcc/testsuite/g++.dg/other/pr42685.C
+++ b/gcc/testsuite/g++.dg/other/pr42685.C
@@ -1,6 +1,5 @@
 // { dg-do compile }
 // { dg-options "-O -funroll-loops -fcompare-debug" }
-// { dg-xfail-if "" { powerpc-ibm-aix* } }
 
 void Remap(int n, int *src, int *dst, int *map)
 {
diff --git a/gcc/testsuite/gcc.dg/pr41241.c b/gcc/testsuite/gcc.dg/pr41241.c
index 8ba92ab925db..42fb2f7e5c7a 100644
--- a/gcc/testsuite/gcc.dg/pr41241.c
+++ b/gcc/testsuite/gcc.dg/pr41241.c
@@ -2,7 +2,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fcompare-debug -g" } */
 /* { dg-options "-O2 -fcompare-debug -g -march=i586 -mtune=i586 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 typedef struct { int t1; int t2; int t3; } *T;
 typedef struct { int s; } S;
diff --git a/gcc/testsuite/gcc.dg/pr41345.c b/gcc/testsuite/gcc.dg/pr41345.c
index cb0809171e59..5753967c5ac9 100644
--- a/gcc/testsuite/gcc.dg/pr41345.c
+++ b/gcc/testsuite/gcc.dg/pr41345.c
@@ -1,7 +1,7 @@
 /* PR bootstrap/41345 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -g -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
+/* { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } } */
 
 void
 foo (int *x)
diff --git a/gcc/testsuite/gcc.dg/pr42629.c b/gcc/testsuite/gcc.dg/pr42629.c
index bb7422103149..7b5b23264f9b 100644
--- a/gcc/testsuite/gcc.dg/pr42629.c
+++ b/gcc/testsuite/gcc.dg/pr42629.c
@@ -4,7 +4,6 @@
 /* { dg-options "-O1 -fsched-pressure -fschedule-insns -fcompare-debug" { target scheduling } } */
 /* { dg-options "-O1 -fcompare-debug" { target { ! scheduling } } } */
 /* { dg-require-effective-target int32plus } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 int lzo_adler32(int adler, char *buf)
 {
diff --git a/gcc/testsuite/gcc.dg/pr42630.c b/gcc/testsuite/gcc.dg/pr42630.c
index 08427ab6d06b..34543dab5e99 100644
--- a/gcc/testsuite/gcc.dg/pr42630.c
+++ b/gcc/testsuite/gcc.dg/pr42630.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O1 -fvariable-expansion-in-unroller -funroll-loops -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 int sum(int *buf, int len)
 {
diff --git a/gcc/testsuite/gcc.dg/pr42631.c b/gcc/testsuite/gcc.dg/pr42631.c
index 9dd51a24de5c..4f914449378d 100644
--- a/gcc/testsuite/gcc.dg/pr42631.c
+++ b/gcc/testsuite/gcc.dg/pr42631.c
@@ -15,7 +15,7 @@
 
 /* { dg-do compile } */
 /* { dg-options "-g -O1 -funroll-loops -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
+/* { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } } */
 
 void foo()
 {
diff --git a/gcc/testsuite/gcc.dg/pr42719.c b/gcc/testsuite/gcc.dg/pr42719.c
index a44b83562f36..94a58e41a1ae 100644
--- a/gcc/testsuite/gcc.dg/pr42719.c
+++ b/gcc/testsuite/gcc.dg/pr42719.c
@@ -1,7 +1,6 @@
 /* PR tree-optimization/42719 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -ftracer -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 int *v;
 
diff --git a/gcc/testsuite/gcc.dg/pr42728.c b/gcc/testsuite/gcc.dg/pr42728.c
index 3ee919b63f9f..7b2fbb690fbe 100644
--- a/gcc/testsuite/gcc.dg/pr42728.c
+++ b/gcc/testsuite/gcc.dg/pr42728.c
@@ -1,7 +1,6 @@
 /* PR debug/42728 */
 /* { dg-do compile } */
 /* { dg-options "-O1 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 void
 foo (char *a)
diff --git a/gcc/testsuite/gcc.dg/pr42889.c b/gcc/testsuite/gcc.dg/pr42889.c
index a8e9e6088abb..d3421736debe 100644
--- a/gcc/testsuite/gcc.dg/pr42889.c
+++ b/gcc/testsuite/gcc.dg/pr42889.c
@@ -1,7 +1,6 @@
 /* PR rtl-optimization/42889 */
 /* { dg-do compile } */
 /* { dg-options "-O -fgcse -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 extern int A[], B[];
 
diff --git a/gcc/testsuite/gcc.dg/pr42916.c b/gcc/testsuite/gcc.dg/pr42916.c
index bbe443609c25..d32ba94882a1 100644
--- a/gcc/testsuite/gcc.dg/pr42916.c
+++ b/gcc/testsuite/gcc.dg/pr42916.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O1 -funroll-loops -ftree-vectorize -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 int seed;
 
diff --git a/gcc/testsuite/gcc.dg/pr43084.c b/gcc/testsuite/gcc.dg/pr43084.c
index f70ed863e167..dc75982f4573 100644
--- a/gcc/testsuite/gcc.dg/pr43084.c
+++ b/gcc/testsuite/gcc.dg/pr43084.c
@@ -1,7 +1,6 @@
 /* PR debug/43084 */
 /* { dg-do compile } */
 /* { dg-options "-O1 -fwhole-program -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 struct S
 {
diff --git a/gcc/testsuite/gcc.dg/pr43670.c b/gcc/testsuite/gcc.dg/pr43670.c
index 45088fe01e3b..f152b4d7a639 100644
--- a/gcc/testsuite/gcc.dg/pr43670.c
+++ b/gcc/testsuite/gcc.dg/pr43670.c
@@ -1,7 +1,6 @@
 /* PR debug/43670 */
 /* { dg-do compile } */
 /* { dg-options "-O -ftree-vrp -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.dg/pr44023.c b/gcc/testsuite/gcc.dg/pr44023.c
index 90f85534fc6c..df22bba83f63 100644
--- a/gcc/testsuite/gcc.dg/pr44023.c
+++ b/gcc/testsuite/gcc.dg/pr44023.c
@@ -3,7 +3,6 @@
 /* { dg-options "-fcompare-debug -O2" } */
 /* { dg-options "-fcompare-debug -O2 -mcpu=ev67" { target alpha*-*-* } } */
 /* { dg-require-effective-target int32plus } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 void
 foo (unsigned f, long v, unsigned *w, unsigned a, unsigned b, unsigned e, unsigned c, unsigned d)
diff --git a/gcc/testsuite/gcc.dg/pr44971.c b/gcc/testsuite/gcc.dg/pr44971.c
index 209695901ea9..a1faef51be17 100644
--- a/gcc/testsuite/gcc.dg/pr44971.c
+++ b/gcc/testsuite/gcc.dg/pr44971.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fcompare-debug -w" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 typedef struct
 {
diff --git a/gcc/testsuite/gcc.dg/pr45449.c b/gcc/testsuite/gcc.dg/pr45449.c
index 61ddcbc424a0..d7b69a1827e9 100644
--- a/gcc/testsuite/gcc.dg/pr45449.c
+++ b/gcc/testsuite/gcc.dg/pr45449.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fno-tree-pre -fno-tree-pta -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 struct S
 {
diff --git a/gcc/testsuite/gcc.dg/pr46771.c b/gcc/testsuite/gcc.dg/pr46771.c
index 3ba00a1397c0..b44dfd466ab6 100644
--- a/gcc/testsuite/gcc.dg/pr46771.c
+++ b/gcc/testsuite/gcc.dg/pr46771.c
@@ -1,7 +1,6 @@
 /* PR debug/46771 */
 /* { dg-do compile } */
 /* { dg-options "-O -ftree-vectorize -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 unsigned char v[1600];
 
diff --git a/gcc/testsuite/gcc.dg/pr47684.c b/gcc/testsuite/gcc.dg/pr47684.c
index 7c66d4deece0..475aa1549b81 100644
--- a/gcc/testsuite/gcc.dg/pr47684.c
+++ b/gcc/testsuite/gcc.dg/pr47684.c
@@ -1,7 +1,6 @@
 /* PR debug/47684 */
 /* { dg-do compile } */
 /* { dg-options "-O3 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 int in[8][4];
 int out[4];
diff --git a/gcc/testsuite/gcc.dg/pr47881.c b/gcc/testsuite/gcc.dg/pr47881.c
index ef0bd88d60a5..ee1707342cdf 100644
--- a/gcc/testsuite/gcc.dg/pr47881.c
+++ b/gcc/testsuite/gcc.dg/pr47881.c
@@ -1,7 +1,6 @@
 /* PR debug/47881 */
 /* { dg-do compile } */
 /* { dg-options "-O -fcompare-debug -fno-dce -funroll-loops -fno-web" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 extern int data[];
 
diff --git a/gcc/testsuite/gcc.dg/pr48768.c b/gcc/testsuite/gcc.dg/pr48768.c
index 990c537c1949..7d0383e83bc8 100644
--- a/gcc/testsuite/gcc.dg/pr48768.c
+++ b/gcc/testsuite/gcc.dg/pr48768.c
@@ -1,7 +1,6 @@
 /* PR debug/48768 */
 /* { dg-do compile } */
 /* { dg-options "-O -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 int a, b;
 
diff --git a/gcc/testsuite/gcc.dg/pr50017.c b/gcc/testsuite/gcc.dg/pr50017.c
index e3f5f1f0a94c..66bef007da15 100644
--- a/gcc/testsuite/gcc.dg/pr50017.c
+++ b/gcc/testsuite/gcc.dg/pr50017.c
@@ -1,7 +1,6 @@
 /* PR debug/50017 */
 /* { dg-do compile } */
 /* { dg-options "-O3 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 struct S { int r, i; };
 
diff --git a/gcc/testsuite/gcc.dg/pr56023.c b/gcc/testsuite/gcc.dg/pr56023.c
index d53a22ce8f78..f1942ac18c9f 100644
--- a/gcc/testsuite/gcc.dg/pr56023.c
+++ b/gcc/testsuite/gcc.dg/pr56023.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 void
 foo (char *c)
diff --git a/gcc/testsuite/gcc.dg/pr64935-1.c b/gcc/testsuite/gcc.dg/pr64935-1.c
index c9c67ebb4c6f..0fc6b58caed4 100644
--- a/gcc/testsuite/gcc.dg/pr64935-1.c
+++ b/gcc/testsuite/gcc.dg/pr64935-1.c
@@ -1,7 +1,6 @@
 /* PR rtl-optimization/64935 */
 /* { dg-do compile } */
 /* { dg-options "-std=gnu89 -Wno-shift-count-overflow -O2 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 int a[] = {}, b[] = {}, c[] = {}, d[] = {}, e[] = {}, f[] = {}, h[] = {};
 int g[] = { 0 };
diff --git a/gcc/testsuite/gcc.dg/pr64935-2.c b/gcc/testsuite/gcc.dg/pr64935-2.c
index 33d963036995..5d7a6b8c6c54 100644
--- a/gcc/testsuite/gcc.dg/pr64935-2.c
+++ b/gcc/testsuite/gcc.dg/pr64935-2.c
@@ -2,7 +2,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O -fschedule-insns --param=max-sched-ready-insns=1 -fcompare-debug" } */
 /* { dg-require-effective-target scheduling } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 void
 foo (int *data, unsigned len, const int qlp_coeff[],
diff --git a/gcc/testsuite/gcc.dg/pr65521.c b/gcc/testsuite/gcc.dg/pr65521.c
index 49d6a4c83777..97879e2e139c 100644
--- a/gcc/testsuite/gcc.dg/pr65521.c
+++ b/gcc/testsuite/gcc.dg/pr65521.c
@@ -1,7 +1,6 @@
 /* PR ipa/65521 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 struct S { int s; };
 int f6 (void *, unsigned long);
diff --git a/gcc/testsuite/gcc.dg/pr65779.c b/gcc/testsuite/gcc.dg/pr65779.c
index fa6515fedbb7..7d5c522d042e 100644
--- a/gcc/testsuite/gcc.dg/pr65779.c
+++ b/gcc/testsuite/gcc.dg/pr65779.c
@@ -1,7 +1,6 @@
 /* PR debug/65779 */
 /* { dg-do assemble } */
 /* { dg-options "-O2 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 unsigned long
 foo (unsigned long x, unsigned char *y, unsigned int z)
diff --git a/gcc/testsuite/gcc.dg/pr65980.c b/gcc/testsuite/gcc.dg/pr65980.c
index 4babad6d4179..5139ae361458 100644
--- a/gcc/testsuite/gcc.dg/pr65980.c
+++ b/gcc/testsuite/gcc.dg/pr65980.c
@@ -1,7 +1,6 @@
 /* PR rtl-optimization/65980 */
 /* { dg-do compile } */
 /* { dg-options "-O3 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 typedef struct { int b; } A;
 void (*a) (int);
diff --git a/gcc/testsuite/gcc.dg/pr66688.c b/gcc/testsuite/gcc.dg/pr66688.c
index c7f4ccbdacaa..af6f8443a7c8 100644
--- a/gcc/testsuite/gcc.dg/pr66688.c
+++ b/gcc/testsuite/gcc.dg/pr66688.c
@@ -1,7 +1,6 @@
 /* PR tree-optimization/66688 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -fno-reorder-blocks -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 struct fdt_header { unsigned magic; } *a;
 
diff --git a/gcc/testsuite/gcc.dg/pr70405.c b/gcc/testsuite/gcc.dg/pr70405.c
index 25e057648a6b..bff390ff06de 100644
--- a/gcc/testsuite/gcc.dg/pr70405.c
+++ b/gcc/testsuite/gcc.dg/pr70405.c
@@ -2,7 +2,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fcompare-debug" } */
 /* { dg-additional-options "-mavx512f" { target i?86-*-* x86_64-*-* } } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 typedef short V __attribute__ ((vector_size (32)));
 
diff --git a/gcc/testsuite/gcc.dg/torture/pr59166.c b/gcc/testsuite/gcc.dg/torture/pr59166.c
index 43df6be30165..b8f414a7320a 100644
--- a/gcc/testsuite/gcc.dg/torture/pr59166.c
+++ b/gcc/testsuite/gcc.dg/torture/pr59166.c
@@ -1,6 +1,6 @@
 /* PR rtl-optimization/59166 */
 /* { dg-additional-options "-fcompare-debug" } */
-/* { dg-xfail-if "compare-debug failure" { powerpc-ibm-aix* } } */
+/* { dg-xfail-if "AIX compare debug" { powerpc-ibm-aix* } } */
 
 int a, b, c, f, g;
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr49352.c b/gcc/testsuite/gcc.dg/vect/pr49352.c
index b784b8a09644..2d5e723d7bd4 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49352.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49352.c
@@ -1,7 +1,6 @@
 /* PR tree-optimization/49352 */
 /* { dg-do compile } */
 /* { dg-additional-options "-O2 -fcompare-debug" } */
-/* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 int
 foo (int *x, int *y, int n)