[PATCH] Testcases for 4.1/HEAD

Jakub Jelinek jakub@redhat.com
Fri Nov 25 20:17:00 GMT 2005


Hi!

Attached are testcases that were added over time to redhat/gcc-4_0-branch,
ported to 4.1/HEAD.  Except gcc41-test-c++-struct_layout.patch
all pass on all architectures I have tested
({i386,x86_64,ia64,ppc,ppc64,s390,s390x}-linux),
gcc41-test-c++-struct_layout.patch has all the recent changes
to gcc.dg/compat/struct_layout* incorporated to it and has just a few
failures on some of the architectures (passes completely e.g. on x86_64
and ppc64), but I think so does gcc.dg/compat/struct_layout.exp testsuite
ATM.
I have also run the testsuite with ALT_CC_UNDER_TEST=gcc and
ALT_CXX_UNDER_TEST=g++ against installed redhat/gcc-4_0-branch compiler
(didn't have time to do the same against vanilla 4.0.x yet, but I believe
there shouldn't be differences).
I haven't looked at the exact details, but
t028 on i386, ppc and s390 failed to compile with 4.1 while 4.0.2-rh
compiled it (therefore it seems to be a compile time regression) and
on s390{,x} there are several tests which have
... cp_compat_x_tst.o-cp_compat_y_alt.o execute
... cp_compat_x_alt.o-cp_compat_y_tst.o execute
failures (which indicate ABI incompatibility), anything known to the
mainframe folks?

Ok for HEAD/4.1?

	Jakub
-------------- next part --------------
2005-11-25  Jakub Jelinek  <jakub@redhat.com>

	* gcc.dg/20050330-2.c: New test.

--- gcc/testsuite/gcc.dg/20050330-2.c	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/gcc.dg/20050330-2.c	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,21 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fprofile-generate" } */
+
+struct S
+{
+  int a;
+  void **b;
+};
+
+void
+foo (struct S *x, int y)
+{
+  if (!x)
+    return;
+  if (y >= x->a)
+    return;
+  x->a--;
+  for (; y < x->a; y++)
+    x->b[y] = x->b[y + 1];
+  x->b[x->a] = (void *) 0;
+}
-------------- next part --------------
2005-11-25  Jakub Jelinek  <jakub@redhat.com>

	* g++.dg/compat/struct-layout-1.exp: New file.
	* g++.dg/compat/struct-layout-1.h: New.
	* g++.dg/compat/struct-layout-1_generate.c: New.
	* g++.dg/compat/struct-layout-1_x1.h: New.
	* g++.dg/compat/struct-layout-1_x2.h: New.
	* g++.dg/compat/struct-layout-1_y1.h: New.
	* g++.dg/compat/struct-layout-1_y2.h: New.

--- gcc/testsuite/g++.dg/compat/struct-layout-1.h	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/compat/struct-layout-1.h	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,497 @@
+#include <limits.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "../../gcc.dg/compat/compat-common.h"
+
+#ifndef SKIP_ATTRIBUTE
+# include "../../gcc.dg/compat/vector-defs.h"
+#else
+typedef int qi;
+typedef int hi;
+typedef int si;
+typedef int di;
+typedef float sf;
+typedef float df;
+typedef int v8qi;
+typedef int v16qi;
+typedef int v2hi;
+typedef int v4hi;
+typedef int v8hi;
+typedef int v2si;
+typedef int v4si;
+typedef int v1di;
+typedef int v2di;
+typedef int v2sf;
+typedef int v4sf;
+typedef int v16sf;
+typedef int v2df;
+typedef int u8qi;
+typedef int u16qi;
+typedef int u2hi;
+typedef int u4hi;
+typedef int u8hi;
+typedef int u2si;
+typedef int u4si;
+typedef int u1di;
+typedef int u2di;
+typedef int u2sf;
+typedef int u4sf;
+typedef int u16sf;
+typedef int u2df;
+#endif
+#if (defined __i386__ || defined __x86_64__) && !defined SKIP_ATTRIBUTE
+# ifdef __MMX__
+#  include <mmintrin.h>
+# else
+typedef int __m64;
+# endif
+# ifdef __SSE__
+#  include <xmmintrin.h>
+# else
+typedef int __m128;
+# endif
+#else
+typedef int __m64;
+typedef int __m128;
+#endif
+
+#define FLDS_MAX	32
+extern struct Info
+{
+  int nfields, nbitfields;
+  void *sp, *a0p, *a3p;
+  void *flds[FLDS_MAX];
+  size_t sz, sizes[FLDS_MAX];
+  size_t als, ala0, ala3, aligns[FLDS_MAX];
+} info;
+
+extern int intarray[256];
+extern int fn0 (void), fn1 (void), fn2 (void), fn3 (void), fn4 (void);
+extern int fn5 (void), fn6 (void), fn7 (void), fn8 (void), fn9 (void);
+
+#ifdef DBG
+#define FAIL(n, m) printf ("fail %d.%d\n", n, m), ++fails
+#else
+#define FAIL(n, m) ++fails
+#endif
+
+#ifdef SKIP_ATTRIBUTE
+# define __attribute__(x)
+#endif
+#define atal		__attribute__((aligned))
+#define atpa		__attribute__((packed))
+#define atalpa		__attribute__((aligned, packed))
+#define atpaal		__attribute__((packed, aligned))
+#define atal1		__attribute__((aligned (1)))
+#define atal2		__attribute__((aligned (2)))
+#define atal4		__attribute__((aligned (4)))
+#define atal8		__attribute__((aligned (8)))
+#define atal16		__attribute__((aligned (16)))
+#define atal1pa		__attribute__((aligned (1), packed))
+#define atal2pa		__attribute__((aligned (2), packed))
+#define atal4pa		__attribute__((aligned (4), packed))
+#define atal8pa		__attribute__((aligned (8), packed))
+#define atal16pa	__attribute__((aligned (16), packed))
+#define atpaal1		__attribute__((packed, aligned (1)))
+#define atpaal2		__attribute__((packed, aligned (2)))
+#define atpaal4		__attribute__((packed, aligned (4)))
+#define atpaal8		__attribute__((packed, aligned (8)))
+#define atpaal16	__attribute__((packed, aligned (16)))
+
+#if UCHAR_MAX == 255 && USHORT_MAX == 65535 && UINT_MAX == 4294967295U \
+    && ULLONG_MAX == 18446744073709551615ULL
+/* For ILP32 and LP64 targets, assume float is at least 32-bit
+   and double plus long double at least 64-bit.  */
+# define atalx1		atal1
+# define atalx2		atal2
+# define atalx4		atal4
+# define atalx8		atal8
+# define atalx16	atal16
+# define atalx1pa	atal1pa
+# define atalx2pa	atal2pa
+# define atalx4pa	atal4pa
+# define atalx8pa	atal8pa
+# define atalx16pa	atal16pa
+# define atpaalx1	atpaal1
+# define atpaalx2	atpaal2
+# define atpaalx4	atpaal4
+# define atpaalx8	atpaal8
+# define atpaalx16	atpaal16
+# if ULONG_MAX > 4294967295UL
+#  define ataly8	atal8
+#  define ataly8pa	atal8pa
+#  define atpaaly8	atpaal8
+#  define ataly16	atal16
+#  define ataly16pa	atal16pa
+#  define atpaaly16	atpaal16
+# else
+#  define ataly8
+#  define ataly8pa
+#  define atpaaly8
+#  define ataly16
+#  define ataly16pa
+#  define atpaaly16
+# endif
+#else
+# define atalx1
+# define atalx2
+# define atalx4
+# define atalx8
+# define atalx16
+# define atalx1pa
+# define atalx2pa
+# define atalx4pa
+# define atalx8pa
+# define atalx16pa
+# define atpaalx1
+# define atpaalx2
+# define atpaalx4
+# define atpaalx8
+# define atpaalx16
+# define ataly8
+# define ataly8pa
+# define atpaaly8
+# define ataly16
+# define ataly16pa
+# define atpaaly16
+#endif
+
+#define atQI		__attribute__((mode (QI)))
+#define atHI		__attribute__((mode (HI)))
+#define atSI		__attribute__((mode (SI)))
+#define atDI		__attribute__((mode (DI)))
+
+enum E0 { e0_0 };
+enum E1 { e1_0, e1_1 };
+enum E2 { e2_m3 = -3, e2_m2, e2_m1, e2_0, e2_1, e2_2, e2_3 };
+enum E3 { e3_m127 = -127, e3_m126, e3_m125, e3_0 = 0, e3_125 = 125, e3_126, e3_127 };
+enum E4 { e4_0, e4_1, e4_2, e4_3, e4_253 = 253, e4_254, e4_255 };
+enum E5 { e5_m32767 = -32767, e5_m32766, e5_m32765, e5_0 = 0, e5_32765 = 32765, e5_32766, e5_32767 };
+enum E6 { e6_0, e6_1, e6_2, e6_3, e6_65533 = 65533, e6_65534, e6_65535 };
+enum E7 { e7_m2147483647 = -2147483647, e7_m2147483646, e7_m2147483645,
+	  e7_0, e7_2147483645 = 2147483645, e7_2147483646, e7_2147483647 };
+enum E8 { e8_0, e8_1, e8_2, e8_3, e8_4294967293 = 4294967293U, e8_4294967294, e8_4294967295 };
+enum E9 { e9_m1099511627775 = -1099511627775LL, e9_m1099511627774, e9_m1099511627773,
+	  e9_0, e9_1099511627773 = 1099511627773LL, e9_1099511627774, e9_1099511627775 };
+
+typedef char Tchar;
+typedef signed char Tschar;
+typedef unsigned char Tuchar;
+typedef short int Tshort;
+typedef unsigned short int Tushort;
+typedef int Tint;
+typedef unsigned int Tuint;
+typedef long int Tlong;
+typedef unsigned long int Tulong;
+typedef long long int Tllong;
+typedef unsigned long long int Tullong;
+typedef float Tfloat;
+typedef double Tdouble;
+typedef long double Tldouble;
+typedef _Complex float Tcfloat;
+typedef _Complex double Tcdouble;
+typedef _Complex long double Tcldouble;
+typedef bool Tbool;
+typedef enum E0 TE0;
+typedef enum E1 TE1;
+typedef enum E2 TE2;
+typedef enum E3 TE3;
+typedef enum E4 TE4;
+typedef enum E5 TE5;
+typedef enum E6 TE6;
+typedef enum E7 TE7;
+typedef enum E8 TE8;
+typedef enum E9 TE9;
+typedef void *Tptr;
+typedef char *Tcptr;
+typedef int *Tiptr;
+typedef char Talchar atal;
+typedef signed char Talschar atal;
+typedef unsigned char Taluchar atal;
+typedef short int Talshort atal;
+typedef unsigned short int Talushort atal;
+typedef int Talint atal;
+typedef unsigned int Taluint atal;
+typedef long int Tallong atal;
+typedef unsigned long int Talulong atal;
+typedef long long int Talllong atal;
+typedef unsigned long long int Talullong atal;
+typedef float Talfloat atal;
+typedef double Taldouble atal;
+typedef long double Talldouble atal;
+typedef _Complex float Talcfloat atal;
+typedef _Complex double Talcdouble atal;
+typedef _Complex long double Talcldouble atal;
+typedef bool Talbool atal;
+typedef enum E0 TalE0 atal;
+typedef enum E1 TalE1 atal;
+typedef enum E2 TalE2 atal;
+typedef enum E3 TalE3 atal;
+typedef enum E4 TalE4 atal;
+typedef enum E5 TalE5 atal;
+typedef enum E6 TalE6 atal;
+typedef enum E7 TalE7 atal;
+typedef enum E8 TalE8 atal;
+typedef enum E9 TalE9 atal;
+typedef void *Talptr atal;
+typedef char *Talcptr atal;
+typedef int *Taliptr atal;
+typedef char Tal1char atal1;
+typedef signed char Tal1schar atal1;
+typedef unsigned char Tal1uchar atal1;
+typedef short int Tal1short atal1;
+typedef unsigned short int Tal1ushort atal1;
+typedef int Tal1int atal1;
+typedef unsigned int Tal1uint atal1;
+typedef long int Tal1long atal1;
+typedef unsigned long int Tal1ulong atal1;
+typedef long long int Tal1llong atal1;
+typedef unsigned long long int Tal1ullong atal1;
+typedef float Tal1float atal1;
+typedef double Tal1double atal1;
+typedef long double Tal1ldouble atal1;
+typedef _Complex float Tal1cfloat atal1;
+typedef _Complex double Tal1cdouble atal1;
+typedef _Complex long double Tal1cldouble atal1;
+typedef bool Tal1bool atal1;
+typedef enum E0 Tal1E0 atal1;
+typedef enum E1 Tal1E1 atal1;
+typedef enum E2 Tal1E2 atal1;
+typedef enum E3 Tal1E3 atal1;
+typedef enum E4 Tal1E4 atal1;
+typedef enum E5 Tal1E5 atal1;
+typedef enum E6 Tal1E6 atal1;
+typedef enum E7 Tal1E7 atal1;
+typedef enum E8 Tal1E8 atal1;
+typedef enum E9 Tal1E9 atal1;
+typedef void *Tal1ptr atal1;
+typedef char *Tal1cptr atal1;
+typedef int *Tal1iptr atal1;
+typedef char Tal2char atal2;
+typedef signed char Tal2schar atal2;
+typedef unsigned char Tal2uchar atal2;
+typedef short int Tal2short atal2;
+typedef unsigned short int Tal2ushort atal2;
+typedef int Tal2int atal2;
+typedef unsigned int Tal2uint atal2;
+typedef long int Tal2long atal2;
+typedef unsigned long int Tal2ulong atal2;
+typedef long long int Tal2llong atal2;
+typedef unsigned long long int Tal2ullong atal2;
+typedef float Tal2float atal2;
+typedef double Tal2double atal2;
+typedef long double Tal2ldouble atal2;
+typedef _Complex float Tal2cfloat atal2;
+typedef _Complex double Tal2cdouble atal2;
+typedef _Complex long double Tal2cldouble atal2;
+typedef bool Tal2bool atal2;
+typedef enum E0 Tal2E0 atal2;
+typedef enum E1 Tal2E1 atal2;
+typedef enum E2 Tal2E2 atal2;
+typedef enum E3 Tal2E3 atal2;
+typedef enum E4 Tal2E4 atal2;
+typedef enum E5 Tal2E5 atal2;
+typedef enum E6 Tal2E6 atal2;
+typedef enum E7 Tal2E7 atal2;
+typedef enum E8 Tal2E8 atal2;
+typedef enum E9 Tal2E9 atal2;
+typedef void *Tal2ptr atal2;
+typedef char *Tal2cptr atal2;
+typedef int *Tal2iptr atal2;
+typedef char Tal4char atal4;
+typedef signed char Tal4schar atal4;
+typedef unsigned char Tal4uchar atal4;
+typedef short int Tal4short atal4;
+typedef unsigned short int Tal4ushort atal4;
+typedef int Tal4int atal4;
+typedef unsigned int Tal4uint atal4;
+typedef long int Tal4long atal4;
+typedef unsigned long int Tal4ulong atal4;
+typedef long long int Tal4llong atal4;
+typedef unsigned long long int Tal4ullong atal4;
+typedef float Tal4float atal4;
+typedef double Tal4double atal4;
+typedef long double Tal4ldouble atal4;
+typedef _Complex float Tal4cfloat atal4;
+typedef _Complex double Tal4cdouble atal4;
+typedef _Complex long double Tal4cldouble atal4;
+typedef bool Tal4bool atal4;
+typedef enum E0 Tal4E0 atal4;
+typedef enum E1 Tal4E1 atal4;
+typedef enum E2 Tal4E2 atal4;
+typedef enum E3 Tal4E3 atal4;
+typedef enum E4 Tal4E4 atal4;
+typedef enum E5 Tal4E5 atal4;
+typedef enum E6 Tal4E6 atal4;
+typedef enum E7 Tal4E7 atal4;
+typedef enum E8 Tal4E8 atal4;
+typedef enum E9 Tal4E9 atal4;
+typedef void *Tal4ptr atal4;
+typedef char *Tal4cptr atal4;
+typedef int *Tal4iptr atal4;
+typedef char Tal8char atal8;
+typedef signed char Tal8schar atal8;
+typedef unsigned char Tal8uchar atal8;
+typedef short int Tal8short atal8;
+typedef unsigned short int Tal8ushort atal8;
+typedef int Tal8int atal8;
+typedef unsigned int Tal8uint atal8;
+typedef long int Tal8long atal8;
+typedef unsigned long int Tal8ulong atal8;
+typedef long long int Tal8llong atal8;
+typedef unsigned long long int Tal8ullong atal8;
+typedef float Tal8float atal8;
+typedef double Tal8double atal8;
+typedef long double Tal8ldouble atal8;
+typedef _Complex float Tal8cfloat atal8;
+typedef _Complex double Tal8cdouble atal8;
+typedef _Complex long double Tal8cldouble atal8;
+typedef bool Tal8bool atal8;
+typedef enum E0 Tal8E0 atal8;
+typedef enum E1 Tal8E1 atal8;
+typedef enum E2 Tal8E2 atal8;
+typedef enum E3 Tal8E3 atal8;
+typedef enum E4 Tal8E4 atal8;
+typedef enum E5 Tal8E5 atal8;
+typedef enum E6 Tal8E6 atal8;
+typedef enum E7 Tal8E7 atal8;
+typedef enum E8 Tal8E8 atal8;
+typedef enum E9 Tal8E9 atal8;
+typedef void *Tal8ptr atal8;
+typedef char *Tal8cptr atal8;
+typedef int *Tal8iptr atal8;
+typedef char Tal16char atal16;
+typedef signed char Tal16schar atal16;
+typedef unsigned char Tal16uchar atal16;
+typedef short int Tal16short atal16;
+typedef unsigned short int Tal16ushort atal16;
+typedef int Tal16int atal16;
+typedef unsigned int Tal16uint atal16;
+typedef long int Tal16long atal16;
+typedef unsigned long int Tal16ulong atal16;
+typedef long long int Tal16llong atal16;
+typedef unsigned long long int Tal16ullong atal16;
+typedef float Tal16float atal16;
+typedef double Tal16double atal16;
+typedef long double Tal16ldouble atal16;
+typedef _Complex float Tal16cfloat atal16;
+typedef _Complex double Tal16cdouble atal16;
+typedef _Complex long double Tal16cldouble atal16;
+typedef bool Tal16bool atal16;
+typedef enum E0 Tal16E0 atal16;
+typedef enum E1 Tal16E1 atal16;
+typedef enum E2 Tal16E2 atal16;
+typedef enum E3 Tal16E3 atal16;
+typedef enum E4 Tal16E4 atal16;
+typedef enum E5 Tal16E5 atal16;
+typedef enum E6 Tal16E6 atal16;
+typedef enum E7 Tal16E7 atal16;
+typedef enum E8 Tal16E8 atal16;
+typedef enum E9 Tal16E9 atal16;
+typedef void *Tal16ptr atal16;
+typedef char *Tal16cptr atal16;
+typedef int *Tal16iptr atal16;
+typedef char Talx1char atalx1;
+typedef signed char Talx1schar atalx1;
+typedef unsigned char Talx1uchar atalx1;
+typedef short int Talx1short atalx1;
+typedef unsigned short int Talx1ushort atalx1;
+typedef int Talx1int atalx1;
+typedef unsigned int Talx1uint atalx1;
+typedef long int Talx1long atalx1;
+typedef unsigned long int Talx1ulong atalx1;
+typedef long long int Talx1llong atalx1;
+typedef unsigned long long int Talx1ullong atalx1;
+typedef float Talx1float atalx1;
+typedef double Talx1double atalx1;
+typedef long double Talx1ldouble atalx1;
+typedef _Complex float Talx1cfloat atalx1;
+typedef _Complex double Talx1cdouble atalx1;
+typedef _Complex long double Talx1cldouble atalx1;
+typedef bool Talx1bool atalx1;
+typedef enum E0 Talx1E0 atalx1;
+typedef enum E1 Talx1E1 atalx1;
+typedef enum E2 Talx1E2 atalx1;
+typedef enum E3 Talx1E3 atalx1;
+typedef enum E4 Talx1E4 atalx1;
+typedef enum E5 Talx1E5 atalx1;
+typedef enum E6 Talx1E6 atalx1;
+typedef enum E7 Talx1E7 atalx1;
+typedef enum E8 Talx1E8 atalx1;
+typedef enum E9 Talx1E9 atalx1;
+typedef void *Talx1ptr atalx1;
+typedef char *Talx1cptr atalx1;
+typedef int *Talx1iptr atalx1;
+typedef short int Talx2short atalx2;
+typedef unsigned short int Talx2ushort atalx2;
+typedef int Talx2int atalx2;
+typedef unsigned int Talx2uint atalx2;
+typedef long int Talx2long atalx2;
+typedef unsigned long int Talx2ulong atalx2;
+typedef long long int Talx2llong atalx2;
+typedef unsigned long long int Talx2ullong atalx2;
+typedef float Talx2float atalx2;
+typedef double Talx2double atalx2;
+typedef long double Talx2ldouble atalx2;
+typedef _Complex float Talx2cfloat atalx2;
+typedef _Complex double Talx2cdouble atalx2;
+typedef _Complex long double Talx2cldouble atalx2;
+typedef enum E0 Talx2E0 atalx2;
+typedef enum E1 Talx2E1 atalx2;
+typedef enum E2 Talx2E2 atalx2;
+typedef enum E3 Talx2E3 atalx2;
+typedef enum E4 Talx2E4 atalx2;
+typedef enum E5 Talx2E5 atalx2;
+typedef enum E6 Talx2E6 atalx2;
+typedef enum E7 Talx2E7 atalx2;
+typedef enum E8 Talx2E8 atalx2;
+typedef enum E9 Talx2E9 atalx2;
+typedef void *Talx2ptr atalx2;
+typedef char *Talx2cptr atalx2;
+typedef int *Talx2iptr atalx2;
+typedef int Talx4int atalx4;
+typedef unsigned int Talx4uint atalx4;
+typedef long int Talx4long atalx4;
+typedef unsigned long int Talx4ulong atalx4;
+typedef long long int Talx4llong atalx4;
+typedef unsigned long long int Talx4ullong atalx4;
+typedef float Talx4float atalx4;
+typedef double Talx4double atalx4;
+typedef long double Talx4ldouble atalx4;
+typedef _Complex float Talx4cfloat atalx4;
+typedef _Complex double Talx4cdouble atalx4;
+typedef _Complex long double Talx4cldouble atalx4;
+typedef enum E0 Talx4E0 atalx4;
+typedef enum E1 Talx4E1 atalx4;
+typedef enum E2 Talx4E2 atalx4;
+typedef enum E3 Talx4E3 atalx4;
+typedef enum E4 Talx4E4 atalx4;
+typedef enum E5 Talx4E5 atalx4;
+typedef enum E6 Talx4E6 atalx4;
+typedef enum E7 Talx4E7 atalx4;
+typedef enum E8 Talx4E8 atalx4;
+typedef enum E9 Talx4E9 atalx4;
+typedef void *Talx4ptr atalx4;
+typedef char *Talx4cptr atalx4;
+typedef int *Talx4iptr atalx4;
+typedef long int Taly8long ataly8;
+typedef unsigned long int Taly8ulong ataly8;
+typedef long long int Talx8llong atalx8;
+typedef unsigned long long int Talx8ullong atalx8;
+typedef double Talx8double atalx8;
+typedef long double Talx8ldouble atalx8;
+typedef _Complex float Talx8cfloat atalx8;
+typedef _Complex double Talx8cdouble atalx8;
+typedef _Complex long double Talx8cldouble atalx8;
+typedef void *Taly8ptr ataly8;
+typedef char *Taly8cptr ataly8;
+typedef int *Taly8iptr ataly8;
+typedef _Complex double Talx16cdouble atalx16;
+typedef _Complex long double Talx16cldouble atalx16;
+typedef int (*Tfnptr) (void);
+
+#define T(n, fields, ops) TX(n, struct, , fields, ({ ops });)
+#define U(n, fields, ops) TX(n, union, , fields, ({ ops });)
--- gcc/testsuite/g++.dg/compat/struct-layout-1.exp	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/compat/struct-layout-1.exp	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,164 @@
+# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# This file was written by Jakub Jelinek, <jakub@redhat.com>
+# Based on compat.exp writte by Janis Johnson, <janis187@us.ibm.com>
+
+
+# Test interoperability of two compilers that follow the same ABI.
+#
+# Break simple tests into two pieces and see that they work when linked
+# together.  If an alternate compiler is specified then the two main
+# pieces of each test are compiled with different compilers.  The
+# alternate compiler must be installed, and is specified by defining
+# ALT_CXX_UNDER_TEST in the environment.
+#
+# struct-layout-1 are generated structure layout interoperability tests,
+# so a generator first needs to be compiled on host, run there and the
+# generated tests then compiled on build and executed on target.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+global GXX_UNDER_TEST
+global ld_library_path
+
+# Load procedures from common libraries. 
+load_lib standard.exp
+load_lib g++.exp
+load_lib target-libpath.exp
+
+#
+# compat-use-alt-compiler -- make the alternate compiler the default
+# 
+proc compat-use-alt-compiler { } {
+    global GXX_UNDER_TEST ALT_CXX_UNDER_TEST
+    global CXXFLAGS
+    global ALWAYS_CXXFLAGS
+    global ld_library_path alt_ld_library_path
+    global same_alt
+
+    # We don't need to do this if the alternate compiler is actually
+    # the same as the compiler under test.
+    if { $same_alt == 0 } then {
+	set GXX_UNDER_TEST $ALT_CXX_UNDER_TEST
+	set CXXFLAGS ""
+	set ALWAYS_CXXFLAGS ""
+	set ld_library_path $alt_ld_library_path
+	set_ld_library_path_env_vars
+    }
+}
+
+#
+# compat-use-tst-compiler -- make compiler under test the default
+#
+proc compat-use-tst-compiler { } {
+    global GXX_UNDER_TEST save_gxx_under_test
+    global CXXFLAGS save_cxxflags
+    global ALWAYS_CXXFLAGS save_always_cxxflags
+    global ld_library_path save_ld_library_path
+    global same_alt
+
+    # We don't need to do this if the alternate compiler is actually
+    # the same as the compiler under test.
+
+    if { $same_alt == 0 } then {
+	set GXX_UNDER_TEST $save_gxx_under_test
+	set CXXFLAGS $save_cxxflags
+	set ALWAYS_CXXFLAGS $save_always_cxxflags
+	set ld_library_path $save_ld_library_path
+	set_ld_library_path_env_vars
+    }
+}
+
+# Load the language-independent compabibility support procedures.
+# This must be done after the compat-use-*-compiler definitions.
+load_lib compat.exp
+
+g++_init
+
+# Save variables for the C++ compiler under test, which each test will
+# change a couple of times.  This must be done after calling g++-init.
+set save_gxx_under_test $GXX_UNDER_TEST
+set save_cxxflags $CXXFLAGS
+set save_always_cxxflags $ALWAYS_CXXFLAGS
+set save_ld_library_path $ld_library_path
+
+# Define an identifier for use with this suite to avoid name conflicts
+# with other compat tests running at the same time.
+set sid "cp_compat"
+
+# Find out whether there is an alternate compiler to test.  If the
+# variable is defined but is set to "same", that means we use the same
+# compiler twice, which is meaningful if the two parts of COMPAT_OPTIONS
+# are different.
+set use_alt 0
+set same_alt 0
+set alt_ld_library_path "."
+if [info exists ALT_CXX_UNDER_TEST] then {
+    set use_alt 1
+    if [string match "same" $ALT_CXX_UNDER_TEST] then {
+	set same_alt 1
+    } else {
+	if [info exists ALT_LD_LIBRARY_PATH] then {
+	    append alt_ld_library_path ":${ALT_LD_LIBRARY_PATH}"
+	}
+    }
+}
+
+set tstobjdir "$tmpdir/g++.dg-struct-layout-1"
+set generator "$tmpdir/g++.dg-struct-layout-1_generate"
+
+set generator_src "$srcdir/$subdir/struct-layout-1_generate.c"
+set generator_src "$generator_src $srcdir/$subdir/../../gcc.dg/compat/generate-random.c"
+set generator_src "$generator_src $srcdir/$subdir/../../gcc.dg/compat/generate-random_r.c"
+set generator_inc "-I$srcdir/$subdir -I$srcdir/../../include"
+set generator_inc "$generator_inc -I$rootme/../libiberty"
+set generator_lib "-L$rootme/../libiberty -liberty"
+set generator_cmd "-o $generator $generator_src $generator_inc $generator_lib"
+
+set status [remote_exec host "$HOSTCC $HOSTCFLAGS $generator_cmd"]
+set status [lindex $status 0]
+if { $status == 0 } then {
+    file delete -force $tstobjdir
+    file mkdir $tstobjdir
+    set generator_args "-s $srcdir/$subdir -d $tstobjdir"
+    if [info exists env(RUN_ALL_COMPAT_TESTS) ] then {
+	set generator_args "$generator_args -n 15000"
+    }
+    set status [remote_exec host "$generator $generator_args"]
+    set status [lindex $status 0]
+    if { $status == 0 } then {
+	foreach src [lsort [find $tstobjdir *_main.C]] {
+	    # If we're only testing specific files and this isn't one
+	    # of them, skip it.
+	    if ![runtest_file_p $runtests $src] then {
+		continue
+	    }
+
+	    compat-execute $src $sid $use_alt
+	}
+    } else {
+	warning "Could not execute g++.dg/compat/struct-layout-1 generator"
+    }
+} else {
+    warning "Could not compile g++.dg/compat/struct-layout-1 generator"
+}
+
+# Restore the original compiler under test.
+compat-use-tst-compiler
--- gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/compat/struct-layout-1_generate.c	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,1450 @@
+/* Structure layout test generator.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Contributed by Jakub Jelinek <jakub@redhat.com>.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
+
+/* Compile with gcc -I$(srcdir)/../include -{I,L}$(objdir)/../libiberty/ \
+   -o struct-layout-1_generate{,.c} generate_random{,_r}.c -liberty */
+
+#include "config.h"
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#include "libiberty.h"
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include "hashtab.h"
+#include "getopt.h"
+/* We use our own pseudo-random number generator, so that it gives the same
+   values on all hosts.  */
+#include "../../gcc.dg/compat/generate-random.h"
+
+#if LLONG_MAX != 9223372036854775807LL && __LONG_LONG_MAX__ != 9223372036854775807LL
+# error Need 64-bit long long
+#endif
+
+enum TYPE
+{
+  TYPE_INT,
+  TYPE_UINT,
+  TYPE_FLOAT,
+  TYPE_SENUM,
+  TYPE_UENUM,
+  TYPE_PTR,
+  TYPE_FNPTR,
+  TYPE_OTHER
+};
+
+struct types
+{
+  const char *name;
+  enum TYPE type;
+  unsigned long long int maxval;
+  char bitfld;
+};
+
+struct types base_types[] = {
+/* As we don't know whether char will be signed or not, just limit ourselves
+   to unsigned values less than maximum signed char value.  */
+{ "char", TYPE_UINT, 127, 'C' },
+{ "signed char", TYPE_INT, 127, 'C' },
+{ "unsigned char", TYPE_UINT, 255, 'C' },
+{ "short int", TYPE_INT, 32767, 'S' },
+{ "unsigned short int", TYPE_UINT, 65535, 'S' },
+{ "int", TYPE_INT, 2147483647, 'I' },
+{ "unsigned int", TYPE_UINT, 4294967295U, 'I' },
+{ "long int", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "unsigned long int", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "long long int", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "unsigned long long int", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "bool", TYPE_UINT, 1, 'B' },
+{ "void *", TYPE_PTR, 0, 0 },
+{ "char *", TYPE_PTR, 0, 0 },
+{ "int *", TYPE_PTR, 0, 0 },
+{ "float", TYPE_FLOAT, 0, 0 },
+{ "double", TYPE_FLOAT, 0, 0 },
+{ "long double", TYPE_FLOAT, 0, 0 },
+#define NTYPES1 18
+{ "Tchar", TYPE_UINT, 127, 'C' },
+{ "Tschar", TYPE_INT, 127, 'C' },
+{ "Tuchar", TYPE_UINT, 255, 'C' },
+{ "Tshort", TYPE_INT, 32767, 'S' },
+{ "Tushort", TYPE_UINT, 65535, 'S' },
+{ "Tint", TYPE_INT, 2147483647, 'I' },
+{ "Tuint", TYPE_UINT, 4294967295U, 'I' },
+{ "Tlong", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Tulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Tllong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Tullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Tbool", TYPE_UINT, 1, 'B' },
+{ "size_t", TYPE_UINT, 18446744073709551615ULL, 0 },
+{ "Tptr", TYPE_PTR, 0, 0 },
+{ "Tcptr", TYPE_PTR, 0, 0 },
+{ "Tiptr", TYPE_PTR, 0, 0 },
+{ "Tfnptr", TYPE_FNPTR, 0, 0 },
+{ "Tfloat", TYPE_FLOAT, 0, 0 },
+{ "Tdouble", TYPE_FLOAT, 0, 0 },
+{ "Tldouble", TYPE_FLOAT, 0, 0 },
+{ "enum E0", TYPE_UENUM, 0, ' ' },
+{ "enum E1", TYPE_UENUM, 1, ' ' },
+{ "enum E2", TYPE_SENUM, 3, ' ' },
+{ "enum E3", TYPE_SENUM, 127, ' ' },
+{ "enum E4", TYPE_UENUM, 255, ' ' },
+{ "enum E5", TYPE_SENUM, 32767, ' ' },
+{ "enum E6", TYPE_UENUM, 65535, ' ' },
+{ "enum E7", TYPE_SENUM, 2147483647, ' ' },
+{ "enum E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "enum E9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "TE0", TYPE_UENUM, 0, ' ' },
+{ "TE1", TYPE_UENUM, 1, ' ' },
+{ "TE2", TYPE_SENUM, 3, ' ' },
+{ "TE3", TYPE_SENUM, 127, ' ' },
+{ "TE4", TYPE_UENUM, 255, ' ' },
+{ "TE5", TYPE_SENUM, 32767, ' ' },
+{ "TE6", TYPE_UENUM, 65535, ' ' },
+{ "TE7", TYPE_SENUM, 2147483647, ' ' },
+{ "TE8", TYPE_UENUM, 4294967295U, ' ' },
+{ "TE9", TYPE_SENUM, 1099511627775LL, ' ' },
+/* vector-defs.h typedefs */
+{ "qi", TYPE_INT, 127, 0 },
+{ "hi", TYPE_INT, 32767, 0 },
+{ "si", TYPE_INT, 2147483647, 0 },
+{ "di", TYPE_INT, 9223372036854775807LL, 0 },
+{ "sf", TYPE_FLOAT, 0, 0 },
+{ "df", TYPE_FLOAT, 0, 0 }
+#define NTYPES2 (sizeof (base_types) / sizeof (base_types[0]))
+};
+struct types vector_types[] = {
+/* vector-defs.h typedefs */
+{ "v8qi", TYPE_OTHER, 0, 0 },
+{ "v16qi", TYPE_OTHER, 0, 0 },
+{ "v2hi", TYPE_OTHER, 0, 0 },
+{ "v4hi", TYPE_OTHER, 0, 0 },
+{ "v8hi", TYPE_OTHER, 0, 0 },
+{ "v2si", TYPE_OTHER, 0, 0 },
+{ "v4si", TYPE_OTHER, 0, 0 },
+{ "v1di", TYPE_OTHER, 0, 0 },
+{ "v2di", TYPE_OTHER, 0, 0 },
+{ "v2sf", TYPE_OTHER, 0, 0 },
+{ "v4sf", TYPE_OTHER, 0, 0 },
+{ "v16sf", TYPE_OTHER, 0, 0 },
+{ "v2df", TYPE_OTHER, 0, 0 },
+{ "u8qi", TYPE_OTHER, 0, 0 },
+{ "u16qi", TYPE_OTHER, 0, 0 },
+{ "u2hi", TYPE_OTHER, 0, 0 },
+{ "u4hi", TYPE_OTHER, 0, 0 },
+{ "u8hi", TYPE_OTHER, 0, 0 },
+{ "u2si", TYPE_OTHER, 0, 0 },
+{ "u4si", TYPE_OTHER, 0, 0 },
+{ "u1di", TYPE_OTHER, 0, 0 },
+{ "u2di", TYPE_OTHER, 0, 0 },
+{ "u2sf", TYPE_OTHER, 0, 0 },
+{ "u4sf", TYPE_OTHER, 0, 0 },
+{ "u16sf", TYPE_OTHER, 0, 0 },
+{ "u2df", TYPE_OTHER, 0, 0 },
+{ "__m64", TYPE_OTHER, 0, 0 },
+{ "__m128", TYPE_OTHER, 0, 0 }
+#define NVTYPES2 (sizeof (vector_types) / sizeof (vector_types[0]))
+};
+struct types attrib_types[] = {
+{ "Talchar", TYPE_UINT, 127, 'C' },
+{ "Talschar", TYPE_INT, 127, 'C' },
+{ "Taluchar", TYPE_UINT, 255, 'C' },
+{ "Talshort", TYPE_INT, 32767, 'S' },
+{ "Talushort", TYPE_UINT, 65535, 'S' },
+{ "Talint", TYPE_INT, 2147483647, 'I' },
+{ "Taluint", TYPE_UINT, 4294967295U, 'I' },
+{ "Tallong", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Talulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Talllong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Talullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Talbool", TYPE_UINT, 1, 'B' },
+{ "Talptr", TYPE_PTR, 0, 0 },
+{ "Talcptr", TYPE_PTR, 0, 0 },
+{ "Taliptr", TYPE_PTR, 0, 0 },
+{ "Talfloat", TYPE_FLOAT, 0, 0 },
+{ "Taldouble", TYPE_FLOAT, 0, 0 },
+{ "Talldouble", TYPE_FLOAT, 0, 0 },
+{ "TalE0", TYPE_UENUM, 0, ' ' },
+{ "TalE1", TYPE_UENUM, 1, ' ' },
+{ "TalE2", TYPE_SENUM, 3, ' ' },
+{ "TalE3", TYPE_SENUM, 127, ' ' },
+{ "TalE4", TYPE_UENUM, 255, ' ' },
+{ "TalE5", TYPE_SENUM, 32767, ' ' },
+{ "TalE6", TYPE_UENUM, 65535, ' ' },
+{ "TalE7", TYPE_SENUM, 2147483647, ' ' },
+{ "TalE8", TYPE_UENUM, 4294967295U, ' ' },
+{ "TalE9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "Tal1char", TYPE_UINT, 127, 'C' },
+{ "Tal1schar", TYPE_INT, 127, 'C' },
+{ "Tal1uchar", TYPE_UINT, 255, 'C' },
+{ "Tal1short", TYPE_INT, 32767, 'S' },
+{ "Tal1ushort", TYPE_UINT, 65535, 'S' },
+{ "Tal1int", TYPE_INT, 2147483647, 'I' },
+{ "Tal1uint", TYPE_UINT, 4294967295U, 'I' },
+{ "Tal1long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Tal1ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Tal1llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Tal1ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Tal1bool", TYPE_UINT, 1, 'B' },
+{ "Tal1ptr", TYPE_PTR, 0, 0 },
+{ "Tal1cptr", TYPE_PTR, 0, 0 },
+{ "Tal1iptr", TYPE_PTR, 0, 0 },
+{ "Tal1float", TYPE_FLOAT, 0, 0 },
+{ "Tal1double", TYPE_FLOAT, 0, 0 },
+{ "Tal1ldouble", TYPE_FLOAT, 0, 0 },
+{ "Tal1E0", TYPE_UENUM, 0, ' ' },
+{ "Tal1E1", TYPE_UENUM, 1, ' ' },
+{ "Tal1E2", TYPE_SENUM, 3, ' ' },
+{ "Tal1E3", TYPE_SENUM, 127, ' ' },
+{ "Tal1E4", TYPE_UENUM, 255, ' ' },
+{ "Tal1E5", TYPE_SENUM, 32767, ' ' },
+{ "Tal1E6", TYPE_UENUM, 65535, ' ' },
+{ "Tal1E7", TYPE_SENUM, 2147483647, ' ' },
+{ "Tal1E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "Tal1E9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "Tal2char", TYPE_UINT, 127, 'C' },
+{ "Tal2schar", TYPE_INT, 127, 'C' },
+{ "Tal2uchar", TYPE_UINT, 255, 'C' },
+{ "Tal2short", TYPE_INT, 32767, 'S' },
+{ "Tal2ushort", TYPE_UINT, 65535, 'S' },
+{ "Tal2int", TYPE_INT, 2147483647, 'I' },
+{ "Tal2uint", TYPE_UINT, 4294967295U, 'I' },
+{ "Tal2long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Tal2ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Tal2llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Tal2ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Tal2bool", TYPE_UINT, 1, 'B' },
+{ "Tal2ptr", TYPE_PTR, 0, 0 },
+{ "Tal2cptr", TYPE_PTR, 0, 0 },
+{ "Tal2iptr", TYPE_PTR, 0, 0 },
+{ "Tal2float", TYPE_FLOAT, 0, 0 },
+{ "Tal2double", TYPE_FLOAT, 0, 0 },
+{ "Tal2ldouble", TYPE_FLOAT, 0, 0 },
+{ "Tal2E0", TYPE_UENUM, 0, ' ' },
+{ "Tal2E1", TYPE_UENUM, 1, ' ' },
+{ "Tal2E2", TYPE_SENUM, 3, ' ' },
+{ "Tal2E3", TYPE_SENUM, 127, ' ' },
+{ "Tal2E4", TYPE_UENUM, 255, ' ' },
+{ "Tal2E5", TYPE_SENUM, 32767, ' ' },
+{ "Tal2E6", TYPE_UENUM, 65535, ' ' },
+{ "Tal2E7", TYPE_SENUM, 2147483647, ' ' },
+{ "Tal2E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "Tal2E9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "Tal4char", TYPE_UINT, 127, 'C' },
+{ "Tal4schar", TYPE_INT, 127, 'C' },
+{ "Tal4uchar", TYPE_UINT, 255, 'C' },
+{ "Tal4short", TYPE_INT, 32767, 'S' },
+{ "Tal4ushort", TYPE_UINT, 65535, 'S' },
+{ "Tal4int", TYPE_INT, 2147483647, 'I' },
+{ "Tal4uint", TYPE_UINT, 4294967295U, 'I' },
+{ "Tal4long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Tal4ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Tal4llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Tal4ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Tal4bool", TYPE_UINT, 1, 'B' },
+{ "Tal4ptr", TYPE_PTR, 0, 0 },
+{ "Tal4cptr", TYPE_PTR, 0, 0 },
+{ "Tal4iptr", TYPE_PTR, 0, 0 },
+{ "Tal4float", TYPE_FLOAT, 0, 0 },
+{ "Tal4double", TYPE_FLOAT, 0, 0 },
+{ "Tal4ldouble", TYPE_FLOAT, 0, 0 },
+{ "Tal4E0", TYPE_UENUM, 0, ' ' },
+{ "Tal4E1", TYPE_UENUM, 1, ' ' },
+{ "Tal4E2", TYPE_SENUM, 3, ' ' },
+{ "Tal4E3", TYPE_SENUM, 127, ' ' },
+{ "Tal4E4", TYPE_UENUM, 255, ' ' },
+{ "Tal4E5", TYPE_SENUM, 32767, ' ' },
+{ "Tal4E6", TYPE_UENUM, 65535, ' ' },
+{ "Tal4E7", TYPE_SENUM, 2147483647, ' ' },
+{ "Tal4E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "Tal4E9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "Tal8char", TYPE_UINT, 127, 'C' },
+{ "Tal8schar", TYPE_INT, 127, 'C' },
+{ "Tal8uchar", TYPE_UINT, 255, 'C' },
+{ "Tal8short", TYPE_INT, 32767, 'S' },
+{ "Tal8ushort", TYPE_UINT, 65535, 'S' },
+{ "Tal8int", TYPE_INT, 2147483647, 'I' },
+{ "Tal8uint", TYPE_UINT, 4294967295U, 'I' },
+{ "Tal8long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Tal8ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Tal8llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Tal8ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Tal8bool", TYPE_UINT, 1, 'B' },
+{ "Tal8ptr", TYPE_PTR, 0, 0 },
+{ "Tal8cptr", TYPE_PTR, 0, 0 },
+{ "Tal8iptr", TYPE_PTR, 0, 0 },
+{ "Tal8float", TYPE_FLOAT, 0, 0 },
+{ "Tal8double", TYPE_FLOAT, 0, 0 },
+{ "Tal8ldouble", TYPE_FLOAT, 0, 0 },
+{ "Tal8E0", TYPE_UENUM, 0, ' ' },
+{ "Tal8E1", TYPE_UENUM, 1, ' ' },
+{ "Tal8E2", TYPE_SENUM, 3, ' ' },
+{ "Tal8E3", TYPE_SENUM, 127, ' ' },
+{ "Tal8E4", TYPE_UENUM, 255, ' ' },
+{ "Tal8E5", TYPE_SENUM, 32767, ' ' },
+{ "Tal8E6", TYPE_UENUM, 65535, ' ' },
+{ "Tal8E7", TYPE_SENUM, 2147483647, ' ' },
+{ "Tal8E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "Tal8E9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "Tal16char", TYPE_UINT, 127, 'C' },
+{ "Tal16schar", TYPE_INT, 127, 'C' },
+{ "Tal16uchar", TYPE_UINT, 255, 'C' },
+{ "Tal16short", TYPE_INT, 32767, 'S' },
+{ "Tal16ushort", TYPE_UINT, 65535, 'S' },
+{ "Tal16int", TYPE_INT, 2147483647, 'I' },
+{ "Tal16uint", TYPE_UINT, 4294967295U, 'I' },
+{ "Tal16long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Tal16ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Tal16llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Tal16ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Tal16bool", TYPE_UINT, 1, 'B' },
+{ "Tal16ptr", TYPE_PTR, 0, 0 },
+{ "Tal16cptr", TYPE_PTR, 0, 0 },
+{ "Tal16iptr", TYPE_PTR, 0, 0 },
+{ "Tal16float", TYPE_FLOAT, 0, 0 },
+{ "Tal16double", TYPE_FLOAT, 0, 0 },
+{ "Tal16ldouble", TYPE_FLOAT, 0, 0 },
+{ "Tal16E0", TYPE_UENUM, 0, ' ' },
+{ "Tal16E1", TYPE_UENUM, 1, ' ' },
+{ "Tal16E2", TYPE_SENUM, 3, ' ' },
+{ "Tal16E3", TYPE_SENUM, 127, ' ' },
+{ "Tal16E4", TYPE_UENUM, 255, ' ' },
+{ "Tal16E5", TYPE_SENUM, 32767, ' ' },
+{ "Tal16E6", TYPE_UENUM, 65535, ' ' },
+{ "Tal16E7", TYPE_SENUM, 2147483647, ' ' },
+{ "Tal16E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "Tal16E9", TYPE_SENUM, 1099511627775LL, ' ' }
+#define NATYPES2 (sizeof (attrib_types) / sizeof (attrib_types[0]))
+};
+
+struct types bitfld_types[NTYPES2];
+int n_bitfld_types;
+struct types aligned_bitfld_types[NATYPES2];
+int n_aligned_bitfld_types;
+
+const char *attributes[] = {
+"atal", 
+"atpa", 
+"atal1", 
+"atal2", 
+"atal4", 
+"atal8", 
+"atal16", 
+#define NATTRIBS1 7
+"atalpa", 
+"atpaal", 
+"atal1pa", 
+"atal2pa", 
+"atal4pa", 
+"atal8pa", 
+"atal16pa", 
+"atpaal1", 
+"atpaal2", 
+"atpaal4", 
+"atpaal8", 
+"atpaal16"
+#define NATTRIBS2 (sizeof (attributes) / sizeof (attributes[0]))
+};
+
+enum ETYPE
+{
+  ETYPE_TYPE,
+  ETYPE_ARRAY,
+  ETYPE_BITFLD,
+  ETYPE_STRUCT,
+  ETYPE_UNION,
+  ETYPE_STRUCT_ARRAY,
+  ETYPE_UNION_ARRAY
+};
+
+struct entry
+{
+#ifdef __GNUC__
+  enum ETYPE etype : 8;
+#else
+  unsigned char etype;
+#endif
+  unsigned short len;
+  unsigned char arr_len;
+  struct types *type;
+  const char *attrib;
+};
+struct types attrib_array_types[] = {
+{ "Talx1char", TYPE_UINT, 127, 'C' },
+{ "Talx1schar", TYPE_INT, 127, 'C' },
+{ "Talx1uchar", TYPE_UINT, 255, 'C' },
+{ "Talx1short", TYPE_INT, 32767, 'S' },
+{ "Talx1ushort", TYPE_UINT, 65535, 'S' },
+{ "Talx1int", TYPE_INT, 2147483647, 'I' },
+{ "Talx1uint", TYPE_UINT, 4294967295U, 'I' },
+{ "Talx1long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Talx1ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Talx1llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Talx1ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Talx1bool", TYPE_UINT, 1, 'B' },
+{ "Talx1ptr", TYPE_PTR, 0, 0 },
+{ "Talx1cptr", TYPE_PTR, 0, 0 },
+{ "Talx1iptr", TYPE_PTR, 0, 0 },
+{ "Talx1float", TYPE_FLOAT, 0, 0 },
+{ "Talx1double", TYPE_FLOAT, 0, 0 },
+{ "Talx1ldouble", TYPE_FLOAT, 0, 0 },
+{ "Talx1E0", TYPE_UENUM, 0, ' ' },
+{ "Talx1E1", TYPE_UENUM, 1, ' ' },
+{ "Talx1E2", TYPE_SENUM, 3, ' ' },
+{ "Talx1E3", TYPE_SENUM, 127, ' ' },
+{ "Talx1E4", TYPE_UENUM, 255, ' ' },
+{ "Talx1E5", TYPE_SENUM, 32767, ' ' },
+{ "Talx1E6", TYPE_UENUM, 65535, ' ' },
+{ "Talx1E7", TYPE_SENUM, 2147483647, ' ' },
+{ "Talx1E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "Talx1E9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "Talx2short", TYPE_INT, 32767, 'S' },
+{ "Talx2ushort", TYPE_UINT, 65535, 'S' },
+{ "Talx2int", TYPE_INT, 2147483647, 'I' },
+{ "Talx2uint", TYPE_UINT, 4294967295U, 'I' },
+{ "Talx2long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Talx2ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Talx2llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Talx2ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Talx2ptr", TYPE_PTR, 0, 0 },
+{ "Talx2cptr", TYPE_PTR, 0, 0 },
+{ "Talx2iptr", TYPE_PTR, 0, 0 },
+{ "Talx2float", TYPE_FLOAT, 0, 0 },
+{ "Talx2double", TYPE_FLOAT, 0, 0 },
+{ "Talx2ldouble", TYPE_FLOAT, 0, 0 },
+{ "Talx2E0", TYPE_UENUM, 0, ' ' },
+{ "Talx2E1", TYPE_UENUM, 1, ' ' },
+{ "Talx2E2", TYPE_SENUM, 3, ' ' },
+{ "Talx2E3", TYPE_SENUM, 127, ' ' },
+{ "Talx2E4", TYPE_UENUM, 255, ' ' },
+{ "Talx2E5", TYPE_SENUM, 32767, ' ' },
+{ "Talx2E6", TYPE_UENUM, 65535, ' ' },
+{ "Talx2E7", TYPE_SENUM, 2147483647, ' ' },
+{ "Talx2E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "Talx2E9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "Talx4int", TYPE_INT, 2147483647, 'I' },
+{ "Talx4uint", TYPE_UINT, 4294967295U, 'I' },
+{ "Talx4long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Talx4ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Talx4llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Talx4ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Talx4ptr", TYPE_PTR, 0, 0 },
+{ "Talx4cptr", TYPE_PTR, 0, 0 },
+{ "Talx4iptr", TYPE_PTR, 0, 0 },
+{ "Talx4float", TYPE_FLOAT, 0, 0 },
+{ "Talx4double", TYPE_FLOAT, 0, 0 },
+{ "Talx4ldouble", TYPE_FLOAT, 0, 0 },
+{ "Talx4E0", TYPE_UENUM, 0, ' ' },
+{ "Talx4E1", TYPE_UENUM, 1, ' ' },
+{ "Talx4E2", TYPE_SENUM, 3, ' ' },
+{ "Talx4E3", TYPE_SENUM, 127, ' ' },
+{ "Talx4E4", TYPE_UENUM, 255, ' ' },
+{ "Talx4E5", TYPE_SENUM, 32767, ' ' },
+{ "Talx4E6", TYPE_UENUM, 65535, ' ' },
+{ "Talx4E7", TYPE_SENUM, 2147483647, ' ' },
+{ "Talx4E8", TYPE_UENUM, 4294967295U, ' ' },
+{ "Talx4E9", TYPE_SENUM, 1099511627775LL, ' ' },
+{ "Taly8long", TYPE_INT, 9223372036854775807LL, 'L' },
+{ "Taly8ulong", TYPE_UINT, 18446744073709551615ULL, 'L' },
+{ "Talx8llong", TYPE_INT, 9223372036854775807LL, 'Q' },
+{ "Talx8ullong", TYPE_UINT, 18446744073709551615ULL, 'Q' },
+{ "Taly8ptr", TYPE_PTR, 0, 0 },
+{ "Taly8cptr", TYPE_PTR, 0, 0 },
+{ "Taly8iptr", TYPE_PTR, 0, 0 },
+{ "Talx8double", TYPE_FLOAT, 0, 0 },
+{ "Talx8ldouble", TYPE_FLOAT, 0, 0 }
+#define NAATYPES2 (sizeof (attrib_array_types) / sizeof (attrib_array_types[0]))
+};
+
+static int idx, limidx, output_one;
+static const char *destdir;
+static const char *srcdir;
+FILE *outfile;
+
+void
+switchfiles (int fields)
+{
+  static int filecnt;
+  static char *destbuf, *destptr;
+  ++filecnt;
+  if (outfile)
+    fclose (outfile);
+  if (output_one)
+    {
+      outfile = stdout;
+      return;
+    }
+  if (destbuf == NULL)
+    {
+      size_t len = strlen (destdir);
+      destbuf = xmalloc (len + 20);
+      memcpy (destbuf, destdir, len);
+      if (!len || destbuf[len - 1] != '/')
+	destbuf[len++] = '/';
+      destptr = destbuf + len;
+    }
+  sprintf (destptr, "t%03d_main.C", filecnt);
+  outfile = fopen (destbuf, "w");
+  if (outfile == NULL)
+    {
+    fail:
+      fputs ("failed to create test files\n", stderr);
+      exit (1);
+    }
+  fprintf (outfile, "\
+/* { dg-options \"-I%s\" } */\n\
+/* { dg-options \"-I%s -fno-common\" { target hppa*-*-hpux* } } */\n\
+/* { dg-options \"-I%s -mno-base-addresses\" { target mmix-*-* } } */\n\
+#include \"struct-layout-1.h\"\n\
+\n\
+#define TX(n, type, attrs, fields, ops) extern void test##n (void);\n\
+#include \"t%03d_test.h\"\n\
+#undef TX\n\
+\n\
+int main (void)\n\
+{\n\
+#define TX(n, type, attrs, fields, ops)   test##n ();\n\
+#include \"t%03d_test.h\"\n\
+#undef TX\n\
+  if (fails)\n\
+    {\n\
+      fflush (stdout);\n\
+      abort ();\n\
+    }\n\
+  exit (0);\n\
+}\n", srcdir, srcdir, srcdir, filecnt, filecnt);
+  fclose (outfile);
+  sprintf (destptr, "t%03d_x.C", filecnt);
+  outfile = fopen (destbuf, "w");
+  if (outfile == NULL)
+    goto fail;
+  fprintf (outfile, "\
+/* { dg-options \"-w -I%s\" } */\n\
+/* { dg-options \"-w -I%s -fno-common\" { target hppa*-*-hpux* } } */\n\
+/* { dg-options \"-I%s -mno-base-addresses\" { target mmix-*-* } } */\n\
+#include \"struct-layout-1_x1.h\"\n\
+#include \"t%03d_test.h\"\n\
+#include \"struct-layout-1_x2.h\"\n\
+#include \"t%03d_test.h\"\n", srcdir, srcdir, srcdir, filecnt, filecnt);
+  fclose (outfile);
+  sprintf (destptr, "t%03d_y.C", filecnt);
+  outfile = fopen (destbuf, "w");
+  if (outfile == NULL)
+    goto fail;
+  fprintf (outfile, "\
+/* { dg-options \"-w -I%s\" } */\n\
+/* { dg-options \"-w -I%s -fno-common\" { target hppa*-*-hpux* } } */\n\
+/* { dg-options \"-I%s -mno-base-addresses\" { target mmix-*-* } } */\n\
+#include \"struct-layout-1_y1.h\"\n\
+#include \"t%03d_test.h\"\n\
+#include \"struct-layout-1_y2.h\"\n\
+#include \"t%03d_test.h\"\n", srcdir, srcdir, srcdir, filecnt, filecnt);
+  fclose (outfile);
+  sprintf (destptr, "t%03d_test.h", filecnt);
+  outfile = fopen (destbuf, "w");
+  if (outfile == NULL)
+    goto fail;
+  if (fields <= 2)
+    limidx = idx + 300;
+  else if (fields <= 4)
+    limidx = idx + 200;
+  else if (fields <= 6)
+    limidx = idx + 100;
+  else
+    limidx = idx + 50;
+}
+
+unsigned long long int
+getrandll (void)
+{
+  unsigned long long int ret;
+  ret = generate_random () & 0xffffff;
+  ret |= (generate_random () & 0xffffffLL) << 24;
+  ret |= ((unsigned long long int) generate_random ()) << 48;
+  return ret;
+}
+
+int
+subfield (struct entry *e, char *letter)
+{
+  int i, type;
+  char buf[20];
+  const char *p;
+  switch (e[0].etype)
+    {
+    case ETYPE_STRUCT:
+    case ETYPE_UNION:
+    case ETYPE_STRUCT_ARRAY:
+    case ETYPE_UNION_ARRAY:
+      type = e[0].attrib ? 1 + (generate_random () & 3) : 0;
+      if (e[0].etype == ETYPE_STRUCT || e[0].etype == ETYPE_STRUCT_ARRAY)
+	p = "struct";
+      else
+	p = "union";
+      if (e[0].etype == ETYPE_STRUCT_ARRAY || e[0].etype == ETYPE_UNION_ARRAY)
+	{
+	  if (e[0].arr_len == 255)
+	    snprintf (buf, 20, "%c[]", *letter);
+	  else
+	    snprintf (buf, 20, "%c[%d]", *letter, e[0].arr_len);
+	}
+      else
+	{
+	  buf[0] = *letter;
+	  buf[1] = '\0';
+	}
+      ++*letter;
+      switch (type)
+	{
+	case 0:
+	case 3:
+	case 4:
+	  fprintf (outfile, "%s{", p);
+	  break;
+	case 1:
+	  fprintf (outfile, "%s %s{", e[0].attrib, p);
+	  break;
+	case 2:
+	  fprintf (outfile, "%s %s{", p, e[0].attrib);
+	  break;
+	}
+
+      for (i = 1; i <= e[0].len; )
+	i += subfield (e + i, letter);
+
+      switch (type)
+	{
+	case 0:
+	case 1:
+	case 2:
+	  fprintf (outfile, "}%s;", buf);
+	  break;
+	case 3:
+	  fprintf (outfile, "}%s %s;", e[0].attrib, buf);
+	  break;
+	case 4:
+	  fprintf (outfile, "}%s %s;", buf, e[0].attrib);
+	  break;
+	}
+      return 1 + e[0].len;
+    case ETYPE_TYPE:
+    case ETYPE_ARRAY:
+      if (e[0].etype == ETYPE_ARRAY)
+	{
+	  if (e[0].arr_len == 255)
+	    snprintf (buf, 20, "%c[]", *letter);
+	  else
+	    snprintf (buf, 20, "%c[%d]", *letter, e[0].arr_len);
+	}
+      else
+	{
+	  buf[0] = *letter;
+	  buf[1] = '\0';
+	}
+      ++*letter;
+      if (e[0].attrib)
+	switch (generate_random () % 3)
+	  {
+	  case 0:
+	    fprintf (outfile, "%s %s %s;", e[0].attrib, e[0].type->name, buf);
+	    break;
+	  case 1:
+	    fprintf (outfile, "%s %s %s;", e[0].type->name, e[0].attrib, buf);
+	    break;
+	  case 2:
+	    fprintf (outfile, "%s %s %s;", e[0].type->name, buf, e[0].attrib);
+	    break;
+	  }
+      else
+	fprintf (outfile, "%s %s;", e[0].type->name, buf);
+      return 1;
+    case ETYPE_BITFLD:
+      if (e[0].len == 0)
+	{
+	  if (e[0].attrib)
+	    switch (generate_random () % 3)
+	      {
+	      case 0:
+		fprintf (outfile, "%s %s:0;", e[0].attrib, e[0].type->name);
+		break;
+	      case 1:
+		fprintf (outfile, "%s %s:0;", e[0].type->name, e[0].attrib);
+		break;
+	      case 2:
+		fprintf (outfile, "%s:0 %s;", e[0].type->name, e[0].attrib);
+		break;
+	      }
+	  else
+	    fprintf (outfile, "%s:0;", e[0].type->name);
+	  ++*letter;
+	  return 1;
+	}
+      snprintf (buf, 20, "%d", e[0].len);
+      if (e[0].attrib)
+	switch (generate_random () % 3)
+	  {
+	  case 0:
+	    fprintf (outfile, "%s %s %c:%s;", e[0].attrib, e[0].type->name,
+		     *letter, buf);
+	    break;
+	  case 1:
+	    fprintf (outfile, "%s %s %c:%s;", e[0].type->name, e[0].attrib,
+		     *letter, buf);
+	    break;
+	  case 2:
+	    fprintf (outfile, "%s %c:%s %s;", e[0].type->name, *letter,
+		     buf, e[0].attrib);
+	    break;
+	  }
+      else
+	fprintf (outfile, "%s %c:%s;", e[0].type->name, *letter, buf);
+      ++*letter;
+      return 1;
+    default:
+      abort ();
+  }
+}
+
+char namebuf[1024];
+
+void
+output_FNB (char mode, struct entry *e)
+{
+  unsigned long long int l1, l2, m;
+  int signs = 0;
+  const char *p, *q;
+
+  if (e->type->type == TYPE_OTHER)
+    {
+      if (mode == 'B')
+	abort ();
+      fprintf (outfile, "N(%d,%s)", idx, namebuf);
+      return;
+    }
+  fprintf (outfile, "%c(%d,%s,", mode, idx, namebuf);
+  l1 = getrandll ();
+  l2 = getrandll ();
+  switch (e->type->type)
+    {
+    case TYPE_INT:
+      signs = generate_random () & 3;
+      m = e->type->maxval;
+      if (mode == 'B')
+	m &= e->len > 1 ? (1ULL << (e->len - 1)) - 1 : 1;
+      l1 &= m;
+      l2 &= m;
+      fprintf (outfile, "%s%llu%s,%s%llu%s",
+	       (signs & 1) ? "-" : "", l1, l1 > 2147483647 ? "LL" : "",
+	       (signs & 2) ? "-" : "", l2, l2 > 2147483647 ? "LL" : "");
+      break;
+    case TYPE_UINT:
+      m = e->type->maxval;
+      if (mode == 'B')
+	m &= (1ULL << e->len) - 1;
+      l1 &= m;
+      l2 &= m;
+      fprintf (outfile, "%lluU%s,%lluU%s", l1, l1 > 4294967295U ? "LL" : "",
+	       l2, l2 > 4294967295U ? "LL" : "");
+      break;
+    case TYPE_FLOAT:
+      l1 &= 0xffffff;
+      l2 &= 0xffffff;
+      signs = generate_random () & 3;
+      fprintf (outfile, "%s%f,%s%f", (signs & 1) ? "-" : "",
+	       ((double) l1) / 64, (signs & 2) ? "-" : "", ((double) l2) / 64);
+      break;
+    case TYPE_UENUM:
+      if (e->type->maxval == 0)
+	fputs ("e0_0,e0_0", outfile);
+      else if (e->type->maxval == 1)
+	fprintf (outfile, "e1_%lld,e1_%lld", l1 & 1, l2 & 1);
+      else
+	{
+	  p = strchr (e->type->name, '\0');
+	  while (--p >= e->type->name && *p >= '0' && *p <= '9');
+	  p++;
+	  l1 %= 7;
+	  l2 %= 7;
+	  if (l1 > 3)
+	    l1 += e->type->maxval - 6;
+	  if (l2 > 3)
+	    l2 += e->type->maxval - 6;
+	  fprintf (outfile, "e%s_%lld,e%s_%lld", p, l1, p, l2);
+	}
+      break;
+    case TYPE_SENUM:
+      p = strchr (e->type->name, '\0');
+      while (--p >= e->type->name && *p >= '0' && *p <= '9');
+      p++;
+      l1 %= 7;
+      l2 %= 7;
+      fprintf (outfile, "e%s_%s%lld,e%s_%s%lld",
+	       p, l1 < 3 ? "m" : "",
+	       l1 == 3 ? 0LL : e->type->maxval - (l1 & 3),
+	       p, l2 < 3 ? "m" : "",
+	       l2 == 3 ? 0LL : e->type->maxval - (l2 & 3));
+      break;
+    case TYPE_PTR:
+      l1 %= 256;
+      l2 %= 256;
+      fprintf (outfile, "(%s)&intarray[%lld],(%s)&intarray[%lld]",
+	       e->type->name, l1, e->type->name, l2);
+      break;
+    case TYPE_FNPTR:
+      l1 %= 10;
+      l2 %= 10;
+      fprintf (outfile, "fn%lld,fn%lld", l1, l2);
+      break;
+    default:
+      abort ();
+    }
+  fputs (")", outfile);
+}
+
+int
+subvalues (struct entry *e, char *p, char *letter)
+{
+  int i, j;
+  char *q;
+  if (p >= namebuf + sizeof (namebuf) - 32)
+    abort ();
+  p[0] = *letter;
+  p[1] = '\0';
+  q = p + 1;
+  switch (e[0].etype)
+    {
+    case ETYPE_STRUCT_ARRAY:
+    case ETYPE_UNION_ARRAY:
+      if (e[0].arr_len == 0 || e[0].arr_len == 255)
+	{
+	  *letter += 1 + e[0].len;
+	  return 1 + e[0].len;
+	}
+      i = generate_random () % e[0].arr_len;
+      snprintf (p, sizeof (namebuf) - (p - namebuf) - 1,
+		"%c[%d]", *letter, i);
+      q = strchr (p, '\0');
+      /* FALLTHROUGH */
+    case ETYPE_STRUCT:
+    case ETYPE_UNION:
+      *q++ = '.';
+      ++*letter;
+      for (i = 1; i <= e[0].len; )
+	{
+	  i += subvalues (e + i, q, letter);
+	  if (e[0].etype == ETYPE_UNION || e[0].etype == ETYPE_UNION_ARRAY)
+	    {
+	      *letter += e[0].len - i + 1;
+	      break;
+	    }
+	}
+      return 1 + e[0].len;
+    case ETYPE_TYPE:
+      ++*letter;
+      output_FNB ('F', e);
+      return 1;
+    case ETYPE_ARRAY:
+      if (e[0].arr_len == 0 || e[0].arr_len == 255)
+	{
+	  ++*letter;
+	  return 1;
+	}
+      i = generate_random () % e[0].arr_len;
+      snprintf (p, sizeof (namebuf) - (p - namebuf),
+		"%c[%d]", *letter, i);
+      output_FNB ('F', e);
+      if ((generate_random () & 7) == 0)
+	{
+	  j = generate_random () % e[0].arr_len;
+	  if (i != j)
+	    {
+	      snprintf (p, sizeof (namebuf) - (p - namebuf),
+			"%c[%d]", *letter, j);
+	      output_FNB ('F', e);
+	    }
+	}
+      ++*letter;
+      return 1;
+    case ETYPE_BITFLD:
+      ++*letter;
+      if (e[0].len != 0)
+	output_FNB ('B', e);
+      return 1;
+    }
+}
+
+hashval_t
+e_hash (const void *a)
+{
+  const struct entry *e = a;
+  hashval_t ret = 0;
+  int i;
+
+  if (e[0].etype != ETYPE_STRUCT && e[0].etype != ETYPE_UNION)
+    abort ();
+  for (i = 0; i <= e[0].len; ++i)
+    {
+      int attriblen;
+      ret = iterative_hash (&e[i], offsetof (struct entry, attrib), ret);
+      attriblen = e[i].attrib ? strlen (e[i].attrib) : -1;
+      ret = iterative_hash (&attriblen, sizeof (int), ret);
+      if (e[i].attrib)
+	ret = iterative_hash (e[i].attrib, attriblen, ret);
+    }
+  return ret;
+}
+
+int
+e_eq (const void *a, const void *b)
+{
+  const struct entry *ea = a, *eb = b;
+  int i;
+  if (ea[0].etype != ETYPE_STRUCT && ea[0].etype != ETYPE_UNION)
+    abort ();
+  if (ea[0].len != eb[0].len)
+    return 0;
+  for (i = 0; i <= ea[0].len; ++i)
+    {
+      if (ea[i].etype != eb[i].etype
+	  || ea[i].len != eb[i].len
+	  || ea[i].arr_len != eb[i].arr_len
+	  || ea[i].type != eb[i].type)
+	return 0;
+      if ((ea[i].attrib == NULL) ^ (eb[i].attrib == NULL))
+	return 0;
+      if (ea[i].attrib && strcmp (ea[i].attrib, eb[i].attrib) != 0)
+	return 0;
+    }
+  return 1;
+}
+
+htab_t hasht;
+
+void
+output (struct entry *e)
+{
+  int i;
+  char c;
+  void **p;
+
+  if (e[0].etype != ETYPE_STRUCT && e[0].etype != ETYPE_UNION)
+    abort ();
+
+  p = htab_find_slot (hasht, e, INSERT);
+  if (*p != NULL)
+    return;
+
+  *p = malloc ((e[0].len + 1) * sizeof (struct entry));
+  memcpy (*p, e, (e[0].len + 1) * sizeof (struct entry));
+
+  if (idx == limidx)
+    switchfiles (e[0].len);
+
+  if (e[0].etype == ETYPE_STRUCT)
+    fprintf (outfile, "T(%d,", idx);
+  else
+    fprintf (outfile, "U(%d,", idx);
+  c = 'a';
+  for (i = 1; i <= e[0].len; )
+    i += subfield (e + i, &c);
+  fputs (",", outfile);
+  c = 'a';
+  for (i = 1; i <= e[0].len; )
+    {
+      i += subvalues (e + i, namebuf, &c);
+      if (e[0].etype == ETYPE_UNION)
+	break;
+    }
+  fputs (")\n", outfile);
+  if (output_one && idx == limidx)
+    exit (0);
+  ++idx;
+}
+
+enum FEATURE
+{
+  FEATURE_VECTOR = 1,
+  FEATURE_ALIGNEDPACKED = 2,
+  FEATURE_ZEROARRAY = 4,
+  FEATURE_ZEROBITFLD = 8,
+  ALL_FEATURES = FEATURE_VECTOR | FEATURE_ZEROARRAY
+		 | FEATURE_ALIGNEDPACKED | FEATURE_ZEROBITFLD
+};
+
+void
+singles (enum FEATURE features)
+{
+  struct entry e[2];
+  int i;
+  memset (e, 0, sizeof (e));
+  e[0].etype = ETYPE_STRUCT;
+  output (e);
+  e[0].etype = ETYPE_UNION;
+  output (e);
+  e[0].len = 1;
+  for (i = 0; i < NTYPES2; ++i)
+    {
+      e[0].etype = ETYPE_STRUCT;
+      e[1].etype = ETYPE_TYPE;
+      e[1].type = &base_types[i];
+      output (e);
+      e[0].etype = ETYPE_UNION;
+      output (e);
+    }
+  if (features & FEATURE_VECTOR)
+    for (i = 0; i < NVTYPES2; ++i)
+      {
+	e[0].etype = ETYPE_STRUCT;
+	e[1].etype = ETYPE_TYPE;
+	e[1].type = &vector_types[i];
+	output (e);
+	e[0].etype = ETYPE_UNION;
+	output (e);
+      }
+}
+
+void
+choose_type (enum FEATURE features, struct entry *e, int r, int in_array)
+{
+  int i;
+
+  i = NTYPES2 - NTYPES1;
+  if (features & FEATURE_VECTOR)
+    i += NVTYPES2;
+  if ((r & 3) == 0)
+    {
+      if (in_array)
+	i += NAATYPES2;
+      else
+	i += NATYPES2;
+    }
+  r >>= 2;
+  r %= i;
+  if (r < NTYPES2 - NTYPES1)
+    e->type = &base_types[r + NTYPES1];
+  r -= NTYPES2 - NTYPES1;
+  if (e->type == NULL && (features & FEATURE_VECTOR))
+    {
+      if (r < NVTYPES2)
+	e->type = &vector_types[r];
+      r -= NVTYPES2;
+    }
+  if (e->type == NULL && !in_array)
+    {
+      if (r < NATYPES2)
+	e->type = &attrib_types[r];
+      r -= NATYPES2;
+    }
+  if (e->type == NULL && in_array)
+    {
+      if (r < NAATYPES2)
+	e->type = &attrib_array_types[r];
+      r -= NAATYPES2;
+    }
+  if (e->type == NULL)
+    abort ();
+}
+
+/* This is from gcc.c-torture/execute/builtin-bitops-1.c.  */
+static int
+my_ffsll (unsigned long long x)
+{
+  int i;
+  if (x == 0)
+    return 0;
+  /* We've tested LLONG_MAX for 64 bits so this should be safe.  */
+  for (i = 0; i < 64; i++)
+    if (x & (1ULL << i))
+      break;
+  return i + 1;
+}
+
+void
+generate_fields (enum FEATURE features, struct entry *e, struct entry *parent,
+		 int len)
+{
+  int r, i, j, ret = 1, n, incr, sametype;
+
+  for (n = 0; n < len; n += incr)
+    {
+      r = generate_random ();
+      /* 50% ETYPE_TYPE base_types NTYPES1
+	 12.5% ETYPE_TYPE other
+	 12.5% ETYPE_ARRAY
+	 12.5% ETYPE_BITFLD
+	 12.5% ETYPE_STRUCT|ETYPE_UNION|ETYPE_STRUCT_ARRAY|ETYPE_UNION_ARRAY */
+      i = (r & 7);
+      r >>= 3;
+      incr = 1;
+      switch (i)
+	{
+	case 0:
+	case 1:
+	case 2:
+	case 3:
+	  e[n].etype = ETYPE_TYPE;
+	  e[n].type = &base_types[r % NTYPES1];
+	  break;
+	case 4:
+	  e[n].etype = ETYPE_TYPE;
+	  choose_type (features, &e[n], r, 0);
+	  break;
+	case 5:
+	  e[n].etype = ETYPE_ARRAY;
+	  i = r & 1;
+	  r >>= 1;
+	  if (i)
+	    e[n].type = &base_types[r % NTYPES1];
+	  else
+	    choose_type (features, &e[n], r, 1);
+	  r = generate_random ();
+	  if ((features & FEATURE_ZEROARRAY) && (r & 3) == 0)
+	    {
+	      e[n].arr_len = 0;
+	      if (n == len - 1 && (r & 4)
+		  && (parent->etype == ETYPE_STRUCT
+		      || parent->etype == ETYPE_STRUCT_ARRAY))
+		{
+		  int k;
+		  for (k = 0; k < n; ++k)
+		    if (e[k].etype != ETYPE_BITFLD || e[k].len)
+		      {
+			e[n].arr_len = 255;
+			break;
+		      }
+		}
+	    }
+	  else if ((r & 3) != 3)
+	    e[n].arr_len = (r >> 2) & 7;
+	  else
+	    e[n].arr_len = (r >> 2) & 31;
+	  break;
+	case 6:
+	  sametype = 1;
+	  switch (r & 7)
+	    {
+	    case 0:
+	    case 1:
+	    case 2:
+	      break;
+	    case 3:
+	    case 4:
+	    case 5:
+	      incr = 1 + (r >> 3) % (len - n);
+	      break;
+	    case 6:
+	    case 7:
+	      sametype = 0;
+	      incr = 1 + (r >> 3) % (len - n);
+	      break;
+	    }
+	  for (j = n; j < n + incr; ++j)
+	    {
+	      int mi, ma;
+
+	      e[j].etype = ETYPE_BITFLD;
+	      if (j == n || !sametype)
+		{
+		  int k;
+		  r = generate_random ();
+		  k = r & 3;
+		  r >>= 2;
+		  if (!k)
+		    e[j].type
+		      = &aligned_bitfld_types[r % n_aligned_bitfld_types];
+		  else
+		    e[j].type
+		      = &bitfld_types[r % n_bitfld_types];
+		}
+	      else
+		e[j].type = e[n].type;
+	      r = generate_random ();
+	      mi = 0;
+	      ma = 0;
+	      switch (e[j].type->bitfld)
+		{
+		case 'C': ma = 8; break;
+		case 'S': ma = 16; break;
+		case 'I': ma = 32; break;
+		case 'L':
+		case 'Q': ma = 64; break;
+		case 'B': ma = 1; break;
+		case ' ':
+		  if (e[j].type->type == TYPE_UENUM)
+		    mi = my_ffsll (e[j].type->maxval + 1) - 1;
+		  else if (e[j].type->type == TYPE_SENUM)
+		    mi = my_ffsll (e[j].type->maxval + 1);
+		  else
+		    abort ();
+		  if (!mi)
+		    mi = 1;
+		  if (mi <= 32)
+		    ma = 32;
+		  else
+		    ma = 64;
+		  break;
+		default:
+		  abort ();
+		}
+	      e[j].len = ma + 1;
+	      if (sametype && (r & 3) == 0 && ma > 1)
+		{
+		  int sum = 0, k;
+		  for (k = n; k < j; ++k)
+		    sum += e[k].len;
+		  sum %= ma;
+		  e[j].len = sum ? ma - sum : ma;
+		}
+	      r >>= 2;
+	      if (!sametype && (r & 7) == 0)
+		ma *= 8;
+	      r >>= 3;
+	      if (! (features & FEATURE_ZEROBITFLD) && mi == 0)
+		mi = 1;
+	      if (e[j].len < mi || e[j].len > ma)
+		e[j].len = mi + (r % (ma + 1 - mi));
+	      r >>= 6;
+	      if ((features & FEATURE_ZEROBITFLD) && (r & 3) == 0
+		  && mi == 0)
+		e[j].len = 0;
+	    }
+	  break;
+	case 7:
+	  switch (r & 7)
+	    {
+	    case 0:
+	    case 1:
+	    case 2:
+	      e[n].etype = ETYPE_STRUCT;
+	      break;
+	    case 3:
+	    case 4:
+	      e[n].etype = ETYPE_UNION;
+	      break;
+	    case 5:
+	    case 6:
+	      e[n].etype = ETYPE_STRUCT_ARRAY;
+	      break;
+	    case 7:
+	      e[n].etype = ETYPE_UNION_ARRAY;
+	      break;
+	    }
+	  r >>= 3;
+	  e[n].len = r % (len - n);
+	  incr = 1 + e[n].len;
+	  generate_fields (features, &e[n + 1], &e[n], e[n].len);
+	  if (e[n].etype == ETYPE_STRUCT_ARRAY
+	      || e[n].etype == ETYPE_UNION_ARRAY)
+	    {
+	      r = generate_random ();
+	      if ((features & FEATURE_ZEROARRAY) && (r & 3) == 0)
+		{
+		  e[n].arr_len = 0;
+		  if (n + incr == len && (r & 4)
+		      && (parent->etype == ETYPE_STRUCT
+			  || parent->etype == ETYPE_STRUCT_ARRAY))
+		    {
+		      int k;
+		      for (k = 0; k < n; ++k)
+			if (e[k].etype != ETYPE_BITFLD || e[k].len)
+			  {
+			    e[n].arr_len = 255;
+			    break;
+			  }
+		    }
+		}
+	      else if ((r & 3) != 3)
+		e[n].arr_len = (r >> 2) & 7;
+	      else
+		e[n].arr_len = (r >> 2) & 31;
+	    }
+	  break;
+	}
+      r = generate_random ();
+      if ((r & 7) == 0)
+	{
+	  r >>= 3;
+	  i = (features & FEATURE_ALIGNEDPACKED) ? NATTRIBS2 : NATTRIBS1;
+	  e[n].attrib = attributes[r % i];
+	  if (! (features & FEATURE_ALIGNEDPACKED)
+	      && strcmp (e[n].attrib, "atpa") == 0
+	      && ((e[n].type >= &attrib_types[0]
+		   && e[n].type < &attrib_types[NATYPES2])
+		  || (e[n].type >= &attrib_array_types[0]
+		      && e[n].type < &attrib_array_types[NAATYPES2])
+		  || (e[n].type >= &aligned_bitfld_types[0]
+		      && e[n].type < &aligned_bitfld_types[n_aligned_bitfld_types])))
+	    e[n].attrib = NULL;
+
+	  /* If this is an array type, do not put aligned attributes on
+	     elements.  Aligning elements to a value greater than their
+	     size will result in a compiler error.  */
+
+	  if ((e[n].etype == ETYPE_ARRAY)
+	      && e[n].attrib != NULL
+	      && (strncmp (e[n].attrib, "atal", 4) == 0))
+	     e[n].attrib = NULL;
+	}
+    }
+}
+
+void
+generate_random_tests (enum FEATURE features, int len)
+{
+  struct entry e[len + 1];
+  int i, r;
+  if (len > 'z' - 'a' + 1)
+    abort ();
+  memset (e, 0, sizeof (e));
+  r = generate_random ();
+  if ((r & 7) == 0)
+    e[0].etype = ETYPE_UNION;
+  else
+    e[0].etype = ETYPE_STRUCT;
+  r >>= 3;
+  e[0].len = len;
+  generate_fields (features, &e[1], &e[0], len);
+  output (e);
+}
+
+struct { const char *name; enum FEATURE f; }
+features[] = {
+{ "normal", 0 },
+{ "vector", FEATURE_VECTOR },
+{ "[0] :0", FEATURE_ZEROARRAY | FEATURE_ZEROBITFLD },
+{ "vector [0]",
+  FEATURE_VECTOR | FEATURE_ZEROARRAY },
+{ "aligned packed vector [0] :0",
+  FEATURE_VECTOR | FEATURE_ZEROARRAY
+  | FEATURE_ALIGNEDPACKED | FEATURE_ZEROBITFLD },
+};
+
+int
+main (int argc, char **argv)
+{
+  int i, j, count, c, n = 3000;
+
+  if (sizeof (int) != 4 || sizeof (long long) != 8)
+    return 1;
+
+  while ((c = getopt (argc, argv, "d:i:n:s:")) != -1)
+    switch (c)
+      {
+      case 'n':
+	n = atoi (optarg);
+	break;
+      case 'd':
+	destdir = optarg;
+	break;
+      case 's':
+	srcdir = optarg;
+	break;
+      case 'i':
+	output_one = 1;
+	limidx = atoi (optarg);
+	break;
+      default:
+	goto usage;
+      }
+
+  if (output_one)
+    {
+      outfile = fopen ("/dev/null", "w");
+      if (outfile == NULL)
+	{
+	  fputs ("could not open /dev/null", stderr);
+	  return 1;
+	}
+      n = limidx + 1;
+    }
+
+  if (destdir == NULL && !output_one)
+    {
+    usage:
+      fprintf (stderr, "Usage:\n\
+%s [-s srcdir -d destdir] [-n count] [-i idx]\n\
+Either -s srcdir -d destdir or -i idx must be used\n", argv[0]);
+      return 1;
+    }
+
+  if (srcdir == NULL && !output_one)
+    goto usage;
+
+  hasht = htab_create (40000, e_hash, e_eq, NULL);
+  for (i = 0; i < NTYPES2; ++i)
+    if (base_types[i].bitfld)
+      bitfld_types[n_bitfld_types++] = base_types[i];
+  for (i = 0; i < NATYPES2; ++i)
+    if (attrib_types[i].bitfld)
+      aligned_bitfld_types[n_aligned_bitfld_types++] = attrib_types[i];
+  for (i = 0; i < sizeof (features) / sizeof (features[0]); ++i)
+    {
+      int startidx = idx;
+      if (! output_one)
+	limidx = idx;
+      if (!i)
+	count = 200;
+      else
+	count = 20;
+      for (j = 1; j <= 9; ++j)
+	while (idx < startidx + j * count)
+	  generate_random_tests (features[i].f, j);
+      while (idx < startidx + count * 10)
+	generate_random_tests (features[i].f, 10 + (generate_random () % 16));
+    }
+  for (i = 0; n > 3000 && i < sizeof (features) / sizeof (features[0]); ++i)
+    {
+      int startidx;
+      startidx = idx;
+      if (! output_one)
+	limidx = idx;
+      singles (features[i].f);
+      if (!i)
+	{
+	  count = 1000;
+	  while (idx < startidx + 1000)
+	    generate_random_tests (features[i].f, 1);
+	}
+      else
+	{
+	  startidx = idx;
+	  count = 100;
+	  while (idx < startidx + 100)
+	    generate_random_tests (features[i].f, 1);
+	}
+      startidx = idx;
+      for (j = 2; j <= 9; ++j)
+	while (idx < startidx + (j - 1) * count)
+	  generate_random_tests (features[i].f, j);
+      while (idx < startidx + count * 9)
+	generate_random_tests (features[i].f, 10 + (generate_random () % 16));
+    }
+  if (! output_one)
+    limidx = idx;
+  while (idx < n)
+    generate_random_tests (ALL_FEATURES, 1 + (generate_random () % 25));
+  fclose (outfile);
+  return 0;
+}
--- gcc/testsuite/g++.dg/compat/struct-layout-1_x1.h	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/compat/struct-layout-1_x1.h	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,68 @@
+#include "struct-layout-1.h"
+
+struct Info info;
+int fails;
+int intarray[256];
+int fn0 (void) { return 0; }
+int fn1 (void) { return 1; }
+int fn2 (void) { return 2; }
+int fn3 (void) { return 3; }
+int fn4 (void) { return 4; }
+int fn5 (void) { return 5; }
+int fn6 (void) { return 6; }
+int fn7 (void) { return 7; }
+int fn8 (void) { return 8; }
+int fn9 (void) { return 9; }
+
+/* This macro is intended for fields where their
+   addresses/sizes/alignments and value passing should be checked.  */
+#define F(n, x, v, w) 						\
+  info.flds[i] = &s##n.x;					\
+  info.sizes[i] = sizeof (s##n.x);				\
+  info.aligns[i] = __alignof__ (s##n.x);			\
+  s##n.x = v;							\
+  a##n[2].x = w;						\
+  ++i;
+/* This macro is for fields where just their addresses/sizes/alignments
+   should be checked.  */
+#define N(n, x) 						\
+  info.flds[i] = &s##n.x;					\
+  info.sizes[i] = sizeof (s##n.x);				\
+  info.aligns[i] = __alignof__ (s##n.x);			\
+  ++i;
+/* This macro is for fields where just value passing should be checked.  */
+#define B(n, x, v, w)						\
+  s##n.x = v;							\
+  a##n[2].x = w;						\
+  ++j;
+#define TX(n, type, attrs, fields, ops) 			\
+type S##n { fields } attrs;					\
+type S##n s##n;							\
+extern type S##n a##n[5];					\
+extern type S##n check##n (type S##n, type S##n *,		\
+			     type S##n);			\
+extern void check##n##va (int i, ...);				\
+extern void checkx##n (type S##n);				\
+void test##n (void)						\
+{								\
+  int i, j;							\
+  memset (&s##n, '\0', sizeof (s##n));				\
+  memset (a##n, '\0', sizeof (a##n));				\
+  memset (&info, '\0', sizeof (info));				\
+  info.sp = &s##n;						\
+  info.a0p = &a##n[0];						\
+  info.a3p = &a##n[3];						\
+  info.sz = sizeof (s##n);					\
+  info.als = __alignof__ (s##n);				\
+  info.ala0 = __alignof__ (a##n[0]);				\
+  info.ala3 = __alignof__ (a##n[3]);				\
+  if (((long) &a##n[3]) & (info.als - 1))			\
+    FAIL (n, 1);						\
+  i = 0; j = 0;							\
+  ops								\
+  info.nfields = i;						\
+  info.nbitfields = j;						\
+  checkx##n (check##n (s##n, &a##n[1], a##n[2]));		\
+  check##n##va (1, 1.0, s##n, 2LL, a##n[2], a##n[2]);		\
+  check##n##va (2, s##n, s##n, 2.0L, a##n[2], s##n);		\
+}
--- gcc/testsuite/g++.dg/compat/struct-layout-1_x2.h	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/compat/struct-layout-1_x2.h	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,14 @@
+#undef F
+#undef N
+#undef B
+#undef TX
+#define F(n, x, v, w) 						\
+  if (arg.x != s##n.x) FAIL (n, 30);
+#define N(n, x)
+#define B(n, x, v, w)						\
+  if (arg.x != s##n.x) FAIL (n, 30);
+#define TX(n, type, attrs, fields, ops) 			\
+void checkx##n (type S##n arg)					\
+{								\
+  ops								\
+}
--- gcc/testsuite/g++.dg/compat/struct-layout-1_y1.h	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/compat/struct-layout-1_y1.h	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,76 @@
+#include "struct-layout-1.h"
+
+#define F(n, x, v, w) 						\
+  if (info.flds[i] != &s##n.x)					\
+    FAIL (n, 50);						\
+  if (info.sizes[i] != sizeof (s##n.x))				\
+    FAIL (n, 51);						\
+  if (info.aligns[i] != __alignof__ (s##n.x))			\
+    FAIL (n, 52);						\
+  if (s##n.x != (__typeof__ (s##n.x)) v)			\
+    FAIL (n, 53);						\
+  if (a##n[2].x != (__typeof__ (s##n.x)) w)			\
+    FAIL (n, 54);						\
+  if (arg0.x != s##n.x)						\
+    FAIL (n, 55);						\
+  if (arg2.x != a##n[2].x)					\
+    FAIL (n, 56);						\
+  ret.x = s##n.x;						\
+  ++i;
+#define N(n, x) 						\
+  if (info.flds[i] != &s##n.x)					\
+    FAIL (n, 50);						\
+  if (info.sizes[i] != sizeof (s##n.x))				\
+    FAIL (n, 51);						\
+  if (info.aligns[i] != __alignof__ (s##n.x))			\
+    FAIL (n, 52);						\
+  ++i;
+#define B(n, x, v, w) 						\
+  b1.x = v; b2.x = w;						\
+  if (s##n.x != b1.x)						\
+    FAIL (n, 53);						\
+  if (a##n[2].x != b2.x)					\
+    FAIL (n, 54);						\
+  if (arg0.x != s##n.x)						\
+    FAIL (n, 55);						\
+  if (arg2.x != a##n[2].x)					\
+    FAIL (n, 56);						\
+  ret.x = s##n.x;						\
+  ++j;
+#define TX(n, type, attrs, fields, ops) 			\
+type S##n { fields } attrs;					\
+extern type S##n s##n;						\
+type S##n a##n[5];						\
+type S##n							\
+check##n (type S##n arg0, type S##n *arg1, type S##n arg2)	\
+{								\
+  type S##n ret;						\
+  type S##n b1, b2;						\
+  int i, j;							\
+								\
+  memset (&ret, 0, sizeof (ret));				\
+  memset (&b1, 0, sizeof (b1));					\
+  memset (&b2, 0, sizeof (b2));					\
+  if (info.sp != &s##n)						\
+    FAIL (n, 10);						\
+  if (info.a0p != &a##n[0])					\
+    FAIL (n, 11);						\
+  if (info.a3p != &a##n[3])					\
+    FAIL (n, 12);						\
+  if (info.sz != sizeof (s##n))					\
+    FAIL (n, 13);						\
+  if (info.als != __alignof__ (s##n))				\
+    FAIL (n, 14);						\
+  if (info.ala0 != __alignof__ (a##n[0]))			\
+    FAIL (n, 15);						\
+  if (info.ala3 != __alignof__ (a##n[3]))			\
+    FAIL (n, 16);						\
+  if (arg1 != &a##n[1])						\
+    FAIL (n, 17);						\
+  i = 0; j = 0;							\
+  ops								\
+  if (i != info.nfields || j != info.nbitfields)		\
+    FAIL (n, 18);						\
+								\
+  return ret;							\
+}
--- gcc/testsuite/g++.dg/compat/struct-layout-1_y2.h	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/compat/struct-layout-1_y2.h	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,69 @@
+#undef F
+#undef N
+#undef B
+#undef TX
+
+#ifdef SKIP_VA
+const int test_va = 0;
+#else
+const int test_va = 1;
+#endif
+
+#define F(n, x, v, w) 						\
+  if (p->x != arg.x) FAIL (n, 74);
+#define N(n, x)
+#define B(n, x, v, w) 						\
+  if (p->x != arg.x) FAIL (n, 74);
+#define TX(n, type, attrs, fields, ops) 			\
+void								\
+check##n##va (int z, ...)					\
+{								\
+  type S##n arg, *p;						\
+  va_list ap;							\
+  int i;							\
+								\
+  if (test_va)							\
+    {								\
+      va_start (ap, z);						\
+      for (i = 0; i < 5; ++i)					\
+	{							\
+	  p = NULL;						\
+	  switch ((z << 4) | i)					\
+	    {							\
+	    case 0x10:						\
+	      if (va_arg (ap, double) != 1.0)			\
+		FAIL (n, 70);					\
+	      break;						\
+	    case 0x12:						\
+	      if (va_arg (ap, long long) != 2LL)		\
+		FAIL (n, 71);					\
+	      break;						\
+	    case 0x22:						\
+	      if (va_arg (ap, long double) != 2.0L)		\
+		FAIL (n, 72);					\
+	      break;						\
+	    case 0x11:						\
+	    case 0x20:						\
+	    case 0x21:						\
+	    case 0x24:						\
+	      p = &s##n;					\
+	      arg = va_arg (ap, type S##n);			\
+	      break;						\
+	    case 0x13:						\
+	    case 0x14:						\
+	    case 0x23:						\
+	      p = &a##n[2];					\
+	      arg = va_arg (ap, type S##n);			\
+	      break;						\
+	    default:						\
+	      FAIL (n, 73);					\
+	      break;						\
+	    }							\
+	  if (p)						\
+	    {							\
+	      ops						\
+	    }							\
+	}							\
+      va_end (ap);						\
+    }								\
+}
-------------- next part --------------
2005-11-25  Jakub Jelinek  <jakub@redhat.com>

	PR target/17828
	* g++.old-deja/g++.other/comdat5.C: New test.
	* g++.old-deja/g++.other/comdat5-aux.cc: New file.

--- gcc/testsuite/g++.old-deja/g++.other/comdat5.C	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.old-deja/g++.other/comdat5.C	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,6 @@
+// PR target/17828
+// { dg-do link }
+// { dg-additional-sources " comdat5-aux.cc" }
+// { dg-options "-O2 -fPIC" }
+
+#include "comdat4.C"
--- gcc/testsuite/g++.old-deja/g++.other/comdat5-aux.cc	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.old-deja/g++.other/comdat5-aux.cc	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1 @@
+#include "comdat4-aux.cc"
-------------- next part --------------
2005-11-25  Jakub Jelinek  <jakub@redhat.com>

	PR target/19005
	* gcc.c-torture/execute/pr19005.c: New test.

--- gcc/testsuite/gcc.c-torture/execute/pr19005.c	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/gcc.c-torture/execute/pr19005.c	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,38 @@
+/* PR target/19005 */
+extern void abort (void);
+
+int v, s;
+
+void
+bar (int a, int b)
+{
+  unsigned char x = v;
+
+  if (!s)
+    {
+      if (a != x || b != (unsigned char) (x + 1))
+        abort ();
+    }
+  else if (a != (unsigned char) (x + 1) || b != x)
+    abort ();
+  s ^= 1;
+}
+
+int
+foo (int x)
+{
+  unsigned char a = x, b = x + 1;
+
+  bar (a, b);
+  a ^= b; b ^= a; a ^= b;
+  bar (a, b);
+  return 0;
+}
+
+int
+main (void)
+{
+  for (v = -10; v < 266; v++)
+    foo (v);
+  return 0;
+}
-------------- next part --------------
2005-11-25  Jakub Jelinek  <jakub@redhat.com>

	PR c++/19317
	* g++.dg/opt/pr19317-1.C: New test.
	* g++.dg/opt/pr19317-2.C: New test.
	* g++.dg/opt/pr19317-3.C: New test.

--- gcc/testsuite/g++.dg/opt/pr19317-1.C	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/opt/pr19317-1.C	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,39 @@
+// PR c++/19317
+// { dg-options "-O2" }
+// { dg-do run }
+// Origin: Dirk Mueller <mueller@kde.org>
+
+extern "C" void abort (void);
+
+struct A
+{
+  A () { d = e = 0; f = -1; }
+  A (int x) : d (0), e (0), f (x) { }
+  A b (const A &r) const;
+  int d;
+  int e;
+  int f;
+};
+
+A
+A::b (const A & r) const
+{
+  A t;
+  t.f = f < r.f ? f : r.f;
+  return t;
+}
+
+int
+main ()
+{
+  A a (100);
+  a = a.b (A (10));
+  if (a.f != 10)
+    abort ();
+
+  A c (10);
+  A d (100);
+  c = d.b (c);
+  if (c.f != 10)
+    abort ();
+}
--- gcc/testsuite/g++.dg/opt/pr19317-2.C	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/opt/pr19317-2.C	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,32 @@
+// PR c++/19317
+// { dg-options "-O2" }
+// { dg-do run }
+
+extern "C" void abort (void);
+
+struct A
+{
+  A () { d = e = 0; f = -1; }
+  A (int x) : d (0), e (0), f (x) { }
+  A b () const;
+  int d;
+  int e;
+  int f;
+};
+
+A
+A::b () const
+{
+  A t;
+  t.f = 10 + this->f;
+  return t;
+}
+
+int
+main ()
+{
+  A a (100);
+  a = a.b ();
+  if (a.f != 110)
+    abort ();
+}
--- gcc/testsuite/g++.dg/opt/pr19317-3.C	(.../gcc-4_0-branch)	(revision 0)
+++ gcc/testsuite/g++.dg/opt/pr19317-3.C	(.../redhat/gcc-4_0-branch)	(revision 107414)
@@ -0,0 +1,37 @@
+// PR c++/19317
+// { dg-options "-O2" }
+// { dg-do run }
+
+extern "C" void abort (void);
+
+struct A { int c; int d; int e; int f; };
+
+A
+foo (const A *x, const A *r)
+{
+  A t;
+  t.c = -1;
+  t.c += x->c < r->c ? x->c : r->c;
+  t.d = 0;
+  t.e = 0;
+  t.f = 0;
+  return t;
+}
+
+int
+main ()
+{
+  A a;
+  a.c = 10;
+  a.d = 0;
+  a.e = 0;
+  a.f = 0;
+  A b;
+  b.c = 100;
+  b.d = 0;
+  b.e = 0;
+  b.f = 0;
+  a = foo (&b, &a);
+  if (a.c != 9)
+    abort ();
+}


More information about the Gcc-patches mailing list