diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f7e42f1587d62354442bf75a25f2b5525f8dd638..c948f43c2cb4c8fb884e7cef5e9856357694f3dc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/compat/compat-common.h (CINT, CDBL): Define.
+	* gcc.dg/compat/scalar-return-3_x.c: Use it.
+	* gcc.dg/compat/scalar-return-3_y.c: Use it.
+	* gcc.dg/compat/scalar-return-4_x.c: Use it.
+	* gcc.dg/compat/scalar-return-4_y.c: Use it.
+	* gcc.dg/compat/scalar-by-value-3_x.c: Use it.
+	* gcc.dg/compat/scalar-by-value-3_y.c: Use it.
+	* gcc.dg/compat/scalar-by-value-4_x.c: Use it.
+	* gcc.dg/compat/scalar-by-value-4_y.c: Use it.
+
 2004-06-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.dg/range-test-1.c: New test.
diff --git a/gcc/testsuite/gcc.dg/compat/compat-common.h b/gcc/testsuite/gcc.dg/compat/compat-common.h
index 95b945fae416c25051e62a5c6c437df858d43244..a109c1ed1f2df2c17be6d787c494d8e0488aaf85 100644
--- a/gcc/testsuite/gcc.dg/compat/compat-common.h
+++ b/gcc/testsuite/gcc.dg/compat/compat-common.h
@@ -24,5 +24,14 @@
 #define DEBUG_FINI
 #endif
 
+#ifdef __GNUC__
+#define CINT(x, y) (x + __extension__ y##i)
+#define CDBL(x, y) (x + __extension__ y##i)
+#else
+#include <complex.h>
+#define CINT(x, y) ((_Complex int) (x + y * _Complex_I))
+#define CDBL(x, y) (x + y * _Complex_I)
+#endif
+
 extern void abort (void);
 extern int fails;
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 6d20fef1d326734df426831f333ca30afb863ed7..6f550b4baec434d81050cf8a0e3640f07be30487 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
@@ -145,12 +145,12 @@ testit##NAME (void)						\
 }
 
 #ifndef SKIP_COMPLEX_INT
-T(ci, _Complex int, (2,3))
-T(cl, _Complex long, (3,4))
-T(cll, _Complex long long, (5,6))
+T(ci, _Complex int, CINT (2, 3))
+T(cl, _Complex long, CINT (3, 4))
+T(cll, _Complex long long, CINT (5, 6))
 #endif
-T(cd, _Complex double, (7.0,8.0))
-T(cld, _Complex long double, (8.0,9.0))
+T(cd, _Complex double, CDBL (7.0, 8.0))
+T(cld, _Complex long double, CDBL (8.0, 9.0))
 
 #undef T
 
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 7c6822af993e9ce187636bc174951b9d1af9ae5e..1e12cc92c625d55e0e10f10a21c1adeccab36b97 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
@@ -85,9 +85,9 @@ 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))
+T(ci, _Complex int, CINT (2, 3))
+T(cl, _Complex long, CINT (3, 4))
+T(cll, _Complex long long, CINT (5, 6))
 #endif
-T(cd, _Complex double, (7.0,8.0))
-T(cld, _Complex long double, (8.0,9.0))
+T(cd, _Complex double, CDBL (7.0, 8.0))
+T(cld, _Complex long double, CDBL (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 20f58d20ea7474a3ac3efcc912a78ac1b1721f69..adc8ece569062a7eb7df52089fa1013959a33ff1 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
@@ -69,10 +69,10 @@ testit##NAME (void)						\
 }
 
 #ifndef SKIP_COMPLEX_INT
-T(cc, _Complex char, (0,1))
-T(cs, _Complex short, (1,2))
+T(cc, _Complex char, CINT (0, 1))
+T(cs, _Complex short, CINT (1, 2))
 #endif
-T(cf, _Complex float, (6.0,7.0))
+T(cf, _Complex float, CDBL (6.0, 7.0))
 
 #undef T
 
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 8205b8259891fa3e0bf1f58b3c1270a6d1c5882d..0db32ab53c97746eb0f2df412488197b9e08e8eb 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
@@ -68,7 +68,7 @@ test##NAME (TYPE x01, TYPE x02, TYPE x03, TYPE x04,		\
 }
 
 #ifndef SKIP_COMPLEX_INT
-T(cc, _Complex char, (0,1))
-T(cs, _Complex short, (1,2))
+T(cc, _Complex char, CINT (0, 1))
+T(cs, _Complex short, CINT (1, 2))
 #endif
-T(cf, _Complex float, (6.0,7.0))
+T(cf, _Complex float, CDBL (6.0, 7.0))
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 34ced255180fb871c8d4c1099956929cadc63049..c153f6f19dfcd92ee0996f9908e0b9a2d71804f7 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-3_x.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-3_x.c
@@ -84,12 +84,12 @@ testit##NAME (void)						\
 }
 
 #ifndef SKIP_COMPLEX_INT
-T(ci, _Complex int, (2,3))
-T(cl, _Complex long, (3,4))
-T(cll, _Complex long long, (4,5))
+T(ci, _Complex int, CINT (2, 3))
+T(cl, _Complex long, CINT (3, 4))
+T(cll, _Complex long long, CINT (4, 5))
 #endif
-T(cd, _Complex double, (2.0,3.0))
-T(cld, _Complex long double, (3.0,4.0))
+T(cd, _Complex double, CDBL (2.0, 3.0))
+T(cld, _Complex long double, CDBL (3.0, 4.0))
 
 #undef T
 
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 5894fd397066d823393e2a7629c0322db439b04b..31dddd0a033f950006e88fcb6a5d2bb82b46afcd 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-3_y.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-3_y.c
@@ -63,9 +63,9 @@ 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, (4,5))
+T(ci, _Complex int, CINT (2, 3))
+T(cl, _Complex long, CINT (3, 4))
+T(cll, _Complex long long, CINT (4, 5))
 #endif
-T(cd, _Complex double, (2.0,3.0))
-T(cld, _Complex long double, (3.0,4.0))
+T(cd, _Complex double, CDBL (2.0, 3.0))
+T(cld, _Complex long double, CDBL (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 232b0a700adbaa4fb7ac3085a6d5ca44e41de1f7..0ea764958d003d898f1dd706c86364667c062f3a 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-4_x.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-4_x.c
@@ -37,10 +37,10 @@ testit##NAME (void)						\
 }
 
 #ifndef SKIP_COMPLEX_INT
-T(cc, _Complex char, (0,1))
-T(cs, _Complex short, (1,2))
+T(cc, _Complex char, CINT (0, 1))
+T(cs, _Complex short, CINT (1 + 2))
 #endif
-T(cf, _Complex float, (1.0,2.0))
+T(cf, _Complex float, CDBL (1.0, 2.0))
 
 #undef T
 
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 caaa031b3b535bd7d4e4334f47605e2a6c6f9ca8..175fb6ccb50b0304581a3213c8f66e5946fd5c4b 100644
--- a/gcc/testsuite/gcc.dg/compat/scalar-return-4_y.c
+++ b/gcc/testsuite/gcc.dg/compat/scalar-return-4_y.c
@@ -38,7 +38,7 @@ test1##NAME (TYPE x01)						\
 }
 
 #ifndef SKIP_COMPLEX_INT
-T(cc, _Complex char, (0,1))
-T(cs, _Complex short, (1,2))
+T(cc, _Complex char, CINT (0, 1))
+T(cs, _Complex short, CINT (1, 2))
 #endif
-T(cf, _Complex float, (1.0,2.0))
+T(cf, _Complex float, CDBL (1.0, 2.0))