fnptr-by-value-1_x.c, [...]: Guard non-C99 tests with SKIP_COMPLEX_INT, SKIP_ATTRIBUTE and SKIP_ZERO_ARRAY.

	* gcc.dg/compat/fnptr-by-value-1_x.c, scalar-by-value-1_y.c
	scalar-by-value-3_x.c, scalar-by-value-3_y.c,
	scalar-by-value-4_x.c, scalar-by-value-4_y.c,
	scalar-return-1_x.c, scalar-return-2_y.c,
	scalar-return-3_x.c, scalar-return-3_y.c,
	scalar-return-4_x.c, scalar-return-4_y.c,
	struct-align-1.h, struct-align-1_x.c,
	struct-align-1_y.c, struct-align-2.h,
	struct-align-2_x.c, struct-align-2_y.c,
	struct-by-value-10_y.c, struct-by-value-11_x.c,
	struct-by-value-11_y.c, struct-by-value-12_x.c,
	struct-by-value-12_y.c, struct-by-value-13_x.c,
	struct-by-value-13_y.c, struct-by-value-14_x.c,
	struct-by-value-14_y.c, struct-by-value-15_x.c,
	struct-by-value-15_y.c, struct-by-value-16_y.c,
	struct-by-value-17_y.c, struct-by-value-18_y.c,
	struct-by-value-19_y.c, struct-by-value-1_x.c,
	struct-by-value-1_y.c, struct-by-value-20_y.c,
	struct-by-value-2_x.c, struct-by-value-2_y.c,
	struct-by-value-3_y.c, struct-by-value-4_x.c,
	struct-by-value-4_y.c, struct-by-value-5_y.c,
	struct-by-value-6_y.c, struct-by-value-7_y.c
	struct-by-value-8_x.c, struct-by-value-8_y.c
	struct-by-value-9_x.c, struct-by-value-9_y.c
	struct-return-10_x.c, struct-return-10_y.c,
	struct-return-19_x.c, struct-return-20_x.c
	struct-return-2_x.c, struct-return-2_y.c
	struct-return-3_x.c: Guard non-C99 tests with SKIP_COMPLEX_INT,
	SKIP_ATTRIBUTE and SKIP_ZERO_ARRAY.  Turns SKIPVA into SKIP_VA.

From-SVN: r76170

56 files changed, 238 insertions, 81 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4c90e15..9bd505d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,37 @@
 2004-01-19  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
+	* gcc.dg/compat/fnptr-by-value-1_x.c, scalar-by-value-1_y.c
+	scalar-by-value-3_x.c, scalar-by-value-3_y.c,
+	scalar-by-value-4_x.c, scalar-by-value-4_y.c,
+	scalar-return-1_x.c, scalar-return-2_y.c,
+	scalar-return-3_x.c, scalar-return-3_y.c,
+	scalar-return-4_x.c, scalar-return-4_y.c,
+	struct-align-1.h, struct-align-1_x.c,
+	struct-align-1_y.c, struct-align-2.h,
+	struct-align-2_x.c, struct-align-2_y.c,
+	struct-by-value-10_y.c, struct-by-value-11_x.c,
+	struct-by-value-11_y.c, struct-by-value-12_x.c,
+	struct-by-value-12_y.c, struct-by-value-13_x.c,
+	struct-by-value-13_y.c, struct-by-value-14_x.c,
+	struct-by-value-14_y.c, struct-by-value-15_x.c,
+	struct-by-value-15_y.c, struct-by-value-16_y.c,
+	struct-by-value-17_y.c, struct-by-value-18_y.c,
+	struct-by-value-19_y.c, struct-by-value-1_x.c,
+	struct-by-value-1_y.c, struct-by-value-20_y.c,
+	struct-by-value-2_x.c, struct-by-value-2_y.c,
+	struct-by-value-3_y.c, struct-by-value-4_x.c,
+	struct-by-value-4_y.c, struct-by-value-5_y.c,
+	struct-by-value-6_y.c, struct-by-value-7_y.c
+	struct-by-value-8_x.c, struct-by-value-8_y.c
+	struct-by-value-9_x.c, struct-by-value-9_y.c
+	struct-return-10_x.c, struct-return-10_y.c,
+	struct-return-19_x.c, struct-return-20_x.c
+	struct-return-2_x.c, struct-return-2_y.c
+	struct-return-3_x.c: Guard non-C99 tests with SKIP_COMPLEX_INT,
+	SKIP_ATTRIBUTE and SKIP_ZERO_ARRAY.  Turns SKIPVA into SKIP_VA.
+
+2004-01-19  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
 	* gcc.dg/tls/alias-1.c: Add dg-warning for unsupported visibility
 	attribute on sparc*-sun-solaris2.*.
 
diff --git a/gcc/testsuite/gcc.dg/compat/fnptr-by-value-1_x.c b/gcc/testsuite/gcc.dg/compat/fnptr-by-value-1_x.c
index 80f4fbc..156a417 100644
--- a/gcc/testsuite/gcc.dg/compat/fnptr-by-value-1_x.c
+++ b/gcc/testsuite/gcc.dg/compat/fnptr-by-value-1_x.c
@@ -1,7 +1,6 @@
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-by-value-1_y.c b/gcc/testsuite/gcc.dg/compat/scalar-by-value-1_y.c
index 7b4b60e..73f3de0 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-by-value-1_y.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-by-value-1_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-by-value-3_x.c b/gcc/testsuite/gcc.dg/compat/scalar-by-value-3_x.c
index 25bb389..6d20fef 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-by-value-3_x.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-by-value-3_x.c
@@ -144,9 +144,11 @@ testit##NAME (void)						\
   DEBUG_NL;							\
 }
 
+#ifndef SKIP_COMPLEX_INT
 T(ci, _Complex int, (2,3))
 T(cl, _Complex long, (3,4))
 T(cll, _Complex long long, (5,6))
+#endif
 T(cd, _Complex double, (7.0,8.0))
 T(cld, _Complex long double, (8.0,9.0))
 
@@ -159,9 +161,11 @@ DEBUG_INIT
 
 #define T(NAME) testit##NAME ();
 
+#ifndef SKIP_COMPLEX_INT
 T(ci)
 T(cl)
 T(cll)
+#endif
 T(cd)
 T(cld)
 
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-by-value-3_y.c b/gcc/testsuite/gcc.dg/compat/scalar-by-value-3_y.c
index 35354c0..7c6822a 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-by-value-3_y.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-by-value-3_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -85,8 +84,10 @@ testva##NAME (int n, ...)					\
     }								\
 }
 
+#ifndef SKIP_COMPLEX_INT
 T(ci, _Complex int, (2,3))
 T(cl, _Complex long, (3,4))
 T(cll, _Complex long long, (5,6))
+#endif
 T(cd, _Complex double, (7.0,8.0))
 T(cld, _Complex long double, (8.0,9.0))
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-by-value-4_x.c b/gcc/testsuite/gcc.dg/compat/scalar-by-value-4_x.c
index 8231950..20f58d2 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-by-value-4_x.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-by-value-4_x.c
@@ -68,8 +68,10 @@ testit##NAME (void)						\
   DEBUG_NL;							\
 }
 
+#ifndef SKIP_COMPLEX_INT
 T(cc, _Complex char, (0,1))
 T(cs, _Complex short, (1,2))
+#endif
 T(cf, _Complex float, (6.0,7.0))
 
 #undef T
@@ -81,8 +83,10 @@ DEBUG_INIT
 
 #define T(NAME) testit##NAME ();
 
+#ifndef SKIP_COMPLEX_INT
 T(cc)
 T(cs)
+#endif
 T(cf)
 
 DEBUG_FINI
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-by-value-4_y.c b/gcc/testsuite/gcc.dg/compat/scalar-by-value-4_y.c
index fdf5b24..8205b82 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-by-value-4_y.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-by-value-4_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -68,6 +67,8 @@ test##NAME (TYPE x01, TYPE x02, TYPE x03, TYPE x04,		\
   check##NAME (x16, 16);					\
 }
 
+#ifndef SKIP_COMPLEX_INT
 T(cc, _Complex char, (0,1))
 T(cs, _Complex short, (1,2))
+#endif
 T(cf, _Complex float, (6.0,7.0))
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-return-1_x.c b/gcc/testsuite/gcc.dg/compat/scalar-return-1_x.c
index 6525e5e..5556f95 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-1_x.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-1_x.c
@@ -1,7 +1,6 @@
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-return-2_y.c b/gcc/testsuite/gcc.dg/compat/scalar-return-2_y.c
index 1f7d549..485165c 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-2_y.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-2_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-return-3_x.c b/gcc/testsuite/gcc.dg/compat/scalar-return-3_x.c
index 9dceccd..34ced25 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-3_x.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-3_x.c
@@ -1,7 +1,6 @@
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -84,9 +83,11 @@ testit##NAME (void)						\
   DEBUG_NL;							\
 }
 
+#ifndef SKIP_COMPLEX_INT
 T(ci, _Complex int, (2,3))
 T(cl, _Complex long, (3,4))
 T(cll, _Complex long long, (4,5))
+#endif
 T(cd, _Complex double, (2.0,3.0))
 T(cld, _Complex long double, (3.0,4.0))
 
@@ -99,9 +100,11 @@ DEBUG_INIT
 
 #define T(NAME) testit##NAME ();
 
+#ifndef SKIP_COMPLEX_INT
 T(ci)
 T(cl)
 T(cll)
+#endif
 T(cd)
 T(cld)
 
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-return-3_y.c b/gcc/testsuite/gcc.dg/compat/scalar-return-3_y.c
index 564866d..5894fd3 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-3_y.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-3_y.c
@@ -62,8 +62,10 @@ testva##NAME (int n, ...)					\
   return rslt;							\
 }
 
+#ifndef SKIP_COMPLEX_INT
 T(ci, _Complex int, (2,3))
 T(cl, _Complex long, (3,4))
 T(cll, _Complex long long, (4,5))
+#endif
 T(cd, _Complex double, (2.0,3.0))
 T(cld, _Complex long double, (3.0,4.0))
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-return-4_x.c b/gcc/testsuite/gcc.dg/compat/scalar-return-4_x.c
index c3b31f8..232b0a7 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-4_x.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-4_x.c
@@ -36,8 +36,10 @@ testit##NAME (void)						\
   DEBUG_NL;							\
 }
 
+#ifndef SKIP_COMPLEX_INT
 T(cc, _Complex char, (0,1))
 T(cs, _Complex short, (1,2))
+#endif
 T(cf, _Complex float, (1.0,2.0))
 
 #undef T
@@ -49,8 +51,10 @@ DEBUG_INIT
 
 #define T(NAME) testit##NAME ();
 
+#ifndef SKIP_COMPLEX_INT
 T(cc)
 T(cs)
+#endif
 T(cf)
 
 DEBUG_FINI
diff --git a/gcc/testsuite/gcc.dg/compat/scalar-return-4_y.c b/gcc/testsuite/gcc.dg/compat/scalar-return-4_y.c
index 5ac68b5..caaa031 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-4_y.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-4_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -38,6 +37,8 @@ test1##NAME (TYPE x01)						\
   return x01;							\
 }
 
+#ifndef SKIP_COMPLEX_INT
 T(cc, _Complex char, (0,1))
 T(cs, _Complex short, (1,2))
+#endif
 T(cf, _Complex float, (1.0,2.0))
diff --git a/gcc/testsuite/gcc.dg/compat/struct-align-1.h b/gcc/testsuite/gcc.dg/compat/struct-align-1.h
index 5283e78..d9006c7 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-align-1.h
+++ b/gcc/testsuite/gcc.dg/compat/struct-align-1.h
@@ -27,6 +27,7 @@ struct B3_orig {
   struct A3_orig a3;
 };
 
+#ifndef SKIP_ATTRIBUTE
 #define DESC_p_all "packed attribute for all"
 struct B1_p_all {
   char c;
@@ -176,3 +177,4 @@ struct B3_m_inner_p_outer {
   char c;
   struct A3_m_inner_p_outer a3;
 } __attribute__ ((packed));
+#endif
diff --git a/gcc/testsuite/gcc.dg/compat/struct-align-1_x.c b/gcc/testsuite/gcc.dg/compat/struct-align-1_x.c
index 1500fa7..6b99ceb 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-align-1_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-align-1_x.c
@@ -64,12 +64,14 @@ return3_##NAME (void)					\
 #define CHECK(NAME) test_##NAME()
 
 SETUP (orig, 49, 1.0, 111111)
+#ifndef SKIP_ATTRIBUTE
 SETUP (p_all, 50, 2.0, 222222)
 SETUP (p_inner, 51, 3.0, 333333)
 SETUP (p_outer, 52, 4.0, 444444)
 SETUP (a_max, 53, 5.0, 555555)
 SETUP (m_outer_p_inner, 54, 6.0, 666666)
 SETUP (m_inner_p_outer, 55, 7.0, 777777) 
+#endif
 
 void
 struct_align_1_x (void)
@@ -77,12 +79,14 @@ struct_align_1_x (void)
   DEBUG_INIT
 
   CHECK (orig);
+#ifndef SKIP_ATTRIBUTE
   CHECK (p_all);
   CHECK (p_inner);
   CHECK (p_outer);
   CHECK (a_max);
   CHECK (m_outer_p_inner);
   CHECK (m_inner_p_outer);
+#endif
 
   DEBUG_FINI
 
diff --git a/gcc/testsuite/gcc.dg/compat/struct-align-1_y.c b/gcc/testsuite/gcc.dg/compat/struct-align-1_y.c
index 744f4de6..c858e10 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-align-1_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-align-1_y.c
@@ -80,9 +80,11 @@ test_##NAME (void)						\
 }
 
 TEST (orig)
+#ifndef SKIP_ATTRIBUTE
 TEST (p_all)
 TEST (p_inner)
 TEST (p_outer)
 TEST (a_max)
 TEST (m_outer_p_inner)
 TEST (m_inner_p_outer)
+#endif
diff --git a/gcc/testsuite/gcc.dg/compat/struct-align-2.h b/gcc/testsuite/gcc.dg/compat/struct-align-2.h
index c97a476..f94fe57 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-align-2.h
+++ b/gcc/testsuite/gcc.dg/compat/struct-align-2.h
@@ -11,6 +11,7 @@ struct epoll_event_orig {
   unsigned long long data;
 };
 
+#ifndef SKIP_ATTRIBUTE
 #define DESC_structmax "maximum useful struct alignment"
 struct epoll_event_structmax {
   unsigned int events;
@@ -71,3 +72,4 @@ struct epoll_event_pdata8 {
   unsigned int events;
   unsigned long long data __attribute__ ((aligned(8)));
 } __attribute__ ((packed));
+#endif
diff --git a/gcc/testsuite/gcc.dg/compat/struct-align-2_x.c b/gcc/testsuite/gcc.dg/compat/struct-align-2_x.c
index e59cec3..47f32d4 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-align-2_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-align-2_x.c
@@ -1,6 +1,6 @@
 /* Disable this test for 16-bit targets.  */
 
-#if __INT_MAX__ > 32767
+#if !(defined __GNUC__) || (__INT_MAX__ > 32767)
 
 #include "compat-common.h"
 #include "struct-align-2.h"
@@ -38,6 +38,7 @@ return_##NAME (void)						\
   test_##NAME()
 
 SETUP (orig,101, 102, 0x0101010101010101ULL)
+#ifndef SKIP_ATTRIBUTE
 SETUP (structmax, 103, 104, 0x1212121212121212ULL)
 SETUP (struct4, 105, 106, 0x2323232323232323ULL)
 SETUP (struct8, 107, 108, 0x3434343434343434ULL)
@@ -48,6 +49,7 @@ SETUP (pstruct4, 115, 116, 0x7878787878787878ULL)
 SETUP (pstruct8, 117, 118, 0x8989898989898989ULL)
 SETUP (pdata4, 119, 120, 0x9A9A9A9A9A9A9A9AULL)
 SETUP (pdata8, 121, 122, 0xABABABABABABABABULL)
+#endif
 
 void
 struct_align_2_x (void)
@@ -55,6 +57,7 @@ struct_align_2_x (void)
   DEBUG_INIT
 
   CHECK (orig);
+#ifndef SKIP_ATTRIBUTE
   CHECK (structmax);
   CHECK (struct4);
   CHECK (struct8);
@@ -65,6 +68,7 @@ struct_align_2_x (void)
   CHECK (pstruct8);
   CHECK (pdata4);
   CHECK (pdata8);
+#endif
 
   DEBUG_FINI
 
diff --git a/gcc/testsuite/gcc.dg/compat/struct-align-2_y.c b/gcc/testsuite/gcc.dg/compat/struct-align-2_y.c
index 0a5ec6e..15b684f 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-align-2_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-align-2_y.c
@@ -1,6 +1,6 @@
 /* Disable this test for 16-bit targets.  */
 
-#if __INT_MAX__ > 32767
+#if !(defined __GNUC__) || (__INT_MAX__ > 32767)
 
 #include "compat-common.h"
 #include "struct-align-2.h"
@@ -51,6 +51,7 @@ test_##NAME (void)						\
 }
 
 TEST (orig)
+#ifndef SKIP_ATTRIBUTE
 TEST (structmax)
 TEST (struct4)
 TEST (struct8)
@@ -61,6 +62,7 @@ TEST (pstruct4)
 TEST (pstruct8)
 TEST (pdata4)
 TEST (pdata8)
+#endif
 
 #else
 
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-10_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-10_y.c
index 30ad45f..6c9589d 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-10_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-10_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-11_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-11_x.c
index b9be4f3..cea1ac0 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-11_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-11_x.c
@@ -4,6 +4,7 @@
 #include "fp-struct-check.h"
 #include "fp-struct-test-by-value-x.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(cc, _Complex char)
 CHECKS(cc, _Complex char)
 
@@ -23,12 +24,14 @@ TEST(Scc13, _Complex char)
 TEST(Scc14, _Complex char)
 TEST(Scc15, _Complex char)
 TEST(Scc16, _Complex char)
+#endif
 
 #undef T
 
 void
 struct_by_value_11_x ()
 {
+#ifndef SKIP_COMPLEX_INT
 DEBUG_INIT
 
 #define T(TYPE, MTYPE) testit##TYPE ();
@@ -56,4 +59,5 @@ if (fails != 0)
   abort ();
 
 #undef T
+#endif
 }
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-11_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-11_y.c
index c0f0ad5..c4e47fc 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-11_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-11_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -13,6 +12,7 @@ const int test_va = 1;
 #include "fp-struct-init.h"
 #include "fp-struct-test-by-value-y.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(cc,_Complex char)
 INITS(cc, _Complex char)
 
@@ -32,3 +32,4 @@ TEST(Scc13, _Complex char)
 TEST(Scc14, _Complex char)
 TEST(Scc15, _Complex char)
 TEST(Scc16, _Complex char)
+#endif
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-12_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-12_x.c
index 6f943b7..925ce92 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-12_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-12_x.c
@@ -4,6 +4,7 @@
 #include "fp-struct-check.h"
 #include "fp-struct-test-by-value-x.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(cs, _Complex short)
 CHECKS(cs, _Complex short)
 
@@ -23,12 +24,14 @@ TEST(Scs13, _Complex short)
 TEST(Scs14, _Complex short)
 TEST(Scs15, _Complex short)
 TEST(Scs16, _Complex short)
+#endif
 
 #undef T
 
 void
 struct_by_value_12_x ()
 {
+#ifndef SKIP_COMPLEX_INT
 DEBUG_INIT
 
 #define T(TYPE, MTYPE) testit##TYPE ();
@@ -56,4 +59,5 @@ if (fails != 0)
   abort ();
 
 #undef T
+#endif
 }
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-12_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-12_y.c
index 50a08b4..2e8e393 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-12_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-12_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -13,6 +12,7 @@ const int test_va = 1;
 #include "fp-struct-init.h"
 #include "fp-struct-test-by-value-y.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(cs,_Complex short)
 INITS(cs, _Complex short)
 
@@ -32,3 +32,4 @@ TEST(Scs13, _Complex short)
 TEST(Scs14, _Complex short)
 TEST(Scs15, _Complex short)
 TEST(Scs16, _Complex short)
+#endif
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-13_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-13_x.c
index 4418522..f27222f 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-13_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-13_x.c
@@ -4,6 +4,7 @@
 #include "fp-struct-check.h"
 #include "fp-struct-test-by-value-x.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(ci, _Complex int)
 CHECKS(ci, _Complex int)
 
@@ -23,12 +24,14 @@ TEST(Sci13, _Complex int)
 TEST(Sci14, _Complex int)
 TEST(Sci15, _Complex int)
 TEST(Sci16, _Complex int)
+#endif
 
 #undef T
 
 void
 struct_by_value_13_x ()
 {
+#ifndef SKIP_COMPLEX_INT
 DEBUG_INIT
 
 #define T(TYPE, MTYPE) testit##TYPE ();
@@ -56,4 +59,5 @@ if (fails != 0)
   abort ();
 
 #undef T
+#endif
 }
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-13_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-13_y.c
index e53ee59..7a3657e 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-13_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-13_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -13,6 +12,7 @@ const int test_va = 1;
 #include "fp-struct-init.h"
 #include "fp-struct-test-by-value-y.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(ci,_Complex int)
 INITS(ci, _Complex int)
 
@@ -32,3 +32,4 @@ TEST(Sci13, _Complex int)
 TEST(Sci14, _Complex int)
 TEST(Sci15, _Complex int)
 TEST(Sci16, _Complex int)
+#endif
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-14_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-14_x.c
index e5dbe73..bb8db70 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-14_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-14_x.c
@@ -4,6 +4,7 @@
 #include "fp-struct-check.h"
 #include "fp-struct-test-by-value-x.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(cl, _Complex long)
 CHECKS(cl, _Complex long)
 
@@ -23,12 +24,14 @@ TEST(Scl13, _Complex long)
 TEST(Scl14, _Complex long)
 TEST(Scl15, _Complex long)
 TEST(Scl16, _Complex long)
+#endif
 
 #undef T
 
 void
 struct_by_value_14_x ()
 {
+#ifndef SKIP_COMPLEX_INT
 DEBUG_INIT
 
 #define T(TYPE, MTYPE) testit##TYPE ();
@@ -56,4 +59,5 @@ if (fails != 0)
   abort ();
 
 #undef T
+#endif
 }
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-14_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-14_y.c
index 640b11b..5abd063 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-14_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-14_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -13,6 +12,7 @@ const int test_va = 1;
 #include "fp-struct-init.h"
 #include "fp-struct-test-by-value-y.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(cl,_Complex long)
 INITS(cl, _Complex long)
 
@@ -32,3 +32,4 @@ TEST(Scl13, _Complex long)
 TEST(Scl14, _Complex long)
 TEST(Scl15, _Complex long)
 TEST(Scl16, _Complex long)
+#endif
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-15_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-15_x.c
index 213568a..4409c96 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-15_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-15_x.c
@@ -4,6 +4,7 @@
 #include "fp-struct-check.h"
 #include "fp-struct-test-by-value-x.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(cll, _Complex long long)
 CHECKS(cll, _Complex long long)
 
@@ -23,12 +24,14 @@ TEST(Scll13, _Complex long long)
 TEST(Scll14, _Complex long long)
 TEST(Scll15, _Complex long long)
 TEST(Scll16, _Complex long long)
+#endif
 
 #undef T
 
 void
 struct_by_value_15_x ()
 {
+#ifndef SKIP_COMPLEX_INT
 DEBUG_INIT
 
 #define T(TYPE, MTYPE) testit##TYPE ();
@@ -56,4 +59,5 @@ if (fails != 0)
   abort ();
 
 #undef T
+#endif
 }
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-15_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-15_y.c
index e7cf60a..a5fec4f 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-15_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-15_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -13,6 +12,7 @@ const int test_va = 1;
 #include "fp-struct-init.h"
 #include "fp-struct-test-by-value-y.h"
 
+#ifndef SKIP_COMPLEX_INT
 DEFS(cll,_Complex long long)
 INITS(cll, _Complex long long)
 
@@ -32,3 +32,4 @@ TEST(Scll13, _Complex long long)
 TEST(Scll14, _Complex long long)
 TEST(Scll15, _Complex long long)
 TEST(Scll16, _Complex long long)
+#endif
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-16_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-16_y.c
index 9aa8c3f..273d7cc 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-16_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-16_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-17_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-17_y.c
index f8e1a6a..a0342a3 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-17_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-17_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-18_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-18_y.c
index 6624193..b69425a 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-18_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-18_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-19_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-19_y.c
index 8b0f1e8..036c6b6 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-19_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-19_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-1_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-1_x.c
index 692af0d..67ac16d 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-1_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-1_x.c
@@ -34,7 +34,10 @@ testit##N (void)						\
 
 extern void abort (void);
 
-T(0) T(1) T(2) T(3) T(4) T(5) T(6) T(7)
+#ifndef SKIP_ZERO_ARRAY
+T(0)
+#endif
+T(1) T(2) T(3) T(4) T(5) T(6) T(7)
 T(8) T(9) T(10) T(11) T(12) T(13) T(14) T(15)
 T(16) T(17) T(18) T(19) T(20) T(21) T(22) T(23)
 T(24) T(25) T(26) T(27) T(28) T(29) T(30) T(31)
@@ -50,7 +53,10 @@ struct_by_value_1_x ()
 {
 #define T(N) testit##N ();
 
-T(0) T(1) T(2) T(3) T(4) T(5) T(6) T(7)
+#ifndef SKIP_ZERO_ARRAY
+T(0)
+#endif
+T(1) T(2) T(3) T(4) T(5) T(6) T(7)
 T(8) T(9) T(10) T(11) T(12) T(13) T(14) T(15)
 T(16) T(17) T(18) T(19) T(20) T(21) T(22) T(23)
 T(24) T(25) T(26) T(27) T(28) T(29) T(30) T(31)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-1_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-1_y.c
index 72eb05a..8370dba 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-1_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-1_y.c
@@ -30,7 +30,10 @@ test##N (struct S##N s1, struct S##N s2,			\
   check##N (s3, 192);						\
 }
 
-T(0) T(1) T(2) T(3) T(4) T(5) T(6) T(7)
+#ifndef SKIP_ZERO_ARRAY
+T(0)
+#endif
+T(1) T(2) T(3) T(4) T(5) T(6) T(7)
 T(8) T(9) T(10) T(11) T(12) T(13) T(14) T(15)
 T(16) T(17) T(18) T(19) T(20) T(21) T(22) T(23)
 T(24) T(25) T(26) T(27) T(28) T(29) T(30) T(31)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-20_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-20_y.c
index 6e02e7d..1a4a677 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-20_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-20_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-2_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-2_x.c
index 48bb0b7..57c6da0 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-2_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-2_x.c
@@ -105,7 +105,9 @@ testit##NAME##N (void)						\
   DEBUG_NL;							\
 }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, uc, unsigned char)
+#endif
 T(1, uc, unsigned char)
 T(2, uc, unsigned char)
 T(3, uc, unsigned char)
@@ -121,7 +123,9 @@ T(12, uc, unsigned char)
 T(13, uc, unsigned char)
 T(14, uc, unsigned char)
 T(15, uc, unsigned char)
+#ifndef SKIP_ZERO_ARRAY
 T(0, us, unsigned short)
+#endif
 T(1, us, unsigned short)
 T(2, us, unsigned short)
 T(3, us, unsigned short)
@@ -137,7 +141,9 @@ T(12, us, unsigned short)
 T(13, us, unsigned short)
 T(14, us, unsigned short)
 T(15, us, unsigned short)
+#ifndef SKIP_ZERO_ARRAY
 T(0, ui, unsigned int)
+#endif
 T(1, ui, unsigned int)
 T(2, ui, unsigned int)
 T(3, ui, unsigned int)
@@ -163,7 +169,9 @@ DEBUG_INIT
 
 #define T(N, NAME, TYPE) testit##NAME##N ();
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, uc, unsigned char)
+#endif
 T(1, uc, unsigned char)
 T(2, uc, unsigned char)
 T(3, uc, unsigned char)
@@ -179,7 +187,9 @@ T(12, uc, unsigned char)
 T(13, uc, unsigned char)
 T(14, uc, unsigned char)
 T(15, uc, unsigned char)
+#ifndef SKIP_ZERO_ARRAY
 T(0, us, unsigned short)
+#endif
 T(1, us, unsigned short)
 T(2, us, unsigned short)
 T(3, us, unsigned short)
@@ -195,7 +205,9 @@ T(12, us, unsigned short)
 T(13, us, unsigned short)
 T(14, us, unsigned short)
 T(15, us, unsigned short)
+#ifndef SKIP_ZERO_ARRAY
 T(0, ui, unsigned int)
+#endif
 T(1, ui, unsigned int)
 T(2, ui, unsigned int)
 T(3, ui, unsigned int)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-2_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-2_y.c
index f5b3c71..3b203fa 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-2_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-2_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -102,7 +101,9 @@ testva##NAME##N (int n, ...)					\
     }								\
 }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, uc, unsigned char)
+#endif
 T(1, uc, unsigned char)
 T(2, uc, unsigned char)
 T(3, uc, unsigned char)
@@ -118,7 +119,9 @@ T(12, uc, unsigned char)
 T(13, uc, unsigned char)
 T(14, uc, unsigned char)
 T(15, uc, unsigned char)
+#ifndef SKIP_ZERO_ARRAY
 T(0, us, unsigned short)
+#endif
 T(1, us, unsigned short)
 T(2, us, unsigned short)
 T(3, us, unsigned short)
@@ -134,7 +137,9 @@ T(12, us, unsigned short)
 T(13, us, unsigned short)
 T(14, us, unsigned short)
 T(15, us, unsigned short)
+#ifndef SKIP_ZERO_ARRAY
 T(0, ui, unsigned int)
+#endif
 T(1, ui, unsigned int)
 T(2, ui, unsigned int)
 T(3, ui, unsigned int)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-3_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-3_y.c
index 571bea8..d5a31c9d 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-3_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-3_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-4_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-4_x.c
index e90b710..def20ce 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-4_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-4_x.c
@@ -129,7 +129,9 @@ void checkScsi (Scsi x, int i)
 void checkScis (Scis x, int i)
 { if (x.c != i/16 || x.i != i+1 || x.s != i+2) DEBUG_CHECK }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Sc)
+#endif
 T(1, Sc)
 T(2, Sc)
 T(3, Sc)
@@ -145,7 +147,9 @@ T(12, Sc)
 T(13, Sc)
 T(14, Sc)
 T(15, Sc)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Ss)
+#endif
 T(1, Ss)
 T(2, Ss)
 T(3, Ss)
@@ -161,7 +165,9 @@ T(12, Ss)
 T(13, Ss)
 T(14, Ss)
 T(15, Ss)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Si)
+#endif
 T(1, Si)
 T(2, Si)
 T(3, Si)
@@ -187,7 +193,9 @@ DEBUG_INIT
 
 #define T(N, TYPE) testit##TYPE##N ();
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Sc)
+#endif
 T(1, Sc)
 T(2, Sc)
 T(3, Sc)
@@ -203,7 +211,9 @@ T(12, Sc)
 T(13, Sc)
 T(14, Sc)
 T(15, Sc)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Ss)
+#endif
 T(1, Ss)
 T(2, Ss)
 T(3, Ss)
@@ -219,7 +229,9 @@ T(12, Ss)
 T(13, Ss)
 T(14, Ss)
 T(15, Ss)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Si)
+#endif
 T(1, Si)
 T(2, Si)
 T(3, Si)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-4_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-4_y.c
index 2541dd0..fe1b095 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-4_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-4_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -107,7 +106,9 @@ testva##TYPE##N (int n, ...)					\
     }								\
 }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Sc)
+#endif
 T(1, Sc)
 T(2, Sc)
 T(3, Sc)
@@ -123,7 +124,9 @@ T(12, Sc)
 T(13, Sc)
 T(14, Sc)
 T(15, Sc)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Ss)
+#endif
 T(1, Ss)
 T(2, Ss)
 T(3, Ss)
@@ -139,7 +142,9 @@ T(12, Ss)
 T(13, Ss)
 T(14, Ss)
 T(15, Ss)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Si)
+#endif
 T(1, Si)
 T(2, Si)
 T(3, Si)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-5_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-5_y.c
index 9290b8f..224d840 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-5_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-5_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-6_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-6_y.c
index b5bc100..4a27b67 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-6_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-6_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-7_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-7_y.c
index ca52a9b..39e46ba 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-7_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-7_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-8_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-8_x.c
index 6fe9ce7..5a376fd 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-8_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-8_x.c
@@ -129,7 +129,9 @@ void checkScsi (Scsi x, int i)
 void checkScis (Scis x, int i)
 { if (x.c != i/16 || x.i != i+1 || x.s != i+2) DEBUG_CHECK }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Ssc)
+#endif
 T(1, Ssc)
 T(2, Ssc)
 T(3, Ssc)
@@ -145,7 +147,9 @@ T(12, Ssc)
 T(13, Ssc)
 T(14, Ssc)
 T(15, Ssc)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Sis)
+#endif
 T(1, Sis)
 T(2, Sis)
 T(3, Sis)
@@ -171,7 +175,9 @@ DEBUG_INIT
 
 #define T(N, TYPE) testit##TYPE##N ();
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Ssc)
+#endif
 T(1, Ssc)
 T(2, Ssc)
 T(3, Ssc)
@@ -187,7 +193,9 @@ T(12, Ssc)
 T(13, Ssc)
 T(14, Ssc)
 T(15, Ssc)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Sis)
+#endif
 T(1, Sis)
 T(2, Sis)
 T(3, Sis)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-8_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-8_y.c
index 9dadfb0..b246fd4 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-8_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-8_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -107,7 +106,9 @@ testva##TYPE##N (int n, ...)					\
     }								\
 }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Ssc)
+#endif
 T(1, Ssc)
 T(2, Ssc)
 T(3, Ssc)
@@ -123,7 +124,9 @@ T(12, Ssc)
 T(13, Ssc)
 T(14, Ssc)
 T(15, Ssc)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Sis)
+#endif
 T(1, Sis)
 T(2, Sis)
 T(3, Sis)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-9_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-9_x.c
index d6e43e75..5bbef77 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-9_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-9_x.c
@@ -132,7 +132,9 @@ void checkScsi (Scsi x, int i)
 void checkScis (Scis x, int i)
 { if (x.c != i/16 || x.i != i+1 || x.s != i+2) DEBUG_CHECK }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Scsi)
+#endif
 T(1, Scsi)
 T(2, Scsi)
 T(3, Scsi)
@@ -148,7 +150,9 @@ T(12, Scsi)
 T(13, Scsi)
 T(14, Scsi)
 T(15, Scsi)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Scis)
+#endif
 T(1, Scis)
 T(2, Scis)
 T(3, Scis)
@@ -174,7 +178,9 @@ DEBUG_INIT
 
 #define T(N, TYPE) testit##TYPE##N ();
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Scsi)
+#endif
 T(1, Scsi)
 T(2, Scsi)
 T(3, Scsi)
@@ -190,7 +196,9 @@ T(12, Scsi)
 T(13, Scsi)
 T(14, Scsi)
 T(15, Scsi)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Scis)
+#endif
 T(1, Scis)
 T(2, Scis)
 T(3, Scis)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-9_y.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-9_y.c
index 5d03404..0f65218 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-9_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-9_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -107,7 +106,9 @@ testva##TYPE##N (int n, ...)					\
     }								\
 }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, Scsi)
+#endif
 T(1, Scsi)
 T(2, Scsi)
 T(3, Scsi)
@@ -123,7 +124,9 @@ T(12, Scsi)
 T(13, Scsi)
 T(14, Scsi)
 T(15, Scsi)
+#ifndef SKIP_ZERO_ARRAY
 T(0, Scis)
+#endif
 T(1, Scis)
 T(2, Scis)
 T(3, Scis)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-return-10_x.c b/gcc/testsuite/gcc.dg/compat/struct-return-10_x.c
index bb417d7..d1531b1 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-return-10_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-return-10_x.c
@@ -75,18 +75,18 @@ testit##TYPE (void)						\
 #include "fp2-struct-defs.h"
 #include "fp2-struct-check.h"
 
-T(Sfd);
-T(Sfl);
-T(Sdf);
-T(Sdl);
-T(Slf);
-T(Sld);
-T(Sfdl);
-T(Sfld);
-T(Sdfl);
-T(Sdlf);
-T(Slfd);
-T(Sldf);
+T(Sfd)
+T(Sfl)
+T(Sdf)
+T(Sdl)
+T(Slf)
+T(Sld)
+T(Sfdl)
+T(Sfld)
+T(Sdfl)
+T(Sdlf)
+T(Slfd)
+T(Sldf)
 
 #undef T
 
diff --git a/gcc/testsuite/gcc.dg/compat/struct-return-10_y.c b/gcc/testsuite/gcc.dg/compat/struct-return-10_y.c
index 2cd9c60..7af4068 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-return-10_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-return-10_y.c
@@ -2,8 +2,7 @@
 
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-return-19_x.c b/gcc/testsuite/gcc.dg/compat/struct-return-19_x.c
index cb3e8a9..0085a9f 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-return-19_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-return-19_x.c
@@ -1,7 +1,6 @@
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-return-20_x.c b/gcc/testsuite/gcc.dg/compat/struct-return-20_x.c
index 685ef6f..be7139f 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-return-20_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-return-20_x.c
@@ -1,7 +1,6 @@
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
diff --git a/gcc/testsuite/gcc.dg/compat/struct-return-2_x.c b/gcc/testsuite/gcc.dg/compat/struct-return-2_x.c
index 4463dc4..590c30a 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-return-2_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-return-2_x.c
@@ -1,7 +1,6 @@
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;
@@ -102,7 +101,9 @@ testit##NAME##N (void)						\
   DEBUG_NL;							\
 }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, uc, unsigned char)
+#endif
 T(1, uc, unsigned char)
 T(2, uc, unsigned char)
 T(3, uc, unsigned char)
@@ -118,7 +119,9 @@ T(12, uc, unsigned char)
 T(13, uc, unsigned char)
 T(14, uc, unsigned char)
 T(15, uc, unsigned char)
+#ifndef SKIP_ZERO_ARRAY
 T(0, us, unsigned short)
+#endif
 T(1, us, unsigned short)
 T(2, us, unsigned short)
 T(3, us, unsigned short)
@@ -134,7 +137,9 @@ T(12, us, unsigned short)
 T(13, us, unsigned short)
 T(14, us, unsigned short)
 T(15, us, unsigned short)
+#ifndef SKIP_ZERO_ARRAY
 T(0, ui, unsigned int)
+#endif
 T(1, ui, unsigned int)
 T(2, ui, unsigned int)
 T(3, ui, unsigned int)
@@ -160,7 +165,9 @@ DEBUG_INIT
 
 #define T(N, NAME, TYPE) testit##NAME##N ();
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, uc, unsigned char)
+#endif
 T(1, uc, unsigned char)
 T(2, uc, unsigned char)
 T(3, uc, unsigned char)
@@ -176,7 +183,9 @@ T(12, uc, unsigned char)
 T(13, uc, unsigned char)
 T(14, uc, unsigned char)
 T(15, uc, unsigned char)
+#ifndef SKIP_ZERO_ARRAY
 T(0, us, unsigned short)
+#endif
 T(1, us, unsigned short)
 T(2, us, unsigned short)
 T(3, us, unsigned short)
@@ -192,7 +201,9 @@ T(12, us, unsigned short)
 T(13, us, unsigned short)
 T(14, us, unsigned short)
 T(15, us, unsigned short)
+#ifndef SKIP_ZERO_ARRAY
 T(0, ui, unsigned int)
+#endif
 T(1, ui, unsigned int)
 T(2, ui, unsigned int)
 T(3, ui, unsigned int)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-return-2_y.c b/gcc/testsuite/gcc.dg/compat/struct-return-2_y.c
index d8bdcc2..7d7df8e 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-return-2_y.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-return-2_y.c
@@ -70,7 +70,9 @@ testva##NAME##N (int n, ...)					\
   return rslt;							\
 }
 
+#ifndef SKIP_ZERO_ARRAY
 T(0, uc, unsigned char)
+#endif
 T(1, uc, unsigned char)
 T(2, uc, unsigned char)
 T(3, uc, unsigned char)
@@ -86,7 +88,9 @@ T(12, uc, unsigned char)
 T(13, uc, unsigned char)
 T(14, uc, unsigned char)
 T(15, uc, unsigned char)
+#ifndef SKIP_ZERO_ARRAY
 T(0, us, unsigned short)
+#endif
 T(1, us, unsigned short)
 T(2, us, unsigned short)
 T(3, us, unsigned short)
@@ -102,7 +106,9 @@ T(12, us, unsigned short)
 T(13, us, unsigned short)
 T(14, us, unsigned short)
 T(15, us, unsigned short)
+#ifndef SKIP_ZERO_ARRAY
 T(0, ui, unsigned int)
+#endif
 T(1, ui, unsigned int)
 T(2, ui, unsigned int)
 T(3, ui, unsigned int)
diff --git a/gcc/testsuite/gcc.dg/compat/struct-return-3_x.c b/gcc/testsuite/gcc.dg/compat/struct-return-3_x.c
index e8b1885..e985f91 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-return-3_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-return-3_x.c
@@ -1,7 +1,6 @@
 #include "compat-common.h"
 
-/* Turn off checking for variable arguments with -DSKIPVA.  */
-#ifdef SKIPVA
+#ifdef SKIP_VA
 const int test_va = 0;
 #else
 const int test_va = 1;