testsuite: aix testsuite adjustments

This patch re-enables the DWARF5 tests that seem to be functioning again.
It adds a comment to pr41445-7.c that any changes in lines need to be
reflected in the expected output.

The patch also allows for additional failures in ucs.c and reflects that
builtin-sprintf-warn-20.c requires 4 byte wide char support.

gcc/testsuite/ChangeLog:

	* gcc.dg/cpp/ucs.c: Expect Invalid warning for 2byte wchar.
	* gcc.dg/debug/dwarf2/inline6.c: Remove skip AIX.
	* gcc.dg/debug/dwarf2/lang-c11.c: Remove skip AIX.
	* gcc.dg/debug/dwarf2/pr41445-7.c: Remove skip AIX.
	* gcc.dg/debug/dwarf2/pr41445-8.c: Remove skip AIX.
	* gcc.dg/tree-ssa/builtin-sprintf-warn-20.c: Require 4byte wchar.

6 files changed, 8 insertions, 10 deletions

diff --git a/gcc/testsuite/gcc.dg/cpp/ucs.c b/gcc/testsuite/gcc.dg/cpp/ucs.c
index f52cd57..0fdd23b 100644
--- a/gcc/testsuite/gcc.dg/cpp/ucs.c
+++ b/gcc/testsuite/gcc.dg/cpp/ucs.c
@@ -43,7 +43,7 @@
 #endif
 
 #if WCHAR_MAX >= 0x7ffffff
-# if L'\U1234abcd' != 0x1234abcd /* { dg-warning "outside" "" } */
+# if L'\U1234abcd' != 0x1234abcd /* { dg-warning "outside" "" { xfail powerpc-ibm-aix* } } */
 #  error bad long ucs	/* { dg-bogus "bad" "bad U1234abcd evaluation" } */
 # endif
 #endif
@@ -69,5 +69,5 @@ void foo ()
   c = L"\uD800"[0];	/* { dg-error "not a valid" "D800 invalid UCN" } */
   c = L'\U0000DFFF';	/* { dg-error "not a valid" "DFFF invalid UCN" } */
 
-  c = L'\U00110000';	/* { dg-warning "outside" "110000 outside UCS" } */
+  c = L'\U00110000';	/* { dg-warning "outside|Invalid" "110000 outside UCS" } */
 }
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/inline6.c b/gcc/testsuite/gcc.dg/debug/dwarf2/inline6.c
index 4e6f7a7..fde8c27 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/inline6.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/inline6.c
@@ -17,7 +17,6 @@
 /* Explicitly use dwarf-5 which uses DW_FORM_implicit_const.  */
 /* { dg-do compile } */
 /* { dg-options "-O -g3 -gdwarf-5 -dA -fgnu89-inline" } */
-/* { dg-skip-if "AIX DWARF5" { powerpc-ibm-aix* } } */
 
 /* There are 6 inlined subroutines:
    - One for each subroutine inlined into main, that's 3.
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/lang-c11.c b/gcc/testsuite/gcc.dg/debug/dwarf2/lang-c11.c
index 6b0d45b..f14c49f 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/lang-c11.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/lang-c11.c
@@ -1,6 +1,5 @@
 // { dg-do compile }
 // { dg-options "-O -std=c11 -gdwarf-5 -dA" }
-// { dg-skip-if "AIX DWARF5" { powerpc-ibm-aix* } }
 // DW_LANG_C11 = 0x001d
 // { dg-final { scan-assembler "0x1d.*DW_AT_language" } } */
 
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-7.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-7.c
index 1120c6d..1aa6005 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-7.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-7.c
@@ -1,9 +1,9 @@
 /* PR preprocessor/41445 DWARF5 variant */
 /* Test that token after multi-line function-like macro use
-   gets correct locus even when preprocessing separately.  */
+   gets correct locus even when preprocessing separately.
+   If lines are inserted, the expected line number must be updated.  */
 /* { dg-do compile } */
 /* { dg-options "-save-temps -gdwarf-5 -O0 -dA -fno-merge-debug-strings" } */
-/* { dg-skip-if "AIX DWARF5" { powerpc-ibm-aix* } } */
 
 #define A(x) vari x
 #define vari(x)
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-8.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-8.c
index 7667f7a..3a6eeb5 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-8.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-8.c
@@ -1,7 +1,6 @@
 /* PR preprocessor/41445 DWARF5 variant*/
 /* { dg-do compile } */
 /* { dg-options "-gdwarf-5 -O0 -dA -fno-merge-debug-strings" } */
-/* { dg-skip-if "AIX DWARF5" { powerpc-ibm-aix* } } */
 
 #include "pr41445-5.c"
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-20.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-20.c
index 5966eab..ec14057 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-20.c
@@ -1,7 +1,8 @@
 /* PR tree-optimization/87034 - missing -Wformat-overflow on a sprintf
-   %s with a wide string
-   { dg-do compile }
-   { dg-options "-O2 -Wall -Wformat-overflow -ftrack-macro-expansion=0" } */
+   %s with a wide string.  */
+/* { dg-do compile } */
+/* { dg-require-effective-target 4byte_wchar_t } */
+/* { dg-options "-O2 -Wall -Wformat-overflow -ftrack-macro-expansion=0" } */
 
 typedef __WCHAR_TYPE__ wchar_t;