compat-common.h: New file.

	* gcc.dg/compat/compat-common.h: New file.
	* gcc.dg/compat/fp-struct-check.h: Improve debugging output.
	* gcc.dg/compat/fp-struct-test-by-value-x.h: Ditto.
	* gcc.dg/compat/fp-struct-test-by-value-y.h: Ditto.
	* gcc.dg/compat/scalar-by-value-1_main.c: Ditto.
	* gcc.dg/compat/scalar-by-value-1_x.c: Ditto.
	* gcc.dg/compat/scalar-by-value-1_y.c: Ditto.
	* gcc.dg/compat/scalar-by-value-2_main.c: Ditto.
	* gcc.dg/compat/scalar-by-value-2_x.c: Ditto.
	* gcc.dg/compat/scalar-by-value-2_y.c: Ditto.
	* gcc.dg/compat/scalar-return-1_main.c: Ditto.
	* gcc.dg/compat/scalar-return-1_x.c: Ditto.
	* gcc.dg/compat/scalar-return-1_y.c: Ditto.
	* gcc.dg/compat/scalar-return-2_main.c: Ditto.
	* gcc.dg/compat/scalar-return-2_x.c: Ditto.
	* gcc.dg/compat/scalar-return-2_y.c: Ditto.
	* gcc.dg/compat/small-struct-check.h: Ditto.
	* gcc.dg/compat/struct-by-value-2_main.c: Ditto.
	* gcc.dg/compat/struct-by-value-2_x.c: Ditto.
	* gcc.dg/compat/struct-by-value-2_y.c: Ditto.
	* gcc.dg/compat/struct-by-value-3_main.c: Ditto.
	* gcc.dg/compat/struct-by-value-3_x.c: Ditto.
	* gcc.dg/compat/struct-by-value-3_y.c: Ditto.
	* gcc.dg/compat/struct-by-value-4_main.c: Ditto.
	* gcc.dg/compat/struct-by-value-4_x.c: Ditto.
	* gcc.dg/compat/struct-by-value-4_y.c: Ditto.
	* gcc.dg/compat/struct-by-value-5_main.c: Ditto.
	* gcc.dg/compat/struct-by-value-5_x.c: Ditto.
	* gcc.dg/compat/struct-by-value-5_y.c: Ditto.
	* gcc.dg/compat/struct-by-value-6_main.c: Ditto.
	* gcc.dg/compat/struct-by-value-6_x.c: Ditto.
	* gcc.dg/compat/struct-by-value-6_y.c: Ditto.
	* gcc.dg/compat/struct-by-value-7_main.c: Ditto.
	* gcc.dg/compat/struct-by-value-7_x.c: Ditto.
	* gcc.dg/compat/struct-by-value-7_y.c: Ditto.
	* gcc.dg/compat/struct-by-value-8_main.c: Ditto.
	* gcc.dg/compat/struct-by-value-8_x.c: Ditto.
	* gcc.dg/compat/struct-by-value-8_y.c: Ditto.
	* gcc.dg/compat/struct-by-value-9_main.c: Ditto.
	* gcc.dg/compat/struct-by-value-9_x.c: Ditto.
	* gcc.dg/compat/struct-by-value-9_y.c: Ditto.
	* gcc.dg/compat/struct-return-2_main.c: Ditto.
	* gcc.dg/compat/struct-return-2_x.c: Ditto.
	* gcc.dg/compat/struct-return-2_y.c: Ditto.
	* gcc.dg/compat/struct-return-3_main.c: Ditto.
	* gcc.dg/compat/struct-return-3_x.c: Ditto.
	* gcc.dg/compat/struct-return-3_y.c: Ditto.

From-SVN: r67724

1 files changed, 30 insertions, 15 deletions

diff --git a/gcc/testsuite/gcc.dg/compat/struct-by-value-3_x.c b/gcc/testsuite/gcc.dg/compat/struct-by-value-3_x.c
index 3eaa034..4490f48 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-by-value-3_x.c
+++ b/gcc/testsuite/gcc.dg/compat/struct-by-value-3_x.c
@@ -1,13 +1,4 @@
-#ifdef DBG
-#include <stdio.h>
-#define DEBUG_FPUTS(x) fputs (x, stdout)
-#define DEBUG_DOT putc ('.', stdout)
-#define DEBUG_NL putc ('\n', stdout)
-#else
-#define DEBUG_FPUTS(x)
-#define DEBUG_DOT
-#define DEBUG_NL
-#endif
+#include "compat-common.h"
 
 #define T(TYPE)							\
 TYPE g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE;		\
@@ -38,6 +29,7 @@ void								\
 testit##TYPE (void)						\
 {								\
   DEBUG_FPUTS (#TYPE);						\
+  DEBUG_FPUTS (" init: ");					\
   init##TYPE  ( &g1s##TYPE,  1);				\
   init##TYPE  ( &g2s##TYPE,  2);				\
   init##TYPE  ( &g3s##TYPE,  3);				\
@@ -55,76 +47,96 @@ testit##TYPE (void)						\
   init##TYPE  (&g15s##TYPE, 15);				\
   init##TYPE  (&g16s##TYPE, 16);				\
   checkg##TYPE ();						\
-  DEBUG_FPUTS (" test");					\
+  DEBUG_NL;							\
+  DEBUG_FPUTS (#TYPE);						\
+  DEBUG_FPUTS (" test: ");					\
   test##TYPE (g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 	      g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 	      g9s##TYPE, g10s##TYPE, g11s##TYPE, g12s##TYPE,	\
 	      g13s##TYPE, g14s##TYPE, g15s##TYPE, g16s##TYPE);	\
-  DEBUG_FPUTS (" testva");					\
+  DEBUG_NL;							\
+  DEBUG_FPUTS (#TYPE);						\
+  DEBUG_FPUTS (" testva:");					\
+  DEBUG_NL;							\
   testva##TYPE (1,						\
 		g1s##TYPE);					\
+  DEBUG_NL;							\
   testva##TYPE (2,						\
 		g1s##TYPE, g2s##TYPE);				\
+  DEBUG_NL;							\
   testva##TYPE (3,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE);		\
+  DEBUG_NL;							\
   testva##TYPE (4,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE);	\
+  DEBUG_NL;							\
   testva##TYPE (5,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE);					\
+  DEBUG_NL;							\
   testva##TYPE (6,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE);				\
+  DEBUG_NL;							\
   testva##TYPE (7,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE);		\
+  DEBUG_NL;							\
   testva##TYPE (8,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE);	\
+  DEBUG_NL;							\
   testva##TYPE (9,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 		g9s##TYPE);					\
+  DEBUG_NL;							\
   testva##TYPE (10,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 		g9s##TYPE, g10s##TYPE);				\
+  DEBUG_NL;							\
   testva##TYPE (11,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 		g9s##TYPE, g10s##TYPE, g11s##TYPE);		\
+  DEBUG_NL;							\
   testva##TYPE (12,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 		g9s##TYPE, g10s##TYPE, g11s##TYPE, g12s##TYPE);	\
+  DEBUG_NL;							\
   testva##TYPE (13,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 		g9s##TYPE, g10s##TYPE, g11s##TYPE, g12s##TYPE,	\
 		g13s##TYPE);					\
+  DEBUG_NL;							\
   testva##TYPE (14,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 		g9s##TYPE, g10s##TYPE, g11s##TYPE, g12s##TYPE,	\
 		g13s##TYPE, g14s##TYPE);			\
+  DEBUG_NL;							\
   testva##TYPE (15,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 		g9s##TYPE, g10s##TYPE, g11s##TYPE, g12s##TYPE,	\
 		g13s##TYPE, g14s##TYPE, g15s##TYPE);		\
+  DEBUG_NL;							\
   testva##TYPE (16,						\
 		g1s##TYPE, g2s##TYPE, g3s##TYPE, g4s##TYPE,	\
 		g5s##TYPE, g6s##TYPE, g7s##TYPE, g8s##TYPE,	\
 		g9s##TYPE, g10s##TYPE, g11s##TYPE, g12s##TYPE,	\
 		g13s##TYPE, g14s##TYPE, g15s##TYPE, g16s##TYPE); \
-  DEBUG_FPUTS (" test2");					\
+  DEBUG_NL;							\
+  DEBUG_FPUTS (#TYPE);						\
+  DEBUG_FPUTS (" test2:");					\
   test2_##TYPE (g1s##TYPE, g3s##TYPE, g5s##TYPE, g7s##TYPE,	\
 		g9s##TYPE, g11s##TYPE, g13s##TYPE, g15s##TYPE);	\
   DEBUG_NL;							\
 }
 
-extern void abort (void);
-
 #include "small-struct-defs.h"
 #include "small-struct-check.h"
 
@@ -167,5 +179,8 @@ T(Ssic)
 T(Sisc)
 T(Sics)
 
+if (fails != 0)
+  abort ();
+
 #undef T
 }