svn merge -r107806:112661 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_4-branchredhat/gcc-3_4-branch

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-3_4-branch@113116 138bc75d-0d04-0410-961f-82ee72b054a4

1969 files changed, 3733 insertions, 18505 deletions

diff --git a/ChangeLog b/ChangeLog
index 8de80864405..576fdcd1da0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index febc8a21faf..c6021d15c34 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2005-12-06  Matthias Klose  <doko@debian.org>
+
+	2005-09-15  Kazu Hirata  <kazu@codesourcery.com>
+	* include/private/gc_locks.h (GC_test_and_set): Change the
+	constraint of the first operand to '0'.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/boehm-gc/include/private/gc_locks.h b/boehm-gc/include/private/gc_locks.h
index 775176b3151..790b5428491 100644
--- a/boehm-gc/include/private/gc_locks.h
+++ b/boehm-gc/include/private/gc_locks.h
@@ -209,7 +209,7 @@
           /* See linuxthreads/sysdeps/arm/pt-machine.h in glibc-2.1 */
           __asm__ __volatile__("swp %0, %1, [%2]"
       		  	     : "=r"(oldval)
-      			     : "r"(1), "r"(addr)
+      			     : "0"(1), "r"(addr)
 			     : "memory");
           return oldval;
         }
diff --git a/config/ChangeLog b/config/ChangeLog
index 9a34e83f3fe..c8834fb0439 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index e5280db3cae..d587a730202 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/contrib/reghunt/ChangeLog b/contrib/reghunt/ChangeLog
index 18c2472c353..535cb13bfd3 100644
--- a/contrib/reghunt/ChangeLog
+++ b/contrib/reghunt/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/contrib/regression/ChangeLog b/contrib/regression/ChangeLog
index aa63ea8aa21..f3cd3aa8059 100644
--- a/contrib/regression/ChangeLog
+++ b/contrib/regression/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index 4ed934f7080..947f20fb390 100644
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1ab4106296..202cf1ef3db 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,181 @@
+2006-04-04  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
+
+	PR target/26775
+	PR target/26776
+	* config/m32r/m32r.c (m32r_output_function_epilogue): Case for
+	a large stack frame at epilogue. Use fp to recover a stack
+	pointer for alloca function at epilogue.
+
+	PR target/36276
+	* config/m32r/m32r.c (gen_compare): Removed a rule addsi3 codes 
+	to avoid a miss optimizing at simplify_relational_operation().
+	* config/m32r/m32r.md (seq): Ditto. Changed reg_or_eq_int16_operand
+	to reg_or_uint16_operand because seq_insn has not used addsi3 already.
+	(seq_insn): Ditto. Removed operand check mode "P". Changed 
+	reg_or_eq_int16_operand to reg_or_uint16_operand.
+
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2006-03-01  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Backport
+	2005-11-03  James E Wilson  <wilson@specifix.com>
+
+	PR preprocessor/24202
+	* cppfiles.c (_cpp_pop_file_buffer): Set buffer_valid to false.
+
+2006-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+	PR target/21616
+	Revert most of 2004-03-10 changes, apply mainline 2005-01-07.
+	* config/rs6000/rs6000.c (invalid_gpr_mem): Delete.
+	(base_reg_operand): Delete.
+	(legitimate_offset_address_p): Revert 2004-03-10 changes.
+	(secondary_reload_class): Likewise.
+	(rs6000_legitimize_reload_address): Convert non-word aligned
+	offset address using ld/std into indirect address.
+	* config/rs6000/rs6000.h (SECONDARY_RELOAD_CLASS): Define.
+	(SECONDARY_INPUT_RELOAD_CLASS, SECONDARY_OUTPUT_RELOAD_CLASS): Delete.
+	(PREDICATE_CODES): Delete invalid_gpr_mem and base_reg_operand.
+	* config/rs6000/rs6000-protos.h (secondary_reload_class): Update.
+	* config/rs6000/rs6000.md (movdf_hardfloat64): Remove m->b
+	alternative and split.
+	(movdi_internal64): Likewise.
+	(reload_outdf, reload_indf, reload_outdi, reload_indi): Delete.
+
+2006-02-28  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Backport
+	2004-04-28  Serge Belyshev  <1319@bot.ru>
+	
+	PR 14944
+	* coverage.c (read_counts_file): Fix usage of warning () call.
+	* pretty-print.c (pp_base_format_text): Fix typo in the comment.
+
+2006-02-18  Olivier Hainque  <hainque@adacore.com>
+
+	PR ada/13408
+	* pa.h (WIDEST_HARDWARE_FP_SIZE): Define.
+
+2006-02-13  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	Backport:
+	2006-02-01  Steve Ellcey  <sje@cup.hp.com>
+
+	PR middle-end/24901
+	* fold-const.c (fold_checksum_tree): Change type of buf.
+
+2006-02-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* doc/contrib.texi: Update my entry.
+
+2006-02-09  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* config/sparc/sparc.c (tls_call_delay): Fix oversight.
+
+2006-02-07  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR target/26109
+	* pa.c (attr_length_indirect_call): Don't return length 8 for distances
+	>= 240000 when generating code for SOM runtime.
+	(output_indirect_call): Don't use "b,l" instruction for indirect calls
+	to $$dyncall when generating code for SOM runtime..
+
+2006-02-02  Nick Clifton  <nickc@redhat.com>
+
+	PR 24376
+	* sched-rgn.c (add_branch_dependences): For cc0 targets extend
+	the dependencies inside a block back to the very first cc0 setter
+	in the block.
+
+2006-01-21  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* gcc.c (process_command), gcov.c (print_version), gcov-dump.c
+	(print_version), mips-tdump.c (main), mips-tfile.c (main): Update
+	copyright notice dates.
+
+2006-01-12  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+	PR target/25613
+	* config/sh/sh.h (CONSTRAINT_LEN): Use unchecking version.	
+
+2005-12-30  Roger Sayle  <roger@eyesopen.com>
+
+	PR target/25213
+	Backport from mainline
+	2005-09-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/23098
+	* cse.c (fold_rtx_mem): Call delegitimize_address target hook.
+	* simplify-rtx.c (constant_pool_reference_p): New function.
+	* rtl.h (constant_pool_reference_p): New prototype.
+	* config/i386/i386.md (pushf split, mov[sdx]f split): Use
+	constant_pool_reference_p in condition and
+	avoid_constant_pool_reference in preparation statements.
+
+2005-12-30  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR fortran/25586
+	* pa.md: Remove REG_POINTER check from REG+REG peephole2 floating-point
+	store patterns.
+
+2005-12-29  Alan Modra  <amodra@bigpond.net.au>
+
+	PR target/25572
+	* config/rs6000/rs6000.c (create_TOC_reference): Set regs_ever_live.
+
+2005-12-17  Steven Bosscher  <stevenb@suse.de>
+
+	PR rtl-optimization/23837
+	* optabs.c (expand_binop): For a multi-word rotate, never emit
+	a REG_NO_CONFLICT block.
+
+2005-12-16  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	Backport from mainline:
+	2004-11-01  Mike Stump  <mrs@apple.com>
+
+	* inclhack.def (stdio_va_list): Break out clients from here...
+	(stdio_va_list_clients): ...to here.  Also, don't fix if stdarg.h is
+	included or ifdef va_start.
+	* fixincl.x: Regenerate.
+	
+2005-12-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* config/rs6000/linux64.h (TARGET_ALIGN_NATURAL): Define.
+
+2005-12-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR target/25258
+	* pa.c (som_text_section_asm_op): Use .NSUBSPA directive when changing
+	to the text subspace to output debugging information.
+
+2005-12-06  Alan Modra  <amodra@bigpond.net.au>
+
+	PR other/13873
+	* longlong.h: Merge PPC tests from upstream.
+
+2005-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR middle-end/25022
+	* builtins.c (expand_builtin_fputs, expand_builtin_printf,
+	expand_builtin_fprintf): Lookup the explicit replacement functions
+	for any unlocked stdio builtin transformations.
+
+	* builtins.c (expand_builtin_fputs): Defer check for missing
+	replacement functions.
+
+2005-12-02  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/24103
+	Backport:
+	2002-08-22  Diego Novillo  <dnovillo@redhat.com>
+
+	* tree.c (simple_cst_equal): Call simple_cst_list_equal to compare
+	CONSTRUCTOR_ELTS pointers.
+
 2006-03-21  Jason Merrill  <jason@redhat.com>
 
 	PR middle-end/20297
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 41d4b644d8f..96b7c081c10 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 7185ebdfa22..5f30e3e3379 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -4343,14 +4343,15 @@ static rtx
 expand_builtin_fputs (tree arglist, rtx target, bool unlocked)
 {
   tree len, fn;
-  tree fn_fputc = unlocked ? implicit_built_in_decls[BUILT_IN_FPUTC_UNLOCKED]
+  /* If we're using an unlocked function, assume the other unlocked
+     functions exist explicitly.  */
+  tree const fn_fputc = unlocked ? built_in_decls[BUILT_IN_FPUTC_UNLOCKED]
     : implicit_built_in_decls[BUILT_IN_FPUTC];
-  tree fn_fwrite = unlocked ? implicit_built_in_decls[BUILT_IN_FWRITE_UNLOCKED]
+  tree const fn_fwrite = unlocked ? built_in_decls[BUILT_IN_FWRITE_UNLOCKED]
     : implicit_built_in_decls[BUILT_IN_FWRITE];
 
-  /* If the return value is used, or the replacement _DECL isn't
-     initialized, don't do the transformation.  */
-  if (target != const0_rtx || !fn_fputc || !fn_fwrite)
+  /* If the return value is used, don't do the transformation.  */
+  if (target != const0_rtx)
     return 0;
 
   /* Verify the arguments in the original call.  */
@@ -4411,6 +4412,11 @@ expand_builtin_fputs (tree arglist, rtx target, bool unlocked)
       abort ();
     }
 
+  /* If the replacement _DECL isn't initialized, don't do the
+     transformation.  */
+  if (!fn)
+    return 0;
+
   return expand_expr (build_function_call_expr (fn, arglist),
 		      const0_rtx, VOIDmode, EXPAND_NORMAL);
 }
@@ -4665,11 +4671,12 @@ static rtx
 expand_builtin_printf (tree arglist, rtx target, enum machine_mode mode,
 		       bool unlocked)
 {
-  tree fn_putchar = unlocked
-		    ? implicit_built_in_decls[BUILT_IN_PUTCHAR_UNLOCKED]
-		    : implicit_built_in_decls[BUILT_IN_PUTCHAR];
-  tree fn_puts = unlocked ? implicit_built_in_decls[BUILT_IN_PUTS_UNLOCKED]
-			  : implicit_built_in_decls[BUILT_IN_PUTS];
+  /* If we're using an unlocked function, assume the other unlocked
+     functions exist explicitly.  */
+  tree const fn_putchar = unlocked ? built_in_decls[BUILT_IN_PUTCHAR_UNLOCKED]
+    : implicit_built_in_decls[BUILT_IN_PUTCHAR];
+  tree const fn_puts = unlocked ? built_in_decls[BUILT_IN_PUTS_UNLOCKED]
+    : implicit_built_in_decls[BUILT_IN_PUTS];
   const char *fmt_str;
   tree fn, fmt, arg;
 
@@ -4768,10 +4775,12 @@ static rtx
 expand_builtin_fprintf (tree arglist, rtx target, enum machine_mode mode,
 		        bool unlocked)
 {
-  tree fn_fputc = unlocked ? implicit_built_in_decls[BUILT_IN_FPUTC_UNLOCKED]
-			   : implicit_built_in_decls[BUILT_IN_FPUTC];
-  tree fn_fputs = unlocked ? implicit_built_in_decls[BUILT_IN_FPUTS_UNLOCKED]
-			   : implicit_built_in_decls[BUILT_IN_FPUTS];
+  /* If we're using an unlocked function, assume the other unlocked
+     functions exist explicitly.  */
+  tree const fn_fputc = unlocked ? built_in_decls[BUILT_IN_FPUTC_UNLOCKED]
+    : implicit_built_in_decls[BUILT_IN_FPUTC];
+  tree const fn_fputs = unlocked ? built_in_decls[BUILT_IN_FPUTS_UNLOCKED]
+    : implicit_built_in_decls[BUILT_IN_FPUTS];
   const char *fmt_str;
   tree fn, fmt, fp, arg;
 
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index bc0b8c7693b..539b50af045 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -2174,11 +2174,10 @@
 	(match_operand:SF 1 "memory_operand" ""))]
   "reload_completed
    && GET_CODE (operands[1]) == MEM
-   && GET_CODE (XEXP (operands[1], 0)) == SYMBOL_REF
-   && CONSTANT_POOL_ADDRESS_P (XEXP (operands[1], 0))"
+   && constant_pool_reference_p (operands[1])"
   [(set (match_dup 0)
 	(match_dup 1))]
-  "operands[1] = get_pool_constant (XEXP (operands[1], 0));")
+  "operands[1] = avoid_constant_pool_reference (operands[1]);")
 
 
 ;; %%% Kill this when call knows how to work this out.
@@ -2891,11 +2890,10 @@
    && GET_CODE (operands[1]) == MEM
    && (GET_MODE (operands[0]) == XFmode
        || GET_MODE (operands[0]) == SFmode || GET_MODE (operands[0]) == DFmode)
-   && GET_CODE (XEXP (operands[1], 0)) == SYMBOL_REF
-   && CONSTANT_POOL_ADDRESS_P (XEXP (operands[1], 0))"
+   && constant_pool_reference_p (operands[1])"
   [(set (match_dup 0) (match_dup 1))]
 {
-  rtx c = get_pool_constant (XEXP (operands[1], 0));
+  rtx c = avoid_constant_pool_reference (operands[1]);
   rtx r = operands[0];
 
   if (GET_CODE (r) == SUBREG)
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 76eb15a5c8e..abeea182859 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -1028,12 +1028,11 @@ gen_compare (enum rtx_code code, rtx x, rtx y, int need_compare)
 	{
 	case EQ:
 	  if (GET_CODE (y) == CONST_INT
-	      && CMP_INT16_P (INTVAL (y))		/* Reg equal to small const.  */
-	      && y != const0_rtx)
+	      && UINT16_P (INTVAL (y)))
 	    {
 	      rtx tmp = gen_reg_rtx (SImode);		
 	      
-	      emit_insn (gen_addsi3 (tmp, x, GEN_INT (-INTVAL (y))));
+	      emit_insn (gen_xorsi3 (tmp, x, GEN_INT (INTVAL (y))));
 	      x = tmp;
 	      y = const0_rtx;
 	    }
@@ -1906,7 +1905,7 @@ m32r_reload_lr (rtx sp, int size)
 
   if (size == 0)
     emit_insn (gen_movsi (lr, gen_rtx_MEM (Pmode, sp)));
-  else if (size <= 32768)
+  else if (size < 32768)
     emit_insn (gen_movsi (lr, gen_rtx_MEM (Pmode,
 					   gen_rtx_PLUS (Pmode, sp,
 							 GEN_INT (size)))));
@@ -2087,11 +2086,19 @@ m32r_output_function_epilogue (FILE * file, HOST_WIDE_INT size ATTRIBUTE_UNUSED)
 	  else if (reg_offset < 32768)
 	    fprintf (file, "\tadd3 %s,%s,%s%d\n",
 		     sp_str, sp_str, IMMEDIATE_PREFIX, reg_offset);
-	  else
+	  else if (reg_offset <= 0xffffff)
 	    fprintf (file, "\tld24 %s,%s%d\n\tadd %s,%s\n",
 		     reg_names[PROLOGUE_TMP_REGNUM],
 		     IMMEDIATE_PREFIX, reg_offset,
 		     sp_str, reg_names[PROLOGUE_TMP_REGNUM]);
+	  else
+	    fprintf (file, "\tseth %s,%shigh(%d)\n\tor3 %s,%s,%slow(%d)\n\tadd %s,%s\n",
+		     reg_names[PROLOGUE_TMP_REGNUM],
+		     IMMEDIATE_PREFIX, reg_offset,
+		     reg_names[PROLOGUE_TMP_REGNUM],
+		     reg_names[PROLOGUE_TMP_REGNUM],
+		     IMMEDIATE_PREFIX, reg_offset,
+		     sp_str, reg_names[PROLOGUE_TMP_REGNUM]);
 	}
       else if (frame_pointer_needed)
 	{
@@ -2102,10 +2109,20 @@ m32r_output_function_epilogue (FILE * file, HOST_WIDE_INT size ATTRIBUTE_UNUSED)
 	  else if (reg_offset < 32768)
 	    fprintf (file, "\tadd3 %s,%s,%s%d\n",
 		     sp_str, fp_str, IMMEDIATE_PREFIX, reg_offset);
+	  else if (reg_offset <= 0xffffff)
+	    fprintf (file, "\tld24 %s,%s%d\n\tadd %s,%s\n\tmv %s,%s\n",
+		     reg_names[PROLOGUE_TMP_REGNUM],
+		     IMMEDIATE_PREFIX, reg_offset,
+		     reg_names[PROLOGUE_TMP_REGNUM], fp_str,
+		     sp_str, reg_names[PROLOGUE_TMP_REGNUM]);
 	  else
-	    fprintf (file, "\tld24 %s,%s%d\n\tadd %s,%s\n",
+	    fprintf (file, "\tseth %s,%shigh(%d)\nor3 %s,%s,%slow(%d)\n\tadd %s,%s\n\tmv %s,%s\n",
+		     reg_names[PROLOGUE_TMP_REGNUM],
+		     IMMEDIATE_PREFIX, reg_offset,
+		     reg_names[PROLOGUE_TMP_REGNUM],
 		     reg_names[PROLOGUE_TMP_REGNUM],
 		     IMMEDIATE_PREFIX, reg_offset,
+		     reg_names[PROLOGUE_TMP_REGNUM], fp_str,
 		     sp_str, reg_names[PROLOGUE_TMP_REGNUM]);
 	}
       else
@@ -2127,8 +2144,26 @@ m32r_output_function_epilogue (FILE * file, HOST_WIDE_INT size ATTRIBUTE_UNUSED)
 
       /* Remove varargs area if present.  */
       if (current_frame_info.pretend_size != 0)
-	fprintf (file, "\taddi %s,%s%d\n",
-		 sp_str, IMMEDIATE_PREFIX, current_frame_info.pretend_size);
+        if (current_frame_info.pretend_size < 128)
+	  fprintf (file, "\taddi %s,%s%d\n",
+		     sp_str, IMMEDIATE_PREFIX, current_frame_info.pretend_size);
+        else if (current_frame_info.pretend_size < 32768)
+	  fprintf (file, "\tadd3 %s,%s,%s%d\n",
+		   sp_str, sp_str, IMMEDIATE_PREFIX,
+		   current_frame_info.pretend_size);
+        else if (current_frame_info.pretend_size <= 0xffffff)
+	  fprintf (file, "\tld24 %s,%s%d\n\tadd %s,%s\n",
+		   reg_names[PROLOGUE_TMP_REGNUM],
+		   IMMEDIATE_PREFIX, current_frame_info.pretend_size,
+		   sp_str, reg_names[PROLOGUE_TMP_REGNUM]);
+        else
+	  fprintf (file, "\tseth %s,%shigh(%d)\n\tor3 %s,%s,%slow(%d)\n\tadd %s,%s\n",
+		   reg_names[PROLOGUE_TMP_REGNUM],
+		   IMMEDIATE_PREFIX, current_frame_info.pretend_size,
+		   reg_names[PROLOGUE_TMP_REGNUM],
+		   reg_names[PROLOGUE_TMP_REGNUM],
+		   IMMEDIATE_PREFIX, current_frame_info.pretend_size,
+		   sp_str, reg_names[PROLOGUE_TMP_REGNUM]);
 	
       /* Emit the return instruction.  */
       if (M32R_INTERRUPT_P (fn_type))
diff --git a/gcc/config/m32r/m32r.md b/gcc/config/m32r/m32r.md
index 9e8d1eb0f31..c202594fc50 100644
--- a/gcc/config/m32r/m32r.md
+++ b/gcc/config/m32r/m32r.md
@@ -1690,7 +1690,7 @@
       DONE;
     }
 
-  if (! reg_or_eq_int16_operand (op2, mode))
+  if (! reg_or_uint16_operand (op2, mode))
     op2 = force_reg (mode, op2);
 
   emit_insn (gen_seq_insn (op0, op1, op2));
@@ -1752,7 +1752,7 @@
 (define_insn "seq_insn"
   [(set (match_operand:SI 0 "register_operand" "=r,r,??r,r")
 	(eq:SI (match_operand:SI 1 "register_operand" "r,r,r,r")
-	       (match_operand:SI 2 "reg_or_eq_int16_operand" "r,r,r,PK")))
+	       (match_operand:SI 2 "reg_or_uint16_operand" "r,r,r,K")))
    (clobber (reg:CC 17))
    (clobber (match_scratch:SI 3 "=1,2,&r,r"))]
   "TARGET_M32R"
@@ -1763,7 +1763,7 @@
 (define_split
   [(set (match_operand:SI 0 "register_operand" "")
 	(eq:SI (match_operand:SI 1 "register_operand" "")
-	       (match_operand:SI 2 "reg_or_eq_int16_operand" "")))
+	       (match_operand:SI 2 "reg_or_uint16_operand" "")))
    (clobber (reg:CC 17))
    (clobber (match_scratch:SI 3 ""))]
   "TARGET_M32R && reload_completed"
@@ -1791,11 +1791,7 @@
       op1 = op3;
     }
 
-  if (GET_CODE (op2) == CONST_INT && (value = INTVAL (op2)) != 0
-      && CMP_INT16_P (value))
-    emit_insn (gen_addsi3 (op3, op1, GEN_INT (-value)));
-  else
-    emit_insn (gen_xorsi3 (op3, op1, op2));
+  emit_insn (gen_xorsi3 (op3, op1, op2));
 
   emit_insn (gen_cmp_ltusi_insn (op3, GEN_INT (1)));
   emit_insn (gen_movcc_insn (op0));
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 3a5d003114e..db1f601717e 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -7533,7 +7533,8 @@ attr_length_indirect_call (rtx insn)
 
   if (TARGET_FAST_INDIRECT_CALLS
       || (!TARGET_PORTABLE_RUNTIME
-	  && ((TARGET_PA_20 && distance < 7600000) || distance < 240000)))
+	  && ((TARGET_PA_20 && !TARGET_SOM && distance < 7600000)
+	      || distance < 240000)))
     return 8;
 
   if (flag_pic)
@@ -7570,10 +7571,10 @@ output_indirect_call (rtx insn, rtx call_dest)
      the remaining cases.  */
   if (attr_length_indirect_call (insn) == 8)
     {
-      /* The HP linker substitutes a BLE for millicode calls using
-	 the short PIC PCREL form.  Thus, we must use %r31 as the
-	 link register when generating PA 1.x code.  */
-      if (TARGET_PA_20)
+      /* The HP linker sometimes substitutes a BLE for BL/B,L calls to
+	 $$dyncall.  Since BLE uses %r31 as the link register, the 22-bit
+	 variant of the B,L instruction can't be used on the SOM target.  */
+      if (TARGET_PA_20 && !TARGET_SOM)
 	return ".CALL\tARGW0=GR\n\tb,l $$dyncall,%%r2\n\tcopy %%r2,%%r31";
       else
 	return ".CALL\tARGW0=GR\n\tbl $$dyncall,%%r31\n\tcopy %%r31,%%r2";
@@ -9127,19 +9128,17 @@ som_text_section_asm_op (void)
 	      && !DECL_WEAK (cfun->decl))
 	    return
  "\t.SPACE $TEXT$\n\t.NSUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,SORT=24,COMDAT";
-
-	  return "\t.SPACE $TEXT$\n\t.NSUBSPA $CODE$";
 	}
       else
 	{
 	  /* There isn't a current function or the body of the current
 	     function has been completed.  So, we are changing to the
-	     text section to output debugging information.  Do this in
-	     the default text section.  We need to forget that we are
-	     in the text section so that the function text_section in
-	     varasm.c will call us the next time around.  */
+	     text section to output debugging information.  We need to
+	     forget that we are in the text section so that the function
+	     text_section in varasm.c will call us the next time around.  */
 	  forget_section ();
 	}
+      return "\t.SPACE $TEXT$\n\t.NSUBSPA $CODE$";
     }
 
   return "\t.SPACE $TEXT$\n\t.SUBSPA $CODE$";
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 7727cb5f85c..23b8a765597 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -461,6 +461,11 @@ typedef struct machine_function GTY(())
 #define UNITS_PER_WORD (TARGET_64BIT ? 8 : 4)
 #define MIN_UNITS_PER_WORD 4
 
+/* The widest floating point format supported by the hardware.  Note that
+   setting this influences some Ada floating point type sizes, currently
+   required for GNAT to operate properly.  */
+#define WIDEST_HARDWARE_FP_SIZE 64
+
 /* Allocation boundary (in *bits*) for storing arguments in argument list.  */
 #define PARM_BOUNDARY BITS_PER_WORD
 
diff --git a/gcc/config/pa/pa.md b/gcc/config/pa/pa.md
index c440967ff4c..f0741d2e23b 100644
--- a/gcc/config/pa/pa.md
+++ b/gcc/config/pa/pa.md
@@ -2378,9 +2378,9 @@
         (match_operand:SI 3 "register_operand" ""))]
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
-   && REG_OK_FOR_BASE_P (operands[1])
-   && (TARGET_NO_SPACE_REGS
-       || (!REG_POINTER (operands[1]) && REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_INDEX_P (operands[1])
+   && REG_OK_FOR_BASE_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:SI (plus:SI (match_dup 1) (match_dup 2)))
 	(match_dup 3))
@@ -2395,9 +2395,9 @@
         (match_operand:SI 3 "register_operand" ""))]
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
-   && REG_OK_FOR_BASE_P (operands[2])
-   && (TARGET_NO_SPACE_REGS
-       || (REG_POINTER (operands[1]) && !REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_BASE_P (operands[1])
+   && REG_OK_FOR_INDEX_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:SI (plus:SI (match_dup 2) (match_dup 1)))
 	(match_dup 3))
@@ -2413,9 +2413,9 @@
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
    && TARGET_64BIT
-   && REG_OK_FOR_BASE_P (operands[1])
-   && (TARGET_NO_SPACE_REGS
-       || (!REG_POINTER (operands[1]) && REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_INDEX_P (operands[1])
+   && REG_OK_FOR_BASE_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:SI (plus:DI (match_dup 1) (match_dup 2)))
 	(match_dup 3))
@@ -2431,9 +2431,9 @@
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
    && TARGET_64BIT
-   && REG_OK_FOR_BASE_P (operands[2])
-   && (TARGET_NO_SPACE_REGS
-       || (REG_POINTER (operands[1]) && !REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_BASE_P (operands[1])
+   && REG_OK_FOR_INDEX_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:SI (plus:DI (match_dup 2) (match_dup 1)))
 	(match_dup 3))
@@ -3896,9 +3896,9 @@
         (match_operand:DF 3 "register_operand" ""))]
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
-   && REG_OK_FOR_BASE_P (operands[1])
-   && (TARGET_NO_SPACE_REGS
-       || (!REG_POINTER (operands[1]) && REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_INDEX_P (operands[1])
+   && REG_OK_FOR_BASE_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:DF (plus:SI (match_dup 1) (match_dup 2)))
 	(match_dup 3))
@@ -3913,9 +3913,9 @@
         (match_operand:DF 3 "register_operand" ""))]
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
-   && REG_OK_FOR_BASE_P (operands[2])
-   && (TARGET_NO_SPACE_REGS
-       || (REG_POINTER (operands[1]) && !REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_BASE_P (operands[1])
+   && REG_OK_FOR_INDEX_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:DF (plus:SI (match_dup 2) (match_dup 1)))
 	(match_dup 3))
@@ -3931,9 +3931,9 @@
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
    && TARGET_64BIT
-   && REG_OK_FOR_BASE_P (operands[1])
-   && (TARGET_NO_SPACE_REGS
-       || (!REG_POINTER (operands[1]) && REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_INDEX_P (operands[1])
+   && REG_OK_FOR_BASE_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:DF (plus:DI (match_dup 1) (match_dup 2)))
 	(match_dup 3))
@@ -3949,9 +3949,9 @@
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
    && TARGET_64BIT
-   && REG_OK_FOR_BASE_P (operands[2])
-   && (TARGET_NO_SPACE_REGS
-       || (REG_POINTER (operands[1]) && !REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_BASE_P (operands[1])
+   && REG_OK_FOR_INDEX_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:DF (plus:DI (match_dup 2) (match_dup 1)))
 	(match_dup 3))
@@ -4179,9 +4179,9 @@
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
    && TARGET_64BIT
-   && REG_OK_FOR_BASE_P (operands[1])
-   && (TARGET_NO_SPACE_REGS
-       || (!REG_POINTER (operands[1]) && REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_INDEX_P (operands[1])
+   && REG_OK_FOR_BASE_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:DI (plus:DI (match_dup 1) (match_dup 2)))
 	(match_dup 3))
@@ -4197,9 +4197,9 @@
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
    && TARGET_64BIT
-   && REG_OK_FOR_BASE_P (operands[2])
-   && (TARGET_NO_SPACE_REGS
-       || (REG_POINTER (operands[1]) && !REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_BASE_P (operands[1])
+   && REG_OK_FOR_INDEX_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:DI (plus:DI (match_dup 2) (match_dup 1)))
 	(match_dup 3))
@@ -4411,9 +4411,9 @@
         (match_operand:SF 3 "register_operand" ""))]
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
-   && REG_OK_FOR_BASE_P (operands[1])
-   && (TARGET_NO_SPACE_REGS
-       || (!REG_POINTER (operands[1]) && REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_INDEX_P (operands[1])
+   && REG_OK_FOR_BASE_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:SF (plus:SI (match_dup 1) (match_dup 2)))
 	(match_dup 3))
@@ -4428,9 +4428,9 @@
         (match_operand:SF 3 "register_operand" ""))]
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
-   && REG_OK_FOR_BASE_P (operands[2])
-   && (TARGET_NO_SPACE_REGS
-       || (REG_POINTER (operands[1]) && !REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_BASE_P (operands[1])
+   && REG_OK_FOR_INDEX_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:SF (plus:SI (match_dup 2) (match_dup 1)))
 	(match_dup 3))
@@ -4446,9 +4446,9 @@
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
    && TARGET_64BIT
-   && REG_OK_FOR_BASE_P (operands[1])
-   && (TARGET_NO_SPACE_REGS
-       || (!REG_POINTER (operands[1]) && REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_INDEX_P (operands[1])
+   && REG_OK_FOR_BASE_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:SF (plus:DI (match_dup 1) (match_dup 2)))
 	(match_dup 3))
@@ -4464,9 +4464,9 @@
   "!TARGET_SOFT_FLOAT
    && !TARGET_DISABLE_INDEXING
    && TARGET_64BIT
-   && REG_OK_FOR_BASE_P (operands[2])
-   && (TARGET_NO_SPACE_REGS
-       || (REG_POINTER (operands[1]) && !REG_POINTER (operands[2])))
+   && TARGET_NO_SPACE_REGS
+   && REG_OK_FOR_BASE_P (operands[1])
+   && REG_OK_FOR_INDEX_P (operands[2])
    && FP_REGNO_P (REGNO (operands[3]))"
   [(set (mem:SF (plus:DI (match_dup 2) (match_dup 1)))
 	(match_dup 3))
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
index 3d3507a757c..3f1650aae7d 100644
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
@@ -252,6 +252,12 @@ extern int dot_symbols;
    ? rs6000_special_round_type_align (STRUCT, COMPUTED, SPECIFIED)	\
    : MAX ((COMPUTED), (SPECIFIED)))
 
+/* Use the default for compiling target libs.  */
+#ifdef IN_TARGET_LIBS
+#undef TARGET_ALIGN_NATURAL
+#define TARGET_ALIGN_NATURAL 1
+#endif
+
 /* Indicate that jump tables go in the text section.  */
 #undef  JUMP_TABLES_IN_TEXT_SECTION
 #define JUMP_TABLES_IN_TEXT_SECTION TARGET_64BIT
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index e779966b218..42671395d47 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -105,7 +105,7 @@ extern int registers_ok_for_quad_peep (rtx, rtx);
 extern int addrs_ok_for_quad_peep (rtx, rtx);
 extern bool gpr_or_gpr_p (rtx, rtx);
 extern enum reg_class secondary_reload_class (enum reg_class,
-					      enum machine_mode, rtx, int);
+					      enum machine_mode, rtx);
 extern int ccr_bit (rtx, int);
 extern int extract_MB (rtx);
 extern int extract_ME (rtx);
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 735a9fc5542..74bf3978b56 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -2505,43 +2505,6 @@ word_offset_memref_operand (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
   return (off % 4) == 0;
 }
 
-/* Return true if operand is a (MEM (PLUS (REG) (offset))) where offset
-   is not divisible by four.  */
-
-int
-invalid_gpr_mem (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
-{
-  rtx addr;
-  long off;
-
-  if (GET_CODE (op) != MEM)
-    return 0;
-
-  addr = XEXP (op, 0);
-  if (GET_CODE (addr) != PLUS
-      || GET_CODE (XEXP (addr, 0)) != REG
-      || GET_CODE (XEXP (addr, 1)) != CONST_INT)
-    return 0;
-
-  off = INTVAL (XEXP (addr, 1));
-  return (off & 3) != 0;
-}
-
-/* Return true if operand is a hard register that can be used as a base
-   register.  */
-
-int
-base_reg_operand (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
-{
-  unsigned int regno;
-
-  if (!REG_P (op))
-    return 0;
-
-  regno = REGNO (op);
-  return regno != 0 && regno <= 31;
-}
-
 /* Return true if either operand is a general purpose register.  */
 
 bool
@@ -2666,16 +2629,18 @@ legitimate_offset_address_p (enum machine_mode mode, rtx x, int strict)
 
     case DFmode:
     case DImode:
-      /* Both DFmode and DImode may end up in gprs.  If gprs are 32-bit,
-	 then we need to load/store at both offset and offset+4.  */
-      if (!TARGET_POWERPC64)
+      if (mode == DFmode || !TARGET_POWERPC64)
 	extra = 4;
+      else if (offset & 3)
+	return false;
       break;
 
     case TFmode:
     case TImode:
-      if (!TARGET_POWERPC64)
+      if (mode == TFmode || !TARGET_POWERPC64)
 	extra = 12;
+      else if (offset & 3)
+	return false;
       else
 	extra = 8;
       break;
@@ -3214,6 +3179,26 @@ rs6000_legitimize_reload_address (rtx x, enum machine_mode mode,
       return x;
     }
 #endif
+
+  /* Force ld/std non-word aligned offset into base register by wrapping
+     in offset 0.  */
+  if (GET_CODE (x) == PLUS
+      && GET_CODE (XEXP (x, 0)) == REG
+      && REGNO (XEXP (x, 0)) < 32
+      && REG_MODE_OK_FOR_BASE_P (XEXP (x, 0), mode)
+      && GET_CODE (XEXP (x, 1)) == CONST_INT
+      && (INTVAL (XEXP (x, 1)) & 3) != 0
+      && GET_MODE_SIZE (mode) >= UNITS_PER_WORD
+      && TARGET_POWERPC64)
+    {
+      x = gen_rtx_PLUS (GET_MODE (x), x, GEN_INT (0));
+      push_reload (XEXP (x, 0), NULL_RTX, &XEXP (x, 0), NULL,
+		   BASE_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0,
+		   opnum, (enum reload_type) type);
+      *win = 1;
+      return x;
+    }
+
   if (GET_CODE (x) == PLUS
       && GET_CODE (XEXP (x, 0)) == REG
       && REGNO (XEXP (x, 0)) < FIRST_PSEUDO_REGISTER
@@ -3248,6 +3233,7 @@ rs6000_legitimize_reload_address (rtx x, enum machine_mode mode,
       *win = 1;
       return x;
     }
+
 #if TARGET_MACHO
   if (GET_CODE (x) == SYMBOL_REF
       && DEFAULT_ABI == ABI_DARWIN
@@ -3277,6 +3263,7 @@ rs6000_legitimize_reload_address (rtx x, enum machine_mode mode,
       return x;
     }
 #endif
+
   if (TARGET_TOC
       && constant_pool_expr_p (x)
       && ASM_OUTPUT_SPECIAL_POOL_ENTRY_P (get_pool_constant (x), mode))
@@ -8734,14 +8721,12 @@ addrs_ok_for_quad_peep (rtx addr1, rtx addr2)
 
 /* Return the register class of a scratch register needed to copy IN into
    or out of a register in CLASS in MODE.  If it can be done directly,
-   NO_REGS is returned.  INP is nonzero if we are loading the reg, zero
-   for storing.  */
+   NO_REGS is returned.  */
 
 enum reg_class
 secondary_reload_class (enum reg_class class,
 			enum machine_mode mode,
-			rtx in,
-			int inp)
+			rtx in)
 {
   int regno;
 
@@ -8766,14 +8751,6 @@ secondary_reload_class (enum reg_class class,
         return BASE_REGS;
     }
 
-  /* A 64-bit gpr load or store using an offset that isn't a multiple of
-     four needs a secondary reload.  */
-  if (TARGET_POWERPC64
-      && GET_MODE_UNIT_SIZE (mode) >= 8
-      && (!inp || class != BASE_REGS)
-      && invalid_gpr_mem (in, mode))
-    return BASE_REGS;
-
   if (GET_CODE (in) == REG)
     {
       regno = REGNO (in);
@@ -11638,6 +11615,8 @@ uses_TOC (void)
 rtx
 create_TOC_reference (rtx symbol) 
 {
+  if (no_new_pseudos)
+    regs_ever_live[TOC_REGISTER] = 1;
   return gen_rtx_PLUS (Pmode, 
 	   gen_rtx_REG (Pmode, TOC_REGISTER),
 	     gen_rtx_CONST (Pmode, 
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 3eb947b1aaa..388377009d4 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -1496,11 +1496,8 @@ enum reg_class
    or out of a register in CLASS in MODE.  If it can be done directly,
    NO_REGS is returned.  */
 
-#define SECONDARY_INPUT_RELOAD_CLASS(CLASS, MODE, IN) \
-  secondary_reload_class (CLASS, MODE, IN, 1)
-
-#define SECONDARY_OUTPUT_RELOAD_CLASS(CLASS, MODE, IN) \
-  secondary_reload_class (CLASS, MODE, IN, 0)
+#define SECONDARY_RELOAD_CLASS(CLASS, MODE, IN) \
+  secondary_reload_class (CLASS, MODE, IN)
 
 /* If we are copying between FP or AltiVec registers and anything
    else, we need a memory location.  */
@@ -2675,8 +2672,6 @@ extern char rs6000_reg_names[][8];	/* register names (0 vs. %r0).  */
   {"lwa_operand", {SUBREG, MEM, REG}},					   \
   {"volatile_mem_operand", {MEM}},					   \
   {"offsettable_mem_operand", {MEM}},					   \
-  {"invalid_gpr_mem", {MEM}},						   \
-  {"base_reg_operand", {REG}},						   \
   {"mem_or_easy_const_operand", {SUBREG, MEM, CONST_DOUBLE}},		   \
   {"add_operand", {SUBREG, REG, CONST_INT}},				   \
   {"non_add_cint_operand", {CONST_INT}},				   \
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index e530dd94fee..0e242d4cfa6 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -8115,15 +8115,14 @@
 ; ld/std require word-aligned displacements -> 'Y' constraint.
 ; List Y->r and r->Y before r->r for reload.
 (define_insn "*movdf_hardfloat64"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=Y,r,b,!r,f,f,m,!cl,!r,!h,!r,!r,!r")
-	(match_operand:DF 1 "input_operand" "r,Y,m,r,f,m,f,r,h,0,G,H,F"))]
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=Y,r,!r,f,f,m,!cl,!r,!h,!r,!r,!r")
+	(match_operand:DF 1 "input_operand" "r,Y,r,f,m,f,r,h,0,G,H,F"))]
   "TARGET_POWERPC64 && TARGET_HARD_FLOAT && TARGET_FPRS
    && (gpc_reg_operand (operands[0], DFmode)
        || gpc_reg_operand (operands[1], DFmode))"
   "@
    std%U0%X0 %1,%0
    ld%U1%X1 %0,%1
-   #
    mr %0,%1
    fmr %0,%1
    lfd%U1%X1 %0,%1
@@ -8134,49 +8133,8 @@
    #
    #
    #"
-  [(set_attr "type" "store,load,load,*,fp,fpload,fpstore,mtjmpr,*,*,*,*,*")
-   (set_attr "length" "4,4,8,4,4,4,4,4,4,4,8,12,16")])
-
-(define_split
-  [(set (match_operand:DF 0 "base_reg_operand" "")
-	(match_operand:DF 1 "invalid_gpr_mem" ""))]
-  "TARGET_POWERPC64 && no_new_pseudos"
-  [(set (match_dup 2) (match_dup 3))
-   (set (match_dup 0) (match_dup 4))]
-  "
-{
-  operands[2] = gen_rtx_REG (Pmode, REGNO (operands[0]));
-  operands[3] = XEXP (operands[1], 0);
-  operands[4] = replace_equiv_address (operands[1], operands[2]);
-}")
-
-(define_expand "reload_outdf"
-  [(parallel [(match_operand:DF 0 "invalid_gpr_mem" "")
-	      (match_operand:DF 1 "register_operand" "")
-	      (match_operand:DI 2 "register_operand" "=&b")])]
-  "TARGET_POWERPC64"
-{
-  if (!TARGET_64BIT)
-    operands[2] = gen_rtx_REG (SImode, REGNO (operands[2]));
-  emit_move_insn (operands[2], XEXP (operands[0], 0));
-  operands[0] = replace_equiv_address (operands[0], operands[2]);
-  emit_move_insn (operands[0], operands[1]);
-  DONE;
-})
-
-(define_expand "reload_indf"
-  [(parallel [(match_operand:DF 0 "register_operand" "")
-	      (match_operand:DF 1 "invalid_gpr_mem" "")
-	      (match_operand:DI 2 "register_operand" "=&b")])]
-  "TARGET_POWERPC64"
-{
-  if (!TARGET_64BIT)
-    operands[2] = gen_rtx_REG (SImode, REGNO (operands[2]));
-  emit_move_insn (operands[2], XEXP (operands[1], 0));
-  operands[1] = replace_equiv_address (operands[1], operands[2]);
-  emit_move_insn (operands[0], operands[1]);
-  DONE;
-})
+  [(set_attr "type" "store,load,*,fp,fpload,fpstore,mtjmpr,*,*,*,*,*")
+   (set_attr "length" "4,4,4,4,4,4,4,4,4,8,12,16")])
 
 (define_insn "*movdf_softfloat64"
   [(set (match_operand:DF 0 "nonimmediate_operand" "=r,Y,r,cl,r,r,r,r,*h")
@@ -8521,15 +8479,14 @@
 }")
 
 (define_insn "*movdi_internal64"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=Y,r,b,r,r,r,r,r,??f,f,m,r,*h,*h")
-	(match_operand:DI 1 "input_operand" "r,Y,m,r,I,L,nF,R,f,m,f,*h,r,0"))]
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=Y,r,r,r,r,r,r,??f,f,m,r,*h,*h")
+	(match_operand:DI 1 "input_operand" "r,Y,r,I,L,nF,R,f,m,f,*h,r,0"))]
   "TARGET_POWERPC64
    && (gpc_reg_operand (operands[0], DImode)
        || gpc_reg_operand (operands[1], DImode))"
   "@
    std%U0%X0 %1,%0
    ld%U1%X1 %0,%1
-   #
    mr %0,%1
    li %0,%1
    lis %0,%v1
@@ -8541,51 +8498,8 @@
    mf%1 %0
    mt%0 %1
    {cror 0,0,0|nop}"
-  [(set_attr "type" "store,load,load,*,*,*,*,*,fp,fpload,fpstore,mfjmpr,mtjmpr,*")
-   (set_attr "length" "4,4,8,4,4,4,20,4,4,4,4,4,4,4")])
-
-(define_split
-  [(set (match_operand:DI 0 "base_reg_operand" "")
-	(match_operand:DI 1 "invalid_gpr_mem" ""))]
-  "TARGET_POWERPC64 && no_new_pseudos"
-  [(set (match_dup 2) (match_dup 3))
-   (set (match_dup 0) (match_dup 4))]
-  "
-{
-  operands[2] = operands[0];
-  if (!TARGET_64BIT)
-    operands[2] = gen_rtx_REG (SImode, REGNO (operands[0]));
-  operands[3] = XEXP (operands[1], 0);
-  operands[4] = replace_equiv_address (operands[1], operands[2]);
-}")
-
-(define_expand "reload_outdi"
-  [(parallel [(match_operand:DI 0 "invalid_gpr_mem" "")
-              (match_operand:DI 1 "register_operand" "")
-              (match_operand:DI 2 "register_operand" "=&b")])]
-  "TARGET_POWERPC64"
-{
-  if (!TARGET_64BIT)
-    operands[2] = gen_rtx_REG (SImode, REGNO (operands[2]));
-  emit_move_insn (operands[2], XEXP (operands[0], 0));
-  operands[0] = replace_equiv_address (operands[0], operands[2]);
-  emit_move_insn (operands[0], operands[1]);
-  DONE;
-})
-
-(define_expand "reload_indi"
-  [(parallel [(match_operand:DI 0 "register_operand" "")
-	      (match_operand:DI 1 "invalid_gpr_mem" "")
-	      (match_operand:DI 2 "register_operand" "=&b")])]
-  "TARGET_POWERPC64"
-{
-  if (!TARGET_64BIT)
-    operands[2] = gen_rtx_REG (SImode, REGNO (operands[2]));
-  emit_move_insn (operands[2], XEXP (operands[1], 0));
-  operands[1] = replace_equiv_address (operands[1], operands[2]);
-  emit_move_insn (operands[0], operands[1]);
-  DONE;
-})
+  [(set_attr "type" "store,load,*,*,*,*,*,fp,fpload,fpstore,mfjmpr,mtjmpr,*")
+   (set_attr "length" "4,4,4,4,4,20,4,4,4,4,4,4,4")])
 
 ;; immediate value valid for a single instruction hiding in a const_double
 (define_insn ""
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index 2c4a7d58700..bfba34aa86c 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler for Renesas / SuperH SH.
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004 Free Software Foundation, Inc.
+   2003, 2004, 2006 Free Software Foundation, Inc.
    Contributed by Steve Chamberlain (sac@cygnus.com).
    Improved by Jim Wilson (wilson@cygnus.com).
 
@@ -1345,30 +1345,11 @@ extern enum reg_class reg_class_from_letter[];
    unused CONST_INT constraint letters: LO
    unused EXTRA_CONSTRAINT letters: D T U Y */
 
-#if 1 /* check that the transition went well.  */
-#define CONSTRAINT_LEN(C,STR) \
-  (((C) == 'L' || (C) == 'O' || (C) == 'D' || (C) == 'T' || (C) == 'U' \
-    || (C) == 'Y' \
-    || ((C) == 'I' \
-        && (((STR)[1] != '0' && (STR)[1] != '1') \
-	    || (STR)[2] < '0' || (STR)[2] > '9')) \
-    || ((C) == 'B' && ((STR)[1] != 's' || (STR)[2] != 'c')) \
-    || ((C) == 'J' && ((STR)[1] != '1' || (STR)[2] != '6')) \
-    || ((C) == 'K' && ((STR)[1] != '0' || (STR)[2] != '8')) \
-    || ((C) == 'P' && ((STR)[1] != '2' || (STR)[2] != '7'))) \
-   ? -1 \
-   : ((C) == 'A' || (C) == 'B' || (C) == 'C' \
-      || (C) == 'I' || (C) == 'J' || (C) == 'K' || (C) == 'P' \
-      || (C) == 'R' || (C) == 'S') \
-   ? 3 \
-   : DEFAULT_CONSTRAINT_LEN ((C), (STR)))
-#else
 #define CONSTRAINT_LEN(C,STR) \
   (((C) == 'A' || (C) == 'B' || (C) == 'C' \
     || (C) == 'I' || (C) == 'J' || (C) == 'K' || (C) == 'P' \
     || (C) == 'R' || (C) == 'S') \
    ? 3 : DEFAULT_CONSTRAINT_LEN ((C), (STR)))
-#endif
 
 /* The letters I, J, K, L and M in a register constraint string
    can be used to stand for particular ranges of immediate operands.
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 0b07e46f6ef..86524cc3732 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -2946,26 +2946,34 @@ eligible_for_epilogue_delay (rtx trial, int slot)
 int
 tls_call_delay (rtx trial)
 {
-  rtx pat, unspec;
+  rtx pat;
 
   /* Binutils allows
-     call __tls_get_addr, %tgd_call (foo)
-      add %l7, %o0, %o0, %tgd_add (foo)
+       call __tls_get_addr, %tgd_call (foo)
+        add %l7, %o0, %o0, %tgd_add (foo)
      while Sun as/ld does not.  */
   if (TARGET_GNU_TLS || !TARGET_TLS)
     return 1;
 
   pat = PATTERN (trial);
-  if (GET_CODE (pat) != SET || GET_CODE (SET_DEST (pat)) != PLUS)
-    return 1;
 
-  unspec = XEXP (SET_DEST (pat), 1);
-  if (GET_CODE (unspec) != UNSPEC
-      || (XINT (unspec, 1) != UNSPEC_TLSGD
-	  && XINT (unspec, 1) != UNSPEC_TLSLDM))
-    return 1;
+  /* We must reject tgd_add{32|64}, i.e.
+       (set (reg) (plus (reg) (unspec [(reg) (symbol_ref)] UNSPEC_TLSGD)))
+     and tldm_add{32|64}, i.e.
+       (set (reg) (plus (reg) (unspec [(reg) (symbol_ref)] UNSPEC_TLSLDM)))
+     for Sun as/ld.  */
+  if (GET_CODE (pat) == SET
+      && GET_CODE (SET_SRC (pat)) == PLUS)
+    {
+      rtx unspec = XEXP (SET_SRC (pat), 1);
 
-  return 0;
+      if (GET_CODE (unspec) == UNSPEC
+	  && (XINT (unspec, 1) == UNSPEC_TLSGD
+	      || XINT (unspec, 1) == UNSPEC_TLSLDM))
+	return 0;
+    }
+
+  return 1;
 }
 
 /* Return nonzero if TRIAL can go into the sibling call
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 395c1e4de55..85ba608380b 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -172,8 +172,8 @@ read_counts_file (void)
       GCOV_UNSIGNED2STRING (v, tag);
       GCOV_UNSIGNED2STRING (e, GCOV_VERSION);
 
-      warning ("`%s' is version `%.4s', expected version `%.4s'",
- 	       da_file_name, v, e);
+      warning ("`%s' is version `%.*s', expected version `%.*s'",
+ 	       da_file_name, 4, v, 4, e);
       gcov_close ();
       return;
     }
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 53fee4e88d1..08733365c08 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,127 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2006-02-23  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/26291
+	* decl.c (grok_op_properties): Check for ellipsis in arguments of
+	operators.
+
+2006-02-08  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/26070
+	* decl.c (grokdeclarator): Clear RID_STATIC together with staticp.
+
+2006-02-01  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-12-22  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/25369
+	* pt.c (tsubst_copy): Call mark_used on the member referenced by an
+	OFFSET_REF.
+	* decl2.c (mark_used): Accept BASELINKs.
+
+2006-02-01  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-12-19  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/24915
+	* class.c (add_method): Do not treat templates as identical unless
+	their return types are the same.
+
+2006-02-01  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-12-19  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/24278
+	* init.c (expand_member_init): Print messages about baseclasses
+	using %T rather than %D.
+
+2006-01-24  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/16829
+	* decl.c (start_preparsed_function): Check default arguments
+	unconditionally.
+	* name-lookup.c (pushdecl_maybe_friend): Check default arguments
+	of all functions and function templates.
+	* parser.c (cp_parser_late_parsing_default_args): Check default
+	arguments.
+	* decl2.c (check_default_args): Set missing default arguments to
+	error_mark_node.
+
+2006-01-19  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/25854
+	* pt.c (maybe_process_partial_specialization): Return early on
+	error_mark_node.
+
+2005-12-19  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/20552
+	Backport:
+	2004-03-08  Mark Mitchell  <mark@codesourcery.com>
+
+	* decl.c (duplicate_decls): Don't check IDENTIFIER_ERROR_LOCUS.
+
+2005-12-07  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/19397
+	PR c++/19762
+	PR c++/19764
+	* parser.c (cp_parser_declarator_id): Check for error_mark_node
+	before building a SCOPE_REF.
+
+2005-12-07  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-20  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/22618
+	* search.c (accessible_p): Check access in the outermost set of
+	template parameters.
+
+2005-12-06  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-18  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/21383
+	* name-lookup.c (arg_assoc): Template args can be null in a
+	template-id-expr.
+
+2005-12-05  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/22352
+	* pt.c (tsubst_template_parms): Set processing_template_decl while
+	processing the parameters.
+	(tsubst_decl): Set processing_template_decl when substituting into
+	a TEMPLATE_DECL.
+
+2005-12-05  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/22464
+	* semantics.c (finish_id_expression): Issue errors about uses of
+	local variables in containing functions even in templates.
+
+2005-12-05  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/23307
+	* pt.c (push_template_decl_real): Complain about attempts to
+	declare template variables.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 226ba32e1dd..be370a931e8 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -879,9 +879,10 @@ add_method (tree type, tree method, int error_p)
 	   fns = OVL_NEXT (fns))
 	{
 	  tree fn = OVL_CURRENT (fns);
+	  tree fn_type;
+	  tree method_type;
 	  tree parms1;
 	  tree parms2;
-	  bool same = 1;
 
 	  if (TREE_CODE (fn) != TREE_CODE (method))
 	    continue;
@@ -896,8 +897,10 @@ add_method (tree type, tree method, int error_p)
 	     functions in the derived class override and/or hide member
 	     functions with the same name and parameter types in a base
 	     class (rather than conflicting).  */
-	  parms1 = TYPE_ARG_TYPES (TREE_TYPE (fn));
-	  parms2 = TYPE_ARG_TYPES (TREE_TYPE (method));
+	  fn_type = TREE_TYPE (fn);
+	  method_type = TREE_TYPE (method);
+	  parms1 = TYPE_ARG_TYPES (fn_type);
+	  parms2 = TYPE_ARG_TYPES (method_type);
 
 	  /* Compare the quals on the 'this' parm.  Don't compare
 	     the whole types, as used functions are treated as
@@ -906,23 +909,25 @@ add_method (tree type, tree method, int error_p)
 	      && ! DECL_STATIC_FUNCTION_P (method)
 	      && (TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms1)))
 		  != TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms2)))))
-	    same = 0;
+	    continue;
 	  
 	  /* For templates, the template parms must be identical.  */
 	  if (TREE_CODE (fn) == TEMPLATE_DECL
-	      && !comp_template_parms (DECL_TEMPLATE_PARMS (fn),
-				       DECL_TEMPLATE_PARMS (method)))
-	    same = 0;
+	      && (!same_type_p (TREE_TYPE (fn_type),
+				TREE_TYPE (method_type))
+		  || !comp_template_parms (DECL_TEMPLATE_PARMS (fn),
+					   DECL_TEMPLATE_PARMS (method))))
+	    continue;
 	  
 	  if (! DECL_STATIC_FUNCTION_P (fn))
 	    parms1 = TREE_CHAIN (parms1);
 	  if (! DECL_STATIC_FUNCTION_P (method))
 	    parms2 = TREE_CHAIN (parms2);
 
-	  if (same && compparms (parms1, parms2) 
+	  if (compparms (parms1, parms2) 
 	      && (!DECL_CONV_FN_P (fn) 
-		  || same_type_p (TREE_TYPE (TREE_TYPE (fn)),
-				  TREE_TYPE (TREE_TYPE (method)))))
+		  || same_type_p (TREE_TYPE (fn_type),
+				  TREE_TYPE (method_type))))
 	    {
 	      if (using && DECL_CONTEXT (fn) == type)
 		/* Defer to the local function.  */
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index fab8cd4cf45..2b404e3992e 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -1380,10 +1380,7 @@ duplicate_decls (tree newdecl, tree olddecl)
 	  else
 	    return NULL_TREE;
 	}
-
-      /* Already complained about this, so don't do so again.  */
-      else if (current_class_type == NULL_TREE
-	  || IDENTIFIER_ERROR_LOCUS (DECL_ASSEMBLER_NAME (newdecl)) != current_class_type)
+      else
 	{
 	  error ("conflicting declaration '%#D'", newdecl);
 	  cp_error_at ("'%D' has a previous declaration as `%#D'",
@@ -7212,8 +7209,8 @@ grokdeclarator (tree declarator,
 
   if (virtualp && staticp == 2)
     {
-      error ("member `%D' cannot be declared both virtual and static",
-		dname);
+      error ("member `%D' cannot be declared both virtual and static", dname);
+      RIDBIT_RESET (RID_STATIC, specbits);
       staticp = 0;
     }
   friendp = RIDBIT_SETP (RID_FRIEND, specbits);
@@ -9037,17 +9034,19 @@ grok_op_properties (tree decl, bool complain)
   tree name = DECL_NAME (decl);
   enum tree_code operator_code;
   int arity;
+  bool ellipsis_p;
   bool ok;
   tree class_type;
 
   /* Assume that the declaration is valid.  */
   ok = true;
 
-  /* Count the number of arguments.  */
+  /* Count the number of arguments. and check for ellipsis  */
   for (argtype = argtypes, arity = 0;
        argtype && argtype != void_list_node;
        argtype = TREE_CHAIN (argtype))
     ++arity;
+  ellipsis_p = !argtype;
 
   class_type = DECL_CONTEXT (decl);
   if (class_type && !CLASS_TYPE_P (class_type))
@@ -9187,11 +9186,14 @@ grok_op_properties (tree decl, bool complain)
 	    warning ("conversion to %s%s will never use a type conversion operator",
 		     ref ? "a reference to " : "", what);
 	}
+
       if (operator_code == COND_EXPR)
 	{
 	  /* 13.4.0.3 */
 	  error ("ISO C++ prohibits overloading operator ?:");
 	}
+      else if (ellipsis_p)
+	error ("`%D' must not have variable number of arguments", decl);
       else if (ambi_op_p (operator_code))
 	{
 	  if (arity == 1)
@@ -10357,6 +10359,8 @@ start_function (tree declspecs, tree declarator, tree attrs, int flags)
      must be complete when you define the function.  */
   if (! processing_template_decl)
     check_function_type (decl1, current_function_parms);
+  /* Make sure no default arg is missing.  */
+  check_default_args (decl1);
 
   /* Build the return declaration for the function.  */
   restype = TREE_TYPE (fntype);
@@ -10420,8 +10424,6 @@ start_function (tree declspecs, tree declarator, tree attrs, int flags)
 	  /* We need to set the DECL_CONTEXT.  */
 	  if (!DECL_CONTEXT (decl1) && DECL_TEMPLATE_INFO (decl1))
 	    DECL_CONTEXT (decl1) = DECL_CONTEXT (DECL_TI_TEMPLATE (decl1));
-	  /* And make sure we have enough default args.  */
-	  check_default_args (decl1);
 	}
       fntype = TREE_TYPE (decl1);
     }
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 37b8f2b7128..4b78ebd35ff 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -3012,7 +3012,7 @@ check_default_args (tree x)
 	{
 	  cp_error_at ("default argument missing for parameter %P of `%+#D'",
 		       i, x);
-	  break;
+	  TREE_PURPOSE (arg) = error_mark_node;
 	}
     }
 }
@@ -3020,6 +3020,18 @@ check_default_args (tree x)
 void
 mark_used (tree decl)
 {
+  /* If DECL is a BASELINK for a single function, then treat it just
+     like the DECL for the function.  Otherwise, if the BASELINK is
+     for an overloaded function, we don't know which function was
+     actually used until after overload resolution.  */
+  if (TREE_CODE (decl) == BASELINK)
+    {
+      decl = BASELINK_FUNCTIONS (decl);
+      if (really_overloaded_fn (decl))
+	return;
+      decl = OVL_CURRENT (decl);
+    }
+
   TREE_USED (decl) = 1;
   if (processing_template_decl || skip_evaluation)
     return;
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 8064e4f5891..4e3cd4bef42 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1015,11 +1015,11 @@ expand_member_init (tree name)
       if (!direct_binfo && !virtual_binfo)
 	{
 	  if (TYPE_USES_VIRTUAL_BASECLASSES (current_class_type))
-	    error ("type `%D' is not a direct or virtual base of `%T'",
-		   name, current_class_type);
+	    error ("type `%T' is not a direct or virtual base of `%T'",
+		   basetype, current_class_type);
 	  else
-	    error ("type `%D' is not a direct base of `%T'",
-		   name, current_class_type);
+	    error ("type `%T' is not a direct base of `%T'",
+		   basetype, current_class_type);
 	  return NULL_TREE;
 	}
 
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index adfc26d8162..8715ce14c29 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -606,6 +606,9 @@ pushdecl (tree x)
     {
       int different_binding_level = 0;
 
+      if (TREE_CODE (x) == FUNCTION_DECL || DECL_FUNCTION_TEMPLATE_P (x))
+       check_default_args (x);
+
       if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
 	name = TREE_OPERAND (name, 0);
 
@@ -717,8 +720,6 @@ pushdecl (tree x)
 		{
 		  if (TREE_CODE (t) == TYPE_DECL)
 		    SET_IDENTIFIER_TYPE_VALUE (name, TREE_TYPE (t));
-		  else if (TREE_CODE (t) == FUNCTION_DECL)
-		    check_default_args (t);
 
 		  POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, t);
 		}
@@ -1001,9 +1002,6 @@ pushdecl (tree x)
 	    }
 	}
 
-      if (TREE_CODE (x) == FUNCTION_DECL)
-	check_default_args (x);
-
       if (TREE_CODE (x) == VAR_DECL)
 	maybe_register_incomplete_var (x);
     }
@@ -4434,9 +4432,10 @@ arg_assoc (struct arg_lookup *k, tree n)
 	return true;
 
       /* Now the arguments.  */
-      for (ix = TREE_VEC_LENGTH (args); ix--;)
-	if (arg_assoc_template_arg (k, TREE_VEC_ELT (args, ix)) == 1)
-	  return true;
+      if (args)
+	for (ix = TREE_VEC_LENGTH (args); ix--;)
+	  if (arg_assoc_template_arg (k, TREE_VEC_ELT (args, ix)) == 1)
+	    return true;
     }
   else if (TREE_CODE (n) == OVERLOAD)
     {
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index c04ba670531..75572495244 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10910,7 +10910,7 @@ cp_parser_declarator_id (cp_parser* parser)
 					   /*declarator_p=*/true);
   /* If the name was qualified, create a SCOPE_REF to represent 
      that.  */
-  if (parser->scope)
+  if (parser->scope && id_expression != error_mark_node)
     {
       id_expression = build_nt (SCOPE_REF, parser->scope, id_expression);
       parser->scope = NULL_TREE;
@@ -14934,6 +14934,9 @@ cp_parser_late_parsing_default_args (cp_parser *parser, tree fn)
       parser->local_variables_forbidden_p = saved_local_variables_forbidden_p;
     }
 
+  /* Make sure no default arg is missing.  */
+  check_default_args (fn);
+
   /* Restore the queue.  */
   parser->unparsed_functions_queues 
     = TREE_CHAIN (parser->unparsed_functions_queues);
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index d826c74eee3..fe566914fce 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -744,8 +744,12 @@ check_specialization_namespace (tree tmpl)
 void 
 maybe_process_partial_specialization (tree type)
 {
-  /* TYPE maybe an ERROR_MARK_NODE.  */
-  tree context = TYPE_P (type) ? TYPE_CONTEXT (type) : NULL_TREE;
+  tree context;
+
+  if (type == error_mark_node)
+    return;
+
+  context = TYPE_CONTEXT (type);
 
   if (CLASS_TYPE_P (type) && CLASSTYPE_USE_TEMPLATE (type))
     {
@@ -2837,9 +2841,8 @@ push_template_decl_real (tree decl, int is_friend)
 	      return decl;
 	    }
 	}
-      else if ((DECL_IMPLICIT_TYPEDEF_P (decl)
-		&& CLASS_TYPE_P (TREE_TYPE (decl)))
-	       || (TREE_CODE (decl) == VAR_DECL && ctx && CLASS_TYPE_P (ctx)))
+      else if (DECL_IMPLICIT_TYPEDEF_P (decl)
+	       && CLASS_TYPE_P (TREE_TYPE (decl)))
 	/* OK */;
       else
 	{
@@ -5786,6 +5789,12 @@ tsubst_template_parms (tree parms, tree args, tsubst_flags_t complain)
   tree r = NULL_TREE;
   tree* new_parms;
 
+  /* When substituting into a template, we must set
+     PROCESSING_TEMPLATE_DECL as the template parameters may be
+     dependent if they are based on one-another, and the dependency
+     predicates are short-circuit outside of templates.  */
+  ++processing_template_decl;
+
   for (new_parms = &r;
        TMPL_PARMS_DEPTH (parms) > TMPL_ARGS_DEPTH (args);
        new_parms = &(TREE_CHAIN (*new_parms)),
@@ -5815,6 +5824,8 @@ tsubst_template_parms (tree parms, tree args, tsubst_flags_t complain)
 		   new_vec, NULL_TREE);
     }
 
+  --processing_template_decl;
+
   return r;
 }
 
@@ -6000,8 +6011,14 @@ tsubst_decl (tree t, tree args, tree type, tsubst_flags_t complain)
 	      : DECL_TI_ARGS (DECL_TEMPLATE_RESULT (t));
 	    tree full_args;
 	    
+	    /* Because this is a template, the arguments will still be
+	       dependent, even after substitution.  If
+	       PROCESSING_TEMPLATE_DECL is not set, the dependency
+	       predicates will short-circuit.  */
+	    ++processing_template_decl;
 	    full_args = tsubst_template_args (tmpl_args, args,
 					      complain, in_decl);
+	    --processing_template_decl;
 
 	    /* tsubst_template_args doesn't copy the vector if
 	       nothing changed.  But, *something* should have
@@ -6033,15 +6050,14 @@ tsubst_decl (tree t, tree args, tree type, tsubst_flags_t complain)
 	    break;
 	  }
 
-	DECL_CONTEXT (r) 
-	  = tsubst_aggr_type (DECL_CONTEXT (t), args, 
-			      complain, in_decl, 
-			      /*entering_scope=*/1); 
 	DECL_TEMPLATE_INFO (r) = build_tree_list (t, args);
 
 	if (TREE_CODE (decl) == TYPE_DECL)
 	  {
-	    tree new_type = tsubst (TREE_TYPE (t), args, complain, in_decl);
+	    tree new_type;
+	    ++processing_template_decl;
+	    new_type = tsubst (TREE_TYPE (t), args, complain, in_decl);
+	    --processing_template_decl; 
 	    if (new_type == error_mark_node)
 	      return error_mark_node;
 
@@ -6049,10 +6065,14 @@ tsubst_decl (tree t, tree args, tree type, tsubst_flags_t complain)
 	    CLASSTYPE_TI_TEMPLATE (new_type) = r;
 	    DECL_TEMPLATE_RESULT (r) = TYPE_MAIN_DECL (new_type);
 	    DECL_TI_ARGS (r) = CLASSTYPE_TI_ARGS (new_type);
+	    DECL_CONTEXT (r) = TYPE_CONTEXT (new_type);
 	  }
 	else
 	  {
-	    tree new_decl = tsubst (decl, args, complain, in_decl);
+	    tree new_decl;
+	    ++processing_template_decl;
+	    new_decl = tsubst (decl, args, complain, in_decl);
+	    --processing_template_decl;
 	    if (new_decl == error_mark_node)
 	      return error_mark_node;
 
@@ -6060,6 +6080,7 @@ tsubst_decl (tree t, tree args, tree type, tsubst_flags_t complain)
 	    DECL_TI_TEMPLATE (new_decl) = r;
 	    TREE_TYPE (r) = TREE_TYPE (new_decl);
 	    DECL_TI_ARGS (r) = DECL_TI_ARGS (new_decl);
+	    DECL_CONTEXT (r) = DECL_CONTEXT (new_decl); 
 	  }
 
 	SET_DECL_IMPLICIT_INSTANTIATION (r);
@@ -7786,6 +7807,10 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 					  in_decl),
 			     tsubst (TREE_TYPE (t), args, complain, in_decl));
 
+    case OFFSET_REF:
+      mark_used (TREE_OPERAND (t, 1));
+      return t;
+
     default:
       return t;
     }
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 0dfdb922978..c227175b0ca 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -946,8 +946,12 @@ accessible_p (tree type, tree decl)
   /* In a template declaration, we cannot be sure whether the
      particular specialization that is instantiated will be a friend
      or not.  Therefore, all access checks are deferred until
-     instantiation.  */
-  if (processing_template_decl)
+     instantiation.  However, PROCESSING_TEMPLATE_DECL is set in the
+     parameter list for a template (because we may see dependent types
+     in default arguments for template parameters), and access
+     checking should be performed in the outermost parameter list.  */ 
+  if (processing_template_decl 
+      && (!processing_template_parmlist || processing_template_decl > 1))
     return 1;
 
   if (!TYPE_P (type))
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 55984b75ade..943e7a1a92a 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2400,6 +2400,21 @@ finish_id_expression (tree id_expression,
 	 was entirely defined.  */
       if (!scope && decl != error_mark_node)
 	maybe_note_name_used_in_class (id_expression, decl);
+
+      /* Disallow uses of local variables from containing functions.  */
+      if (TREE_CODE (decl) == VAR_DECL || TREE_CODE (decl) == PARM_DECL)
+	{
+	  tree context = decl_function_context (decl);
+	  if (context != NULL_TREE && context != current_function_decl
+	      && ! TREE_STATIC (decl))
+	    {
+	      error (TREE_CODE (decl) == VAR_DECL
+		     ? "use of `auto' variable from containing function"
+		     : "use of parameter from containing function");
+	      cp_error_at ("  `%#D' declared here", decl);
+	      return error_mark_node;
+	    }
+	}
     }
 
   /* If we didn't find anything, or what we found was a type,
@@ -2666,23 +2681,6 @@ finish_id_expression (tree id_expression,
 	}
       else
 	{
-	  if (TREE_CODE (decl) == VAR_DECL
-	      || TREE_CODE (decl) == PARM_DECL
-	      || TREE_CODE (decl) == RESULT_DECL)
-	    {
-	      tree context = decl_function_context (decl);
-	      
-	      if (context != NULL_TREE && context != current_function_decl
-		  && ! TREE_STATIC (decl))
-		{
-		  error ("use of %s from containing function",
-			 (TREE_CODE (decl) == VAR_DECL
-			  ? "`auto' variable" : "parameter"));
-		  cp_error_at ("  `%#D' declared here", decl);
-		  return error_mark_node;
-		}
-	    }
-	  
 	  if (DECL_P (decl) && DECL_NONLOCAL (decl)
 	      && DECL_CLASS_SCOPE_P (decl)
 	      && DECL_CONTEXT (decl) != current_class_type)
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index c5587bcdaed..04f1a166b2b 100644
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -1071,6 +1071,7 @@ _cpp_pop_file_buffer (cpp_reader *pfile, _cpp_file *file)
     {
       free ((void *) file->buffer);
       file->buffer = NULL;
+      file->buffer_valid = false;
     }
 }
 
diff --git a/gcc/cse.c b/gcc/cse.c
index 447d972c340..72af39aa4f3 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -3518,6 +3518,9 @@ fold_rtx (rtx x, rtx insn)
 	      addr = addr_ent->const_rtx;
 	  }
 
+	/* Call target hook to avoid the effects of -fpic etc....  */
+	addr = targetm.delegitimize_address (addr);
+
 	/* If address is constant, split it into a base and integer offset.  */
 	if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == LABEL_REF)
 	  base = addr;
diff --git a/gcc/doc/contrib.texi b/gcc/doc/contrib.texi
index 8c2419377ea..3a279cd44a5 100644
--- a/gcc/doc/contrib.texi
+++ b/gcc/doc/contrib.texi
@@ -269,9 +269,12 @@ Ivan Fontes Garcia for the Portugese translation of the GCJ FAQ.
 Peter Gerwinski for various bug fixes and the Pascal front end.
 
 @item
-Kaveh Ghazi for his direction via the steering committee,
-amazing work to make @samp{-W -Wall} useful, and continuously testing
-GCC on a plethora of platforms.
+Kaveh R.@: Ghazi for his direction via the steering committee, amazing
+work to make @samp{-W -Wall -W* -Werror} useful, and continuously
+testing GCC on a plethora of platforms.  Kaveh extends his gratitude to
+the @uref{http://www.caip.rutgers.edu,,CAIP Center} at Rutgers
+University for providing him with computing resources to work on Free
+Software since the late 1980s.
 
 @item
 John Gilmore for a donation to the FSF earmarked improving GNU Java.
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 128917163eb..58cf3e0544c 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,17 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2006-01-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* g77spec.c (lang_specific_driver): Update copyright notice date.
+
+2005-12-27  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+	PR/25494
+	* g77.texi: Corrected entry about catching
+	Floating Point Exceptions.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/f/g77.texi b/gcc/f/g77.texi
index 3d5f83d3da6..23172315fbc 100644
--- a/gcc/f/g77.texi
+++ b/gcc/f/g77.texi
@@ -9415,12 +9415,13 @@ trapfpe ()
 @}
 @end smallexample
 
-A convenient trick is to compile this something like:
+Assuming the above source is in file @file{trapfpe.c},
+then compile this routine as follows:
 @smallexample
-gcc -o libtrapfpe.a trapfpe.c
+gcc -c trapfpe.c
 @end smallexample
-and then use it by adding @option{-trapfpe} to the @command{g77} command line
-when linking.
+and subsequently use it by adding @file{trapfpe.o} to the @command{g77}
+command line when linking.
 
 @node Nonportable Conversions
 @subsection Nonportable Conversions
diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index 3dca7bc4483..ce1bc698f44 100644
--- a/gcc/f/g77spec.c
+++ b/gcc/f/g77spec.c
@@ -1,5 +1,5 @@
 /* Specific flags and argument handling of the Fortran front-end.
-   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2006
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -347,7 +347,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
 
 	case OPTION_version:
 	  printf ("GNU Fortran (GCC) %s\n", version_string);
-	  printf ("Copyright %s 2004 Free Software Foundation, Inc.\n",
+	  printf ("Copyright %s 2006 Free Software Foundation, Inc.\n",
 		  _("(C)"));
 	  printf ("\n");
 	  printf (_("\
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index b9eb929b4b9..88d005bbfee 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Monday November  7, 2005 at 02:33:08 PM PST
+ * It has been AutoGen-ed  Friday December 16, 2005 at 01:14:56 PM EST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Nov  7 14:33:08 PST 2005
+/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Dec 16 13:14:56 EST 2005
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 188 fixup descriptions.
+ * This file contains 189 fixup descriptions.
  *
  * See README for more information.
  *
@@ -26,8 +26,7 @@
  *  
  *  You may 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.
+ *  Foundation; either version 2, or (at your option) any later version.
  *  
  *  inclhack is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,10 +34,10 @@
  *  See the GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with inclhack.  If not, write to:
- *  	The Free Software Foundation, Inc.,
- *  	51 Franklin Street, Fifth Floor
- *  	Boston, MA  02110-1301, USA.
+ *  along with inclhack.  See the file "COPYING".  If not,
+ *  write to:  The Free Software Foundation, Inc.,
+ *             59 Temple Place - Suite 330,
+ *             Boston,  MA  02111-1307, USA.
  */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -5361,6 +5360,56 @@ s@_Va_LIST@_VA_LIST@",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Stdio_Va_List_Clients fix
+ */
+tSCC zStdio_Va_List_ClientsName[] =
+     "stdio_va_list_clients";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zStdio_Va_List_ClientsList[] =
+  "|com_err.h|cps.h|curses.h|krb5.h|lc_core.h|pfmt.h|wchar.h|curses_colr/curses.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStdio_Va_List_ClientsMachs (const char**)NULL
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zStdio_Va_List_ClientsBypass0[] =
+       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
+tSCC zStdio_Va_List_ClientsBypass1[] =
+       "include <stdarg\\.h>|#ifdef va_start";
+
+#define    STDIO_VA_LIST_CLIENTS_TEST_CT  2
+static tTestDesc aStdio_Va_List_ClientsTests[] = {
+  { TT_NEGREP,   zStdio_Va_List_ClientsBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zStdio_Va_List_ClientsBypass1, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Stdio_Va_List_Clients
+ */
+static const char* apzStdio_Va_List_ClientsPatch[] = { "sed",
+    "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
+s@(va_list)&@(__gnuc_va_list)\\&@\n\
+s@ _VA_LIST_));@ __gnuc_va_list));@\n\
+s@ __VA_LIST__));@ __gnuc_va_list));@\n\
+s@ va_list@ __not_va_list__@\n\
+s@\\*va_list@*__not_va_list__@\n\
+s@ __va_list)@ __gnuc_va_list)@\n\
+s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
+s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\
+s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
+s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\
+s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
+s@VA_LIST@DUMMY_VA_LIST@\n\
+s@_Va_LIST@_VA_LIST@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Strict_Ansi_Not fix
  */
 tSCC zStrict_Ansi_NotName[] =
@@ -7553,9 +7602,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          223
+#define REGEX_COUNT          225
 #define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT            188
+#define FIX_COUNT            189
 
 /*
  *  Enumerate the fixes
@@ -7692,6 +7741,7 @@ typedef enum {
     STATSSWTCH_FIXIDX,
     STDIO_STDARG_H_FIXIDX,
     STDIO_VA_LIST_FIXIDX,
+    STDIO_VA_LIST_CLIENTS_FIXIDX,
     STRICT_ANSI_NOT_FIXIDX,
     STRICT_ANSI_NOT_CTD_FIXIDX,
     STRICT_ANSI_ONLY_FIXIDX,
@@ -8407,6 +8457,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      STDIO_VA_LIST_TEST_CT, FD_MACH_IFNOT,
      aStdio_Va_ListTests,   apzStdio_Va_ListPatch, 0 },
 
+  {  zStdio_Va_List_ClientsName,    zStdio_Va_List_ClientsList,
+     apzStdio_Va_List_ClientsMachs,
+     STDIO_VA_LIST_CLIENTS_TEST_CT, FD_MACH_ONLY,
+     aStdio_Va_List_ClientsTests,   apzStdio_Va_List_ClientsPatch, 0 },
+
   {  zStrict_Ansi_NotName,    zStrict_Ansi_NotList,
      apzStrict_Ansi_NotMachs,
      STRICT_ANSI_NOT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 3bd13ad06aa..5fdb41ecc61 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2942,6 +2942,56 @@ fix = {
 
 
 /*
+ *  Fix headers that use va_list from stdio.h to use the updated
+ *  va_list from the stdio_va_list change.  Note _BSD_VA_LIST_ is
+ *  dealt with elsewhere.  The presence of __gnuc_va_list,
+ *  __DJ_va_list, or _G_va_list is taken to indicate that the header
+ *  knows what it's doing.
+ */
+fix = {
+    hackname = stdio_va_list_clients;
+    files    = com_err.h;
+    files    = cps.h;
+    files    = curses.h;
+    files    = krb5.h;
+    files    = lc_core.h;
+    files    = pfmt.h;
+    files    = wchar.h;
+    files    = curses_colr/curses.h;
+    bypass   = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list';
+    /* Don't fix, if we use va_list from stdarg.h, or if the use is
+       otherwise protected.  */
+    bypass   = 'include <stdarg\.h>|#ifdef va_start';
+
+    /*
+     * Use __gnuc_va_list in arg types in place of va_list.
+     * On 386BSD use __gnuc_va_list instead of _VA_LIST_.  On Tru64 UNIX V5.1A
+     * use __gnuc_va_list instead of __VA_LIST__.  We're hoping the
+     * trailing parentheses and semicolon save all other systems from this.
+     * Define __not_va_list__ (something harmless and unused)
+     * instead of va_list.
+     * Don't claim to have defined va_list.
+     */
+    sed = "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n"
+	  "s@(va_list)&@(__gnuc_va_list)\\&@\n"
+          "s@ _VA_LIST_));@ __gnuc_va_list));@\n"
+          "s@ __VA_LIST__));@ __gnuc_va_list));@\n"
+          "s@ va_list@ __not_va_list__@\n"
+          "s@\\*va_list@*__not_va_list__@\n"
+          "s@ __va_list)@ __gnuc_va_list)@\n"
+          "s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;"
+           "@typedef \\1 __not_va_list__;@\n"
+	  "s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n"
+          "s@GNUC_VA_LIST@GNUC_Va_LIST@\n"
+          "s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n"
+          "s@_NEED___VA_LIST@_NEED___Va_LIST@\n"
+          "s@VA_LIST@DUMMY_VA_LIST@\n"
+          "s@_Va_LIST@_VA_LIST@";
+    test_text = "extern void mumble( va_list);";
+};
+
+
+/*
  *  "!__STDC__" or "__STDC__==0" or "__STDC__!=1" or "__STDC__-0==0"
  *  is "!defined( __STRICT_ANSI__ )"
  */
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 394d1cad4e6..0ca3eb302dc 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -8549,7 +8549,7 @@ fold_checksum_tree (tree expr, struct md5_ctx *ctx, htab_t ht)
 {
   void **slot;
   enum tree_code code;
-  char buf[sizeof (struct tree_decl)];
+  struct tree_decl buf;
   int i, len;
 
   if (sizeof (struct tree_exp) + 5 * sizeof (tree)
@@ -8566,23 +8566,23 @@ fold_checksum_tree (tree expr, struct md5_ctx *ctx, htab_t ht)
   if (code == SAVE_EXPR && SAVE_EXPR_NOPLACEHOLDER (expr))
     {
       /* Allow SAVE_EXPR_NOPLACEHOLDER flag to be modified.  */
-      memcpy (buf, expr, tree_size (expr));
-      expr = (tree) buf;
+      memcpy (&buf, expr, tree_size (expr));
+      expr = (tree) &buf;
       SAVE_EXPR_NOPLACEHOLDER (expr) = 0;
     }
   else if (TREE_CODE_CLASS (code) == 'd' && DECL_ASSEMBLER_NAME_SET_P (expr))
     {
       /* Allow DECL_ASSEMBLER_NAME to be modified.  */
-      memcpy (buf, expr, tree_size (expr));
-      expr = (tree) buf;
+      memcpy (&buf, expr, tree_size (expr));
+      expr = (tree) &buf;
       SET_DECL_ASSEMBLER_NAME (expr, NULL);
     }
   else if (TREE_CODE_CLASS (code) == 't'
 	   && (TYPE_POINTER_TO (expr) || TYPE_REFERENCE_TO (expr)))
     {
       /* Allow TYPE_POINTER_TO and TYPE_REFERENCE_TO to be modified.  */
-      memcpy (buf, expr, tree_size (expr));
-      expr = (tree) buf;
+      memcpy (&buf, expr, tree_size (expr));
+      expr = (tree) &buf;
       TYPE_POINTER_TO (expr) = NULL;
       TYPE_REFERENCE_TO (expr) = NULL;
     }
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 5d77e23e334..ee380ed92dd 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1,6 +1,8 @@
 /* Compiler driver program that can handle many languages.
    Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
    1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+   Inc.
 
 This file is part of GCC.
 
@@ -3362,7 +3364,7 @@ process_command (int argc, const char **argv)
 	{
 	  /* translate_options () has turned --version into -fversion.  */
 	  printf (_("%s (GCC) %s\n"), programname, version_string);
-	  printf ("Copyright %s 2004 Free Software Foundation, Inc.\n",
+	  printf ("Copyright %s 2006 Free Software Foundation, Inc.\n",
 		  _("(C)"));
 	  fputs (_("This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
diff --git a/gcc/gcov-dump.c b/gcc/gcov-dump.c
index e0115622ab7..7e3921a63d5 100644
--- a/gcc/gcov-dump.c
+++ b/gcc/gcov-dump.c
@@ -1,5 +1,5 @@
 /* Dump a gcov file, for debugging use.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
    Contributed by Nathan Sidwell <nathan@codesourcery.com>
 
 Gcov is free software; you can redistribute it and/or modify
@@ -118,7 +118,7 @@ static void
 print_version (void)
 {
   printf ("gcov-dump (GCC) %s\n", version_string);
-  printf ("Copyright (C) 2003 Free Software Foundation, Inc.\n");
+  printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
   printf ("This is free software; see the source for copying conditions.\n"
   	  "There is NO warranty; not even for MERCHANTABILITY or \n"
 	  "FITNESS FOR A PARTICULAR PURPOSE.\n\n");
diff --git a/gcc/gcov.c b/gcc/gcov.c
index 172f9e85651..e230e39775f 100644
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -1,7 +1,7 @@
 /* Gcov.c: prepend line execution counts and branch probabilities to a
    source file.
-   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by James E. Wilson of Cygnus Support.
    Mangled by Bob Manson of Cygnus Support.
    Mangled further by Nathan Sidwell <nathan@codesourcery.com>
@@ -420,7 +420,7 @@ static void
 print_version (void)
 {
   fnotice (stdout, "gcov (GCC) %s\n", version_string);
-  fprintf (stdout, "Copyright %s 2004 Free Software Foundation, Inc.\n",
+  fprintf (stdout, "Copyright %s 2006 Free Software Foundation, Inc.\n",
 	   _("(C)"));
   fnotice (stdout,
 	   _("This is free software; see the source for copying conditions.\n"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b78bb6d6c94..174a4ebfacb 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2006-01-21  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* jv-scan.c (version), jcf-dump.c (version), gjavah.c (version):
+	Update copyright notice dates.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index b9a34e3bbdb..6f2254de03f 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -1,7 +1,7 @@
 /* Program to write C++-suitable header files from a Java(TM) .class
    file.  This is similar to SUN's javah.
 
-Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003
+Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2006
 Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -2298,7 +2298,7 @@ static void
 version (void)
 {
   printf ("gcjh (GCC) %s\n\n", version_string);
-  printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
+  printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
   printf ("This is free software; see the source for copying conditions.  There is NO\n");
   printf ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n");
   exit (0);
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index a95f122ac19..63fdbcc995d 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -1,7 +1,7 @@
 /* Program to dump out a Java(TM) .class file.
    Functionally similar to Sun's javap.
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -896,7 +896,7 @@ static void
 version (void)
 {
   printf ("jcf-dump (GCC) %s\n\n", version_string);
-  printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
+  printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
   printf ("This is free software; see the source for copying conditions.  There is NO\n");
   printf ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n");
   exit (0);
diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index 7c8d2d3e58e..24fee6b44e1 100644
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -1,5 +1,5 @@
 /* Main for jv-scan
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006
    Free Software Foundation, Inc.
    Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
 
@@ -122,7 +122,7 @@ static void
 version (void)
 {
   printf ("jv-scan (GCC) %s\n\n", version_string);
-  printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
+  printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
   printf ("This is free software; see the source for copying conditions.  There is NO\n");
   printf ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n");
   exit (0);
diff --git a/gcc/longlong.h b/gcc/longlong.h
index e59e7123263..45d649fbcc1 100644
--- a/gcc/longlong.h
+++ b/gcc/longlong.h
@@ -1,6 +1,6 @@
 /* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
-   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-   Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2005 Free Software Foundation, Inc.
 
    This definition file is free software; you can redistribute it
    and/or modify it under the terms of the GNU General Public
@@ -646,7 +646,9 @@ UDItype __umulsidi3 (USItype, USItype);
      || defined (__powerpc__)	/* gcc */				\
      || defined (__POWERPC__)	/* BEOS */				\
      || defined (__ppc__)	/* Darwin */				\
-     || defined (PPC)		/* GNU/Linux, SysV */			\
+     || (defined (PPC) && ! defined (CPU_FAMILY)) /* gcc 2.7.x GNU&SysV */    \
+     || (defined (PPC) && defined (CPU_FAMILY)    /* VxWorks */               \
+         && CPU_FAMILY == PPC)                                                \
      ) && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   do {									\
@@ -684,7 +686,10 @@ UDItype __umulsidi3 (USItype, USItype);
   __asm__ ("{cntlz|cntlzw} %0,%1" : "=r" (count) : "r" (x))
 #define COUNT_LEADING_ZEROS_0 32
 #if defined (_ARCH_PPC) || defined (__powerpc__) || defined (__POWERPC__) \
-  || defined (__ppc__) || defined (PPC)
+  || defined (__ppc__)                                                    \
+  || (defined (PPC) && ! defined (CPU_FAMILY)) /* gcc 2.7.x GNU&SysV */       \
+  || (defined (PPC) && defined (CPU_FAMILY)    /* VxWorks */                  \
+         && CPU_FAMILY == PPC)
 #define umul_ppmm(ph, pl, m0, m1) \
   do {									\
     USItype __m0 = (m0), __m1 = (m1);					\
diff --git a/gcc/mips-tdump.c b/gcc/mips-tdump.c
index e25c175ef54..04d66c725df 100644
--- a/gcc/mips-tdump.c
+++ b/gcc/mips-tdump.c
@@ -1,5 +1,5 @@
 /* Read and manage MIPS symbol tables from object modules.
-   Copyright (C) 1991, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2003
+   Copyright (C) 1991, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2006
    Free Software Foundation, Inc.
    Contributed by hartzell@boulder.colorado.edu,
    Rewritten by meissner@osf.org.
@@ -1412,7 +1412,7 @@ main (int argc, char **argv)
   if (version)
     {
       printf ("mips-tdump (GCC) %s\n", version_string);
-      fputs ("Copyright (C) 2003 Free Software Foundation, Inc.\n", stdout);
+      fputs ("Copyright (C) 2006 Free Software Foundation, Inc.\n", stdout);
       fputs ("This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n",
              stdout);
diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c
index 9b333063e34..3156e31c50b 100644
--- a/gcc/mips-tfile.c
+++ b/gcc/mips-tfile.c
@@ -3,7 +3,7 @@
    in the form of comments (the mips assembler does not support
    assembly access to debug information).
    Copyright (C) 1991, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2006 Free Software Foundation, Inc.
    Contributed by Michael Meissner (meissner@cygnus.com).
 
 This file is part of GCC.
@@ -4774,7 +4774,7 @@ main (int argc, char **argv)
   if (version)
     {
       printf (_("mips-tfile (GCC) %s\n"), version_string);
-      fputs ("Copyright (C) 2004 Free Software Foundation, Inc.\n", stdout);
+      fputs ("Copyright (C) 2006 Free Software Foundation, Inc.\n", stdout);
       fputs (_("This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
 	     stdout);
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 3d85a06fc38..536b1da307e 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -1078,7 +1078,7 @@ expand_binop (enum machine_mode mode, optab binoptab, rtx op0, rtx op1,
       && ashl_optab->handlers[(int) word_mode].insn_code != CODE_FOR_nothing
       && lshr_optab->handlers[(int) word_mode].insn_code != CODE_FOR_nothing)
     {
-      rtx insns, equiv_value;
+      rtx insns;
       rtx into_target, outof_target;
       rtx into_input, outof_input;
       rtx inter;
@@ -1174,20 +1174,7 @@ expand_binop (enum machine_mode mode, optab binoptab, rtx op0, rtx op1,
 
       if (inter != 0)
 	{
-	  if (binoptab->code != UNKNOWN)
-	    equiv_value = gen_rtx_fmt_ee (binoptab->code, mode, op0, op1);
-	  else
-	    equiv_value = 0;
-
-	  /* We can't make this a no conflict block if this is a word swap,
-	     because the word swap case fails if the input and output values
-	     are in the same register.  */
-	  if (shift_count != BITS_PER_WORD)
-	    emit_no_conflict_block (insns, target, op0, op1, equiv_value);
-	  else
-	    emit_insn (insns);
-
-
+	  emit_insn (insns);
 	  return target;
 	}
     }
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 40fd344e76c..0c90b689fc3 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c
index 993fde7a6d6..9e3fbba6b55 100644
--- a/gcc/pretty-print.c
+++ b/gcc/pretty-print.c
@@ -178,7 +178,7 @@ pp_base_indent (pretty_printer *pp)
    %p: pointer.
    %m: strerror(text->err_no) - does not consume a value from args_ptr.
    %%: `%'.
-   %*.s: a substring the length of which is specified by an integer.
+   %.*s: a substring the length of which is specified by an integer.
    %H: location_t.  */
 void
 pp_base_format_text (pretty_printer *pp, text_info *text)
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 6d9258eba1b..4baa7d1b4c9 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1649,6 +1649,7 @@ extern rtx simplify_gen_subreg (enum machine_mode, rtx, enum machine_mode,
 extern rtx simplify_replace_rtx (rtx, rtx, rtx);
 extern rtx simplify_rtx (rtx);
 extern rtx avoid_constant_pool_reference (rtx);
+extern bool constant_pool_reference_p (rtx);
 
 /* In function.c  */
 extern rtx gen_mem_addressof (rtx, tree, int);
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index b8e474d0b44..71074453022 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -2078,6 +2078,42 @@ add_branch_dependences (rtx head, rtx tail)
       insn = PREV_INSN (insn);
     }
 
+#ifdef HAVE_cc0
+  /* There may be other cc0 setters earlier on in this block.
+     Look for them and include them in the set not to be disturbed.  */
+  if (insn != head && last != NULL_RTX)
+    {
+      rtx earlier_cc0_setter = NULL_RTX;
+
+      for (insn = last; insn != NULL_RTX && insn != head;)
+	{
+	  insn = prev_nonnote_insn (insn);
+	  if (sets_cc0_p (insn))
+	    earlier_cc0_setter = insn;
+	}
+
+      if (earlier_cc0_setter != NULL_RTX)      
+	{
+	  insn = last;
+	  do
+	    {
+	      insn = prev_nonnote_insn (insn);
+
+	      if (last != 0 && ! find_insn_list (insn, LOG_LINKS (last)))
+		{
+		  add_dependence (last, insn, REG_DEP_ANTI);
+		  INSN_REF_COUNT (insn)++;
+		}
+	      
+	      CANT_MOVE (insn) = 1;
+	      
+	      last = insn;
+	    }
+	  while (insn != earlier_cc0_setter);
+	}
+    }
+#endif
+
   /* Make sure these insns are scheduled last in their block.  */
   insn = last;
   if (insn != 0)
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 69e7ee60a69..4d1ea8a09dd 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -188,6 +188,14 @@ simplify_gen_ternary (enum rtx_code code, enum machine_mode mode,
 
   return gen_rtx_fmt_eee (code, mode, op0, op1, op2);
 }
+
+/* Return true if X is a MEM referencing the constant pool.  */
+
+bool
+constant_pool_reference_p (rtx x)
+{
+  return avoid_constant_pool_reference (x) != x;
+}
 
 /* Likewise, for relational operations.
    CMP_MODE specifies mode comparison is done in.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b326461ba2e..756e811115e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,403 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2006-02-23  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/26291
+	* g++.dg/other/ellipsis1.C: New test.
+	* g++.dg/parse/operator4.C: Adjust error marker.
+
+2006-02-21  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR c++/21583
+
+	Backport:
+	2004-11-30  Loren James Rittle  <ljrittle@acm.org>
+
+        * g++.old-deja/g++.eh/badalloc1.C (arena_size): Bump up to 262144
+        to support new requirements on FreeBSD 5.
+
+	2004-11-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* g++.old-deja/g++.eh/badalloc1.C: Robustify.
+
+2006-02-08  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/26070
+	* g++.dg/other/virtual1.C: New test.
+
+2006-02-01  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-12-22  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/25369
+	* g++.dg/template/ptrmem16.C: New test.
+
+2006-02-01  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-12-19  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/24915
+	* g++.dg/template/overload8.C: New test.
+
+2006-02-01  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-12-19  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/24278
+	* g++.dg/template/ctor5.C: New test.
+
+2006-01-24  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/16829
+	* g++.dg/other/default2.C: New test.
+	* g++.dg/other/default3.C: New test.
+
+2006-01-19  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/25854
+	* g++.dg/template/spec28.C: New test.
+
+2006-01-16  Ian Lance Taylor  <ian@airs.com>
+
+	* consistency.vlad: Remove entire directory, 1652 files.
+
+2006-01-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR testsuite/25728
+	* lib/gcov.exp (verify-lines): Add "close $fd".
+
+2005-12-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR testsuite/25214
+	* gcc.dg/i386-local2.c: Skip if ilp32 and -fpic/-fpic.
+
+2005-12-30  Roger Sayle  <roger@eyesopen.com>
+
+	PR target/25213
+	* gcc.dg/pr23098.c: Backport testcase from mainline.
+
+2005-12-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* g++.dg/rtti/tinfo1.C: Scan for ".global" also.
+
+2005-12-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	Backport:
+	2005-02-09  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* g++.dg/rtti/tinfo1.C: Allow newline after assembler label.
+
+	2004-11-28  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	PR target/18489
+	* g++.dg/rtti/tinfo1.C: In pattern for label definition ending
+	delimeter, match space and TAB as well as ":".
+
+	Backport portions of:
+	2004-11-04  Ben Elliston  <bje@au.ibm.com>
+
+	* g++.dg/rtti/tinfo1.C: Remove xfails.
+
+2005-12-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR testsuite/20772
+	* gcc.dg/20020523-1.c: Change run target i386 to i?86.
+
+2005-12-21  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR testsuite/20772
+	* g++.dg/abi/bitfield3.C, g++.dg/abi/bitfield8.C,
+	g++.dg/abi/bitfield9.C, g++.dg/abi/dtor1.C, g++.dg/abi/empty10.C,
+	g++.dg/abi/empty7.C, g++.dg/abi/empty9.C, g++.dg/abi/layout3.C,
+	g++.dg/abi/layout4.C, g++.dg/abi/thunk1.C, g++.dg/abi/thunk2.C,
+	g++.dg/abi/vbase11.C, g++.dg/abi/vthunk2.C, g++.dg/abi/vthunk3.C,
+	g++.dg/eh/simd-1.C, g++.dg/eh/simd-2.C, g++.dg/ext/attrib8.C,
+	g++.dg/opt/cse2.C, g++.dg/opt/inline9.C, g++.dg/opt/life1.C,
+	g++.dg/opt/longbranch2.C, g++.dg/opt/mmx1.C,
+	g++.dg/opt/reg-stack4.C, g++.dg/other/big-struct.C,
+	g++.old-deja/g++.abi/aggregates.C, g++.old-deja/g++.abi/align.C,
+	g++.old-deja/g++.abi/bitfields.C, g++.old-deja/g++.eh/tmpl2.C,
+	g++.old-deja/g++.ext/asmspec1.C, g++.old-deja/g++.ext/attrib1.C,
+	g++.old-deja/g++.ext/attrib2.C, g++.old-deja/g++.ext/attrib3.C,
+	g++.old-deja/g++.law/weak.C, g++.old-deja/g++.other/regstack.C,
+	g++.old-deja/g++.other/store-expr1.C,
+	g++.old-deja/g++.other/store-expr2.C, g++.old-deja/g++.pt/asm1.C,
+	g++.old-deja/g++.pt/asm2.C, g77.dg/20010216-1.f,
+	gcc.c-torture/compile/20000804-1.c,
+	gcc.c-torture/execute/990413-2.x, gcc.dg/20000609-1.c,
+	gcc.dg/20000614-1.c, gcc.dg/20000720-1.c, gcc.dg/20000724-1.c,
+	gcc.dg/20000807-1.c, gcc.dg/20000904-1.c, gcc.dg/20001127-1.c,
+	gcc.dg/20010202-1.c, gcc.dg/20010520-1.c, gcc.dg/20011009-1.c,
+	gcc.dg/20011029-2.c, gcc.dg/20011107-1.c, gcc.dg/20011119-1.c,
+	gcc.dg/20020108-1.c, gcc.dg/20020122-2.c, gcc.dg/20020122-3.c,
+	gcc.dg/20020201-3.c, gcc.dg/20020206-1.c, gcc.dg/20020218-1.c,
+	gcc.dg/20020224-1.c, gcc.dg/20020310-1.c, gcc.dg/20020411-1.c,
+	gcc.dg/20020418-1.c, gcc.dg/20020418-2.c, gcc.dg/20020426-1.c,
+	gcc.dg/20020426-2.c, gcc.dg/20020517-1.c, gcc.dg/20020523-1.c,
+	gcc.dg/20020523-2.c, gcc.dg/20020531-1.c, gcc.dg/20020616-1.c,
+	gcc.dg/20020729-1.c, gcc.dg/20030204-1.c, gcc.dg/20030826-2.c,
+	gcc.dg/20030926-1.c, gcc.dg/20031102-1.c, gcc.dg/20031202-1.c,
+	gcc.dg/980226-1.c, gcc.dg/980312-1.c, gcc.dg/980313-1.c,
+	gcc.dg/980414-1.c, gcc.dg/980520-1.c, gcc.dg/980709-1.c,
+	gcc.dg/990117-1.c, gcc.dg/990130-1.c, gcc.dg/990213-2.c,
+	gcc.dg/990214-1.c, gcc.dg/990424-1.c, gcc.dg/990524-1.c,
+	gcc.dg/991129-1.c, gcc.dg/991209-1.c, gcc.dg/991214-1.c,
+	gcc.dg/991230-1.c, gcc.dg/asm-1.c, gcc.dg/clobbers.c,
+	gcc.dg/i386-387-1.c, gcc.dg/i386-387-2.c, gcc.dg/i386-387-3.c,
+	gcc.dg/i386-387-4.c, gcc.dg/i386-387-5.c, gcc.dg/i386-387-6.c,
+	gcc.dg/i386-asm-1.c, gcc.dg/i386-asm-2.c, gcc.dg/i386-bitfield1.c,
+	gcc.dg/i386-bitfield2.c, gcc.dg/i386-bitfield3.c,
+	gcc.dg/i386-call-1.c, gcc.dg/i386-local.c, gcc.dg/i386-loop-1.c,
+	gcc.dg/i386-loop-2.c, gcc.dg/i386-loop-3.c,
+	gcc.dg/i386-memset-1.c, gcc.dg/i386-pentium4-not-mull.c,
+	gcc.dg/i386-pic-1.c, gcc.dg/i386-regparm.c,
+	gcc.dg/i386-signbit-1.c, gcc.dg/i386-signbit-2.c,
+	gcc.dg/i386-signbit-3.c, gcc.dg/i386-sse-5.c, gcc.dg/i386-sse-8.c,
+	gcc.dg/i386-ssetype-3.c, gcc.dg/i386-ssetype-5.c,
+	gcc.dg/i386-unroll-1.c, gcc.dg/i386-volatile-1.c, gcc.dg/loop-3.c,
+	gcc.dg/pr12092-1.c, gcc.dg/pr14289-1.c, gcc.dg/pr14289-2.c,
+	gcc.dg/pr14289-3.c, gcc.dg/pr9771-1.c, gcc.dg/setjmp-2.c,
+	gcc.dg/short-compare-1.c, gcc.dg/short-compare-2.c,
+	gcc.dg/sibcall-5.c, gcc.dg/sibcall-6.c, gcc.dg/tls/opt-1.c,
+	gcc.dg/tls/opt-2.c, gcc.dg/tls/opt-3.c,
+	gcc.dg/torture/pr18582-1.c, gcc.dg/unroll-1.c,
+	gcc.misc-tests/i386-pf-3dnow-1.c,
+	gcc.misc-tests/i386-pf-athlon-1.c,
+	gcc.misc-tests/i386-pf-none-1.c, gcc.misc-tests/i386-pf-sse-1.c:
+	Backport portions of testcases.
+
+2005-12-21  Janis Johnson  <janis187@us.ibm.com>
+
+	Backport:
+	2004-11-30  Janis Johnson  <janis187@us.ibm.com>
+	* lib/compat.exp (compat-get-options): Fix for use with dg-xfail-if.
+	2004-05-25  Janis Johnson  <janis187@us.ibm.com>
+	* lib/compat.exp (compat-get-options-main): New.
+	(compat-get-options): Remove unneeded code, warn for ignored
+	command.
+	(compat-execute): Check flag set by dg-require-* commands, break up
+	long lines.
+
+2005-12-20  Janis Johnson  <janis187@us.ibm.com>
+
+	Backport:
+	2005-02-11  Janis Johnson  <janis187@us.ibm.com>
+	* lib/gcc-dg.exp (dg-require-weak, dg-require-visibility,
+	dg-require-alias, dg-require-gc-sections, dg-require-profiling,
+	dg-require-dll, dg-require-named-sections): Move from here ...
+	* lib/target-supports-dg.exp: ... to here.
+
+	Backport:
+	2005-12-06  Janis Johnson  <janis187@us.ibm.com>
+	* gcc.test-framework/dg-dot-run-sif-exp-P.c: New test.
+	* gcc.test-framework/dg-dot-run-sif-exp-U.c: New test.
+	* gcc.test-framework/dg-dot-run-xif-exp-P.c: New test.
+	* gcc.test-framework/dg-dot-run-xif-exp-XP.c: New test.
+
+	Backport:
+	2005-02-01  Janis Johnson  <janis187@us.ibm.com>
+	* gcc.test-framework/dg-bogus-exp-P.c: New test.
+	* gcc.test-framework/dg-bogus-exp-XF.c: New test.
+	* gcc.test-framework/dg-do-assemble-exp-P.c: New test.
+	* gcc.test-framework/dg-do-compile-exp-P.c: New test.
+	* gcc.test-framework/dg-do-link-exp-P.c: New test.
+	* gcc.test-framework/dg-do-run-exp-P.c: New test.
+	* gcc.test-framework/dg-dot-run-exp-P.c: New test.
+	* gcc.test-framework/dg-dot-run-exp-U.c: New test.
+	* gcc.test-framework/dg-dox-run-exp-XF.c: New test.
+	* gcc.test-framework/dg-error-exp-P.c: New test.
+	* gcc.test-framework/dg-error-exp-XP.c: New test.
+	* gcc.test-framework/dg-excess-errors-exp-XF.c: New test.
+	* gcc.test-framework/dg-excess-errors-exp-XP.c: New test.
+	* gcc.test-framework/dg-output-exp-P.c: New test.
+	* gcc.test-framework/dg-output-exp-XF.c: New test.
+	* gcc.test-framework/dg-warning-exp-P.c: New test.
+	* gcc.misc-tests/dg-1.c, gcc.misc-tests/dg-2.c, gcc.misc-tests/dg-3.c,
+        gcc.misc-tests/dg-4.c, gcc.misc-tests/dg-5.c, gcc.misc-tests/dg-6.c,
+        gcc.misc-tests/dg-7.c, gcc.misc-tests/dg-8.c, gcc.misc-tests/dg-9.c,
+        gcc.misc-tests/dg-10.c, gcc.misc-tests/dg-11.c, gcc.misc-tests/dg-12.c,
+        gcc.misc-tests/dg-test.exp: Remove.
+
+	Backport:
+	2005-02-01  Janis Johnson  <janis187@us.ibm.com>
+	* gcc.test-framwork: New directory.
+	* gcc.test-framework/README: New.
+	* gcc.test-framework/test-framework.exp
+	* gcc.test-framework/gen_directive_tests
+	* gcc.test-framework/test-framework.awk
+
+	Backport:
+	2005-01-24  Janis Johnson  <janis187@us.ibm.com>
+	* lib/gcc-dg.exp: Clear xfail data in dg-test
+
+	* lib/gcc-dg.exp: Remove dg-skip-if and dg-xfail-if, now in
+	target-supports-dg.exp.
+
+	* lib/gcc-dg.exp: Include target-supports-dg.exp.
+	
+2005-12-19  Janis Johnson  <janis187@us.ibm.com>
+
+	* gcc.dg/ppc-eabi.c: Test on ilp32.
+	* gcc.dg/ppc64-abi-1.c, gcc.dg/ppc64-abi-2.c, gcc.dg/ppc64-abi-3.c:
+	Test on lp64.
+
+	Backport (missed in previous batch):
+
+	* lib/target-supports.exp (get_compiler_messages,
+	current_target_name): New (missed in backport).
+
+	Backport:
+
+	2005-02-11  Janis Johnson  <janis187@us.ibm.com>
+	* lib/gcc-dg.exp: (dg-require-effective-target, dg-skip-if,
+	dg-xfail-if, selector_opd, selector_list, selector_expression,
+	dg-process-target): Move to new file target-supports-dg.exp.
+	* lib/target-supports-dg.exp: New.
+
+	2005-01-24  Janis Johnson  <janis187@us.ibm.com>
+	* lib/target-supports.exp (current_target_name): New.
+	(check_effective_target_ilp32, check_effective_target_lp64):
+	Cache the result to use as long as the current target, with
+	multilib flags, remains the same.
+
+	2004-12-01  Janis Johnson  <janis187@us.ibm.com>
+	* lib/gcc-dg.exp (dg-process-target): Wrapper for dg function to
+	handle effective-target-keyword.
+	(dg-skip-if): Support effective-target keyword as target list.
+	(dg-xfail-if): Ditto.
+	* lib/target-supports.exp (is-effective-target-keyword): New proc.
+
+	2004-11-30  Janis Johnson  <janis187@us.ibm.com>
+	* lib/target-supports.exp (is-effective-target): Simplify.
+
+	2004-11-11  Janis Johnson  <janis187@us.ibm.com>
+	* lib/target-supports.exp (get-compiler_messages): New.
+	(check_effective_target_ilp32): New.
+	(check_effective_target_lp64): New.
+	(is-effective-target): New.
+	* lib/gcc-dg.exp (dg-require-effective-target): New.
+
+2005-12-19  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/20552
+	* g++.dg/ext/typeof10.C: New test.
+
+2005-12-14  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* g++.old-deja/g++.brendan/redecl1.C,
+	g++.old-deja/g++.eh/inline1.C, g++.old-deja/g++.ns/crash2.C,
+	g++.old-deja/g++.ns/template7.C, g++.old-deja/g++.oliva/ns3.C,
+	g++.old-deja/g++.oliva/typeof1.C,
+	g++.old-deja/g++.other/crash16.C,
+	g++.old-deja/g++.other/crash34.C,
+	g++.old-deja/g++.other/lookup5.C, g++.old-deja/g++.pt/crash65.C,
+	g++.old-deja/g++.pt/decl2.C, g++.old-deja/g++.pt/explicit76.C,
+	g++.old-deja/g++.pt/memtemp85.C, g++.old-deja/g++.pt/memtemp86.C,
+	g++.old-deja/g++.pt/memtemp87.C, g++.old-deja/g++.pt/memtemp88.C,
+	g++.old-deja/g++.pt/memtemp91.C, g++.old-deja/g++.pt/spec14.C,
+	g++.old-deja/g++.pt/static10.C, g++.old-deja/g++.oliva/stkalign.C:
+	Remove xfail.
+
+2005-12-07  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/19397
+	* g++.dg/template/typedef3.C: New test.
+
+	PR c++/19762
+	PR c++/19764
+	* g++.dg/template/dtor3.C: Fix error markers.
+
+2005-12-07  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-20  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/22618
+	* g++.dg/parse/access8.C: New test.
+
+2005-12-06  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-18  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/21383
+	* g++.dg/overload/koenig2.C: New.
+
+2005-12-05  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/22352
+	* g++.dg/template/friend38.C: New test.
+
+2005-12-05  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/22464
+	* g++.dg/template/crash41.C: New test.
+
+2005-12-05  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/23307
+	* g++.dg/template/crash38.C: New test.
+
+2005-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gcc.c-torture/execute/stdio-opt-1.c,
+	gcc.c-torture/execute/stdio-opt-2.c,
+	gcc.c-torture/execute/stdio-opt-3.c: Test the unlocked style.
+
+2005-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gcc.dg/loop-3.c: Skip if ix86 and -m64.
+	* gcc.dg/i386-local.c: Likewise.  Also skip if x86_64 and -m32.
+	
+	Backport:
+	
+	2005-08-25  Alan Modra  <amodra@bigpond.net.au>
+        * gcc.dg/20020103-1.c: Scan for LC[0-9], not LC.
+
+	2004-12-09  Richard Henderson  <rth@redhat.com>
+        * gcc.dg/loop-3.c: Don't use i386 tuning for amd64.
+
+	2004-11-17  Janis Johnson  <janis187@us.ibm.com>
+	* gcc.dg/i386-sse-8.c: Use dg-skip-if i?86 -m64.
+
+	2004-04-06  Jakub Jelinek  <jakub@redhat.com>
+        * gcc.dg/i386-sse-8.c: Don't use -march=pentium3 on x86_64.
+        * gcc.dg/i386-local.c: Expect %edi, not %eax register on x86_64.
+        * gcc.dg/20020103-1.c: Add -fno-asynchronous-unwind-tables to options.
+
+2005-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* g++.old-deja/g++.other/enum5.C: Change from "run" to "compile".
+	Fix attribute for new parser.  Remove unnecessary dg-bogus.
+	* g++.old-deja/g++.pt/friend44.C: Change from "run" to "compile".
+
+2005-12-02  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/24103
+	* g++.dg/other/default1.C: New test.
+
+2005-12-01  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	Backport:
+	2005-02-09  Janis Johnson  <janis187@us.ibm.com>
+
+	PR C++/18491
+	* g++.old-deja/g++.mike/p10769a.C: Remove.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/testsuite/consistency.vlad/README b/gcc/testsuite/consistency.vlad/README
deleted file mode 100644
index 3cdf6e32a55..00000000000
--- a/gcc/testsuite/consistency.vlad/README
+++ /dev/null
@@ -1,66 +0,0 @@
-  This directory contains tests and scripts for consistency checking
-compilers.  They could be used for consistency checking different
-C/C++ compiler for one platform or C/C++ compilers for different
-platforms.
-
-  For example, to check the consistency, you could type
-
-   make check-consistency RUNTESTFLAGS='BASE_COMPILER=i960-97r2 CONSISTENCY_OPTIONS="-O2 -fvtable-thunks -mno-strict-align -fno-rtti -fcheck-new -mcall-i960-old -mlittle-endian" NO_LONG_DOUBLE=1 NO_LIBGLOSS_LIBRARY_OPTIONS=1'
-
-  In this example, DEJAGNU driver vlad.exp will process all C/C++
-tests in all subdirectories (e.g. layout) started with lower case
-letter.  C tests (with suffixes .c) will be compiled by C compiler
-only.  C++ tests will be compiled by C and C++ compilers.  It is
-supposed that each test outputs the result which is saved in temp_dir
-as
-   <basename of the test>.out
-or
-   <basename of the test>.out++
-
-correspondingly for C compiler and C++ compiler.  For example, there
-will be two output files
-
-   `align-double.out' and `align-double.out++'
-
-for test `align-double.c'.
-
-  After this if there is subdirectory <BASE_COMPILER>-results
-(`i960-97r2-results' in our example) and there is corresponding saved
-output file for the base compiler the the files are compared in order
-to check consistency.
-
-  To create the base for future comparisons of output files, you
-should create the directory and move output files from the temporary
-directory into the created directory.
-
-The test script file has the following parameters
-
- 1. BASE_COMPILER.  The variable must be defined for work the script
-    properly.
-
- 2. CONSISTENCY_OPTIONS.  The options which will be used for
-    compilations.  The default value is "-O2".
-
- 3. NO_LONG_DOUBLE.  If the variable value is not zero, the tests
-    which contain long double are expected to be fail.
-
- 4. NO_LIBGLOSS_LIBRARY_OPTIONS.  If the variable value is not zero,
-    the tests are compiled without standard dejagnu libgloss library
-    paths.
-
-  Currently, there is directory `layout' for checking allocation
-parameters of C/C++ compiler and subdirectory i960-97r2 which contains
-the test results for 97r2 i960-vxworks C/C++ compiler.
-
-  You can create other consistency tests.  Simply, create a directory
-started with lower case letter, place the tests and create the
-subdirectory with the test results for a base compiler.  If you need
-to compile tests in a directory with a wrap file simply place the file
-name (e.g. _dummy_stab.S) in file WRAP_FILE in the test directory.
-
-  The tests will be only compiled (and the test results will not be
-compared) if you place <basename of the test>.conly in the directory
-of the test.  You can use own driver for checking consistency.  To
-make this, place the TCL script with name <basename of the test>.cexp.
-
-Vladimir Makarov <vmakarov@cygnus.com>
diff --git a/gcc/testsuite/consistency.vlad/layout/a-char.c b/gcc/testsuite/consistency.vlad/layout/a-char.c
deleted file mode 100644
index d13d19d30ef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-char.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static char a [10];
-static char e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array char:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-double.c b/gcc/testsuite/consistency.vlad/layout/a-double.c
deleted file mode 100644
index 0e5aa3c86bd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-double.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static double a [10];
-static double e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array double:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-float.c b/gcc/testsuite/consistency.vlad/layout/a-float.c
deleted file mode 100644
index 93d3ca5ccfa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-float.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static float a [10];
-static float e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array float:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-int.c b/gcc/testsuite/consistency.vlad/layout/a-int.c
deleted file mode 100644
index 2a91c802341..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-int.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static int a [10];
-static int e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array int:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-long.c b/gcc/testsuite/consistency.vlad/layout/a-long.c
deleted file mode 100644
index 00f82ec0b3a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-long.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static long a [10];
-static long e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array long:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/a-longdouble.c
deleted file mode 100644
index f93f797ba6c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-longdouble.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static long double a [10];
-static long double e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array longdouble:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-longlong.c b/gcc/testsuite/consistency.vlad/layout/a-longlong.c
deleted file mode 100644
index e3bcb9a6232..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-longlong.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static long long a [10];
-static long long e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array longlong:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-char.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-char.c
deleted file mode 100644
index 91e433b4468..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-char.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with char:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-double.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-double.c
deleted file mode 100644
index dfa2812fe47..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-double.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with double:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-float.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-float.c
deleted file mode 100644
index 8b1a4f251e3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-float.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with float:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-int.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-int.c
deleted file mode 100644
index c6f23db77ce..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-int.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with int:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-long.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-long.c
deleted file mode 100644
index 1e3dc333ded..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-long.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with long:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-longdouble.c
deleted file mode 100644
index bce9b46e3e9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-longdouble.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with longdouble:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-longlong.c
deleted file mode 100644
index 2974913b121..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-longlong.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with longlong:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-pointer.c
deleted file mode 100644
index afc6ba6eef0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-pointer.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with pointer:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-ptrdiff_t.c
deleted file mode 100644
index a85d34970cb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-ptrdiff_t.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with ptrdiff_t:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-of-s-short.c b/gcc/testsuite/consistency.vlad/layout/a-of-s-short.c
deleted file mode 100644
index 292770b2bbf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-of-s-short.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-} a[10];
-
-int main (void) {
-  printf ("++++Array of struct with short:\n");
-  printf ("size=%d,align=%d,displ-a[5]=%d,align-a[5]=%d\n",
-          sizeof (a), __alignof__ (a), (char*)&a[5] - (char*)a, __alignof__ (a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-pointer.c b/gcc/testsuite/consistency.vlad/layout/a-pointer.c
deleted file mode 100644
index d5c8bffbc06..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-pointer.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static char * a [10];
-static char * e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array pointer:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/a-ptrdiff_t.c
deleted file mode 100644
index b87a70b354f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-ptrdiff_t.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static ptrdiff_t a [10];
-static ptrdiff_t e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array ptrdiff_t:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-short.c b/gcc/testsuite/consistency.vlad/layout/a-short.c
deleted file mode 100644
index df81b39c453..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-short.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-static short a [10];
-static short e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array short:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-size_t.c b/gcc/testsuite/consistency.vlad/layout/a-size_t.c
deleted file mode 100644
index 0c47b1000ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-size_t.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static size_t a [10];
-static size_t e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array size_t:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/a-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/a-wchar_t.c
deleted file mode 100644
index 90c24b7b6be..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/a-wchar_t.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static wchar_t a [10];
-static wchar_t e [0]; /* GCC only */
-
-int main (void) {
-  printf ("+++Array wchar_t:\n");
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (a), __alignof__ (a),
-          (char *) &a[5] - (char *) a, __alignof__ (a[5]));
-  printf ("size=%d,align=%d,5th-elem-offset=%d,5th-elem-align=%d\n",
-          sizeof (e), __alignof__ (e),
-          (char *) &e[5] - (char *) a, __alignof__ (e[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-bool.cpp b/gcc/testsuite/consistency.vlad/layout/align-bool.cpp
deleted file mode 100644
index 1715822efa1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-bool.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static bool bbb;
-
-int main(void)
-{
-  printf ("+++Bool alignment:\n");
-  printf ("%d\n", __alignof__ (bbb));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-char.c b/gcc/testsuite/consistency.vlad/layout/align-char.c
deleted file mode 100644
index 7cd0657b55c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-char.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static char ccc;
-
-int main(void)
-{
-  printf ("+++Char alignment:\n");
-  printf ("%d\n", __alignof__ (ccc));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-double.c b/gcc/testsuite/consistency.vlad/layout/align-double.c
deleted file mode 100644
index 4cb95a69e31..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-double.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static double d;
-
-int main(void)
-{
-  printf ("+++Double alignment:\n");
-  printf ("%d\n", __alignof__ (d));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-float.c b/gcc/testsuite/consistency.vlad/layout/align-float.c
deleted file mode 100644
index 7342a1f53d0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-float.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static float f;
-
-int main(void)
-{
-  printf ("+++Float alignment:\n");
-  printf ("%d\n", __alignof__ (f));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-int.c b/gcc/testsuite/consistency.vlad/layout/align-int.c
deleted file mode 100644
index 79d917f9af0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-int.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static int i;
-
-int main(void)
-{
-  printf ("+++Int alignment:\n");
-  printf ("%d\n", __alignof__ (i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-long.c b/gcc/testsuite/consistency.vlad/layout/align-long.c
deleted file mode 100644
index aafd11c283b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-long.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static long lll;
-
-int main(void)
-{
-  printf ("+++Long alignment:\n");
-  printf ("%d\n", __alignof__ (lll));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-longdouble.c b/gcc/testsuite/consistency.vlad/layout/align-longdouble.c
deleted file mode 100644
index 7617aced266..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-longdouble.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static long double ld;
-
-int main(void)
-{
-  printf ("+++Long Double alignment:\n");
-  printf ("%d\n", __alignof__ (ld));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-longlong.c b/gcc/testsuite/consistency.vlad/layout/align-longlong.c
deleted file mode 100644
index 450e275eb46..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-longlong.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static long long ll;
-
-int main(void)
-{
-  printf ("+++Long long alignment:\n");
-  printf ("%d\n", __alignof__ (ll));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-pointer.c b/gcc/testsuite/consistency.vlad/layout/align-pointer.c
deleted file mode 100644
index 244c472e9f6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-pointer.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static char *p;
-
-int main(void)
-{
-  printf ("+++Pointer alignment:\n");
-  printf ("%d\n", __alignof__ (p));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-ptrdiff.c b/gcc/testsuite/consistency.vlad/layout/align-ptrdiff.c
deleted file mode 100644
index ff19b5c1e35..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-ptrdiff.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static ptrdiff_t pd;
-
-int main(void)
-{
-  printf ("+++ptrdiff_t alignment:\n");
-  printf ("%d\n", __alignof__ (pd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-short.c b/gcc/testsuite/consistency.vlad/layout/align-short.c
deleted file mode 100644
index 50d11e02395..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-short.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static short sss;
-
-int main(void)
-{
-  printf ("+++Short alignment:\n");
-  printf ("%d\n", __alignof__ (sss));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-size.c b/gcc/testsuite/consistency.vlad/layout/align-size.c
deleted file mode 100644
index eba90db9768..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-size.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static size_t sss;
-
-int main(void)
-{
-  printf ("+++size_t alignment:\n");
-  printf ("%d\n", __alignof__ (sss));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/align-wchar.c b/gcc/testsuite/consistency.vlad/layout/align-wchar.c
deleted file mode 100644
index e5b498ade39..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/align-wchar.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static wchar_t w;
-
-int main(void)
-{
-  printf ("+++wchar_t alignment:\n");
-  printf ("%d\n", __alignof__ (w));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/biggest-field-align.c b/gcc/testsuite/consistency.vlad/layout/biggest-field-align.c
deleted file mode 100644
index f49dcf3b9d2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/biggest-field-align.c
+++ /dev/null
@@ -1,153 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct {char m;} s0;
-static struct {short m;} s1;
-static struct {int m;} s2;
-static struct {long m;} s3;
-static struct {long long m;} s4;
-static struct {char * m;} s5;
-static struct {float m;} s6;
-static struct {double m;} s7;
-static struct {long double m;} s8;
-static struct {ptrdiff_t m;} s9;
-static struct {size_t m;} s10;
-static struct {wchar_t m;} s11;
-static struct {struct {char m;}m;} s12;
-static struct {struct {short m;}m;} s13;
-static struct {struct {int m;}m;} s14;
-static struct {struct {long m;}m;} s15;
-static struct {struct {long long m;}m;} s16;
-static struct {struct {char * m;}m;} s17;
-static struct {struct {float m;}m;} s18;
-static struct {struct {double m;}m;} s19;
-static struct {struct {long double m;}m;} s20;
-static struct {struct {ptrdiff_t m;}m;} s21;
-static struct {struct {size_t m;}m;} s22;
-static struct {struct {wchar_t m;}m;} s23;
-static struct {char m [10];} s24;
-static struct {short m [10];} s25;
-static struct {int m [10];} s26;
-static struct {long m [10];} s27;
-static struct {long long m [10];} s28;
-static struct {char * m [10];} s29;
-static struct {float m [10];} s30;
-static struct {double m [10];} s31;
-static struct {long double m [10];} s32;
-static struct {ptrdiff_t m [10];} s33;
-static struct {size_t m [10];} s34;
-static struct {wchar_t m [10];} s35;
-static struct {int :0; char m;} s36;
-static struct {int :0; short m;} s37;
-static struct {int :0; int m;} s38;
-static struct {int :0; long m;} s39;
-static struct {int :0; long long m;} s40;
-static struct {int :0; char * m;} s41;
-static struct {int :0; float m;} s42;
-static struct {int :0; double m;} s43;
-static struct {int :0; long double m;} s44;
-static struct {int :0; ptrdiff_t m;} s45;
-static struct {int :0; size_t m;} s46;
-static struct {int :0; wchar_t m;} s47;
-int main (void) {
-  int max_align = 0;
-  printf ("+++Biggest field alignment:\n");
-  if (max_align < __alignof__ (s0.m))
-     max_align = __alignof__ (s0.m);
-  if (max_align < __alignof__ (s1.m))
-     max_align = __alignof__ (s1.m);
-  if (max_align < __alignof__ (s2.m))
-     max_align = __alignof__ (s2.m);
-  if (max_align < __alignof__ (s3.m))
-     max_align = __alignof__ (s3.m);
-  if (max_align < __alignof__ (s4.m))
-     max_align = __alignof__ (s4.m);
-  if (max_align < __alignof__ (s5.m))
-     max_align = __alignof__ (s5.m);
-  if (max_align < __alignof__ (s6.m))
-     max_align = __alignof__ (s6.m);
-  if (max_align < __alignof__ (s7.m))
-     max_align = __alignof__ (s7.m);
-  if (max_align < __alignof__ (s8.m))
-     max_align = __alignof__ (s8.m);
-  if (max_align < __alignof__ (s9.m))
-     max_align = __alignof__ (s9.m);
-  if (max_align < __alignof__ (s10.m))
-     max_align = __alignof__ (s10.m);
-  if (max_align < __alignof__ (s11.m))
-     max_align = __alignof__ (s11.m);
-  if (max_align < __alignof__ (s12.m))
-     max_align = __alignof__ (s12.m);
-  if (max_align < __alignof__ (s13.m))
-     max_align = __alignof__ (s13.m);
-  if (max_align < __alignof__ (s14.m))
-     max_align = __alignof__ (s14.m);
-  if (max_align < __alignof__ (s15.m))
-     max_align = __alignof__ (s15.m);
-  if (max_align < __alignof__ (s16.m))
-     max_align = __alignof__ (s16.m);
-  if (max_align < __alignof__ (s17.m))
-     max_align = __alignof__ (s17.m);
-  if (max_align < __alignof__ (s18.m))
-     max_align = __alignof__ (s18.m);
-  if (max_align < __alignof__ (s19.m))
-     max_align = __alignof__ (s19.m);
-  if (max_align < __alignof__ (s20.m))
-     max_align = __alignof__ (s20.m);
-  if (max_align < __alignof__ (s21.m))
-     max_align = __alignof__ (s21.m);
-  if (max_align < __alignof__ (s22.m))
-     max_align = __alignof__ (s22.m);
-  if (max_align < __alignof__ (s23.m))
-     max_align = __alignof__ (s23.m);
-  if (max_align < __alignof__ (s24.m))
-     max_align = __alignof__ (s24.m);
-  if (max_align < __alignof__ (s25.m))
-     max_align = __alignof__ (s25.m);
-  if (max_align < __alignof__ (s26.m))
-     max_align = __alignof__ (s26.m);
-  if (max_align < __alignof__ (s27.m))
-     max_align = __alignof__ (s27.m);
-  if (max_align < __alignof__ (s28.m))
-     max_align = __alignof__ (s28.m);
-  if (max_align < __alignof__ (s29.m))
-     max_align = __alignof__ (s29.m);
-  if (max_align < __alignof__ (s30.m))
-     max_align = __alignof__ (s30.m);
-  if (max_align < __alignof__ (s31.m))
-     max_align = __alignof__ (s31.m);
-  if (max_align < __alignof__ (s32.m))
-     max_align = __alignof__ (s32.m);
-  if (max_align < __alignof__ (s33.m))
-     max_align = __alignof__ (s33.m);
-  if (max_align < __alignof__ (s34.m))
-     max_align = __alignof__ (s34.m);
-  if (max_align < __alignof__ (s35.m))
-     max_align = __alignof__ (s35.m);
-  if (max_align < __alignof__ (s36.m))
-     max_align = __alignof__ (s36.m);
-  if (max_align < __alignof__ (s37.m))
-     max_align = __alignof__ (s37.m);
-  if (max_align < __alignof__ (s38.m))
-     max_align = __alignof__ (s38.m);
-  if (max_align < __alignof__ (s39.m))
-     max_align = __alignof__ (s39.m);
-  if (max_align < __alignof__ (s40.m))
-     max_align = __alignof__ (s40.m);
-  if (max_align < __alignof__ (s41.m))
-     max_align = __alignof__ (s41.m);
-  if (max_align < __alignof__ (s42.m))
-     max_align = __alignof__ (s42.m);
-  if (max_align < __alignof__ (s43.m))
-     max_align = __alignof__ (s43.m);
-  if (max_align < __alignof__ (s44.m))
-     max_align = __alignof__ (s44.m);
-  if (max_align < __alignof__ (s45.m))
-     max_align = __alignof__ (s45.m);
-  if (max_align < __alignof__ (s46.m))
-     max_align = __alignof__ (s46.m);
-  if (max_align < __alignof__ (s47.m))
-     max_align = __alignof__ (s47.m);
-  printf ("max field align=%d\n", max_align);
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-char.cpp
deleted file mode 100644
index 98c087a52e6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-char=%d,\nalign-char=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-double.cpp
deleted file mode 100644
index eea024f2fe6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-double=%d,\nalign-char=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-float.cpp
deleted file mode 100644
index 143eb3f6dca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-float=%d,\nalign-char=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-int.cpp
deleted file mode 100644
index 7ce7aa3ab0a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-int=%d,\nalign-char=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-long.cpp
deleted file mode 100644
index 2fb7050674b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-long=%d,\nalign-char=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-longdouble.cpp
deleted file mode 100644
index cb02333154d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-longdouble=%d,\nalign-char=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-longlong.cpp
deleted file mode 100644
index f413d1f17ec..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-longlong=%d,\nalign-char=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-pointer.cpp
deleted file mode 100644
index aac50736e0c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-pointer=%d,\nalign-char=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-1-c-short.cpp
deleted file mode 100644
index a211804d72e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-short=%d,\nalign-char=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-char.cpp
deleted file mode 100644
index a6e555a5494..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-double.cpp
deleted file mode 100644
index 0a2842b759b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-float.cpp
deleted file mode 100644
index 167bc7108d3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-int.cpp
deleted file mode 100644
index f764a81777a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-int.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-long.cpp
deleted file mode 100644
index 1a1db08163f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-longdouble.cpp
deleted file mode 100644
index 3ab70ea580f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-longlong.cpp
deleted file mode 100644
index bc1b3a76fc5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-pointer.cpp
deleted file mode 100644
index 88f967fa0e8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-char-2-c-short.cpp
deleted file mode 100644
index ef977ebbfef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-char-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting classes with char & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-char.cpp
deleted file mode 100644
index f90b269e827..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-char=%d,\nalign-double=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-double.cpp
deleted file mode 100644
index d7b3fa6480c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-double=%d,\nalign-double=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-float.cpp
deleted file mode 100644
index 394ffafcd9b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-float=%d,\nalign-double=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-int.cpp
deleted file mode 100644
index 625e103f3cf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-int=%d,\nalign-double=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-long.cpp
deleted file mode 100644
index f7e92952629..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-long=%d,\nalign-double=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-longdouble.cpp
deleted file mode 100644
index 212ce467cee..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-longdouble=%d,\nalign-double=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-longlong.cpp
deleted file mode 100644
index b332f62f1b1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-longlong=%d,\nalign-double=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-pointer.cpp
deleted file mode 100644
index 28a1eda1aff..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-pointer=%d,\nalign-double=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-1-c-short.cpp
deleted file mode 100644
index 2e624c8c3f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-short=%d,\nalign-double=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-char.cpp
deleted file mode 100644
index f1421a2da50..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-double.cpp
deleted file mode 100644
index f94b2ac7e45..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-float.cpp
deleted file mode 100644
index 87b7fb46dd9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-int.cpp
deleted file mode 100644
index eff86e10de1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-int.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-long.cpp
deleted file mode 100644
index f6bb5d66f5e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-longdouble.cpp
deleted file mode 100644
index 3d992470d80..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-longlong.cpp
deleted file mode 100644
index 03142388df6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-pointer.cpp
deleted file mode 100644
index 7c4b00968e0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-double-2-c-short.cpp
deleted file mode 100644
index a168bb51be9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-double-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  double f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting classes with double & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-char.cpp
deleted file mode 100644
index b5c24e94694..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-char=%d,\nalign-float=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-double.cpp
deleted file mode 100644
index e1c4a0c9d2e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-double=%d,\nalign-float=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-float.cpp
deleted file mode 100644
index 2115c9e804e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-float=%d,\nalign-float=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-int.cpp
deleted file mode 100644
index 40bc9d71f69..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-int=%d,\nalign-float=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-long.cpp
deleted file mode 100644
index 7836bfaeff8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-long=%d,\nalign-float=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-longdouble.cpp
deleted file mode 100644
index 059adec015c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-longdouble=%d,\nalign-float=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-longlong.cpp
deleted file mode 100644
index 887c21719f6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-longlong=%d,\nalign-float=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-pointer.cpp
deleted file mode 100644
index e7dbaadd53c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-pointer=%d,\nalign-float=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-1-c-short.cpp
deleted file mode 100644
index 23be40fcbad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-short=%d,\nalign-float=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-char.cpp
deleted file mode 100644
index c9c2e15dbba..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-double.cpp
deleted file mode 100644
index 8419ce319e0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-float.cpp
deleted file mode 100644
index 9d15c297a77..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-int.cpp
deleted file mode 100644
index 5aebe7dce8d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-int.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
-
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-long.cpp
deleted file mode 100644
index f533090d1e4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-longdouble.cpp
deleted file mode 100644
index e289cb45255..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-longlong.cpp
deleted file mode 100644
index 5d02b3a4207..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-pointer.cpp
deleted file mode 100644
index bfa379d1bc3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-float-2-c-short.cpp
deleted file mode 100644
index 49c47eefc32..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-float-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  float f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting classes with float & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-char.cpp
deleted file mode 100644
index c1ae207faa3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-char=%d,\nalign-int=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-double.cpp
deleted file mode 100644
index 6d183dc9361..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-double=%d,\nalign-int=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-float.cpp
deleted file mode 100644
index 3836440a2cf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-float=%d,\nalign-int=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-int.cpp
deleted file mode 100644
index 4ff6c483e7e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-int=%d,\nalign-int=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-long.cpp
deleted file mode 100644
index c482f48a296..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-long=%d,\nalign-int=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-longdouble.cpp
deleted file mode 100644
index b77142a8102..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-longdouble=%d,\nalign-int=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-longlong.cpp
deleted file mode 100644
index 1ede5ef2fc3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-longlong=%d,\nalign-int=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-pointer.cpp
deleted file mode 100644
index 314a98d21d6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-pointer=%d,\nalign-int=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-1-c-short.cpp
deleted file mode 100644
index 7ddd10e8586..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-short=%d,\nalign-int=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-char.cpp
deleted file mode 100644
index cb6095f1faa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-double.cpp
deleted file mode 100644
index 19379b1bb63..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-float.cpp
deleted file mode 100644
index d951b4e89d7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-int.cpp
deleted file mode 100644
index 19cb8a7d6f3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-int.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-long.cpp
deleted file mode 100644
index e657adb2fee..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-longdouble.cpp
deleted file mode 100644
index f3a142ffc14..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-longlong.cpp
deleted file mode 100644
index ee3ad361c27..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-pointer.cpp
deleted file mode 100644
index 41327ded2eb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-int-2-c-short.cpp
deleted file mode 100644
index 496dce331d1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-int-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  int f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting classes with int & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-char.cpp
deleted file mode 100644
index f51791d8acc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-char=%d,\nalign-long=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-double.cpp
deleted file mode 100644
index 5f04afdf190..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-double=%d,\nalign-long=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-float.cpp
deleted file mode 100644
index 82c9c24601e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-float=%d,\nalign-long=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-int.cpp
deleted file mode 100644
index a9dd67ebece..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-int=%d,\nalign-long=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-long.cpp
deleted file mode 100644
index f60cd40e22a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-long=%d,\nalign-long=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-longdouble.cpp
deleted file mode 100644
index 6610d3db0bd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-longdouble=%d,\nalign-long=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-longlong.cpp
deleted file mode 100644
index 78ccd9bcefa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-longlong=%d,\nalign-long=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-pointer.cpp
deleted file mode 100644
index bd7536fb232..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-pointer=%d,\nalign-long=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-1-c-short.cpp
deleted file mode 100644
index 0775adf1a64..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-short=%d,\nalign-long=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-char.cpp
deleted file mode 100644
index 1c2c717d5ee..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-double.cpp
deleted file mode 100644
index 92db5fc1150..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-float.cpp
deleted file mode 100644
index 8a28eb7baaa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-int.cpp
deleted file mode 100644
index 3d2b3820175..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-int.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-long.cpp
deleted file mode 100644
index 2f924ff50b4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-longdouble.cpp
deleted file mode 100644
index d5def8ae32d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-longlong.cpp
deleted file mode 100644
index 55cfbdc8c22..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-pointer.cpp
deleted file mode 100644
index d12a750fdd9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-long-2-c-short.cpp
deleted file mode 100644
index 327119058f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-long-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting classes with long & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-char.cpp
deleted file mode 100644
index 847875b44d9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-char=%d,\nalign-longdouble=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-double.cpp
deleted file mode 100644
index e955190ecc3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-double=%d,\nalign-longdouble=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-float.cpp
deleted file mode 100644
index 8042ef0e954..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-float=%d,\nalign-longdouble=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-int.cpp
deleted file mode 100644
index 4eb1146dbcb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-int=%d,\nalign-longdouble=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-long.cpp
deleted file mode 100644
index accd98862df..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-long=%d,\nalign-longdouble=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-longdouble.cpp
deleted file mode 100644
index 937583935e3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-longdouble=%d,\nalign-longdouble=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-longlong.cpp
deleted file mode 100644
index fefcc4fa4ac..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-longlong=%d,\nalign-longdouble=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-pointer.cpp
deleted file mode 100644
index cea94b9dcc7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-pointer=%d,\nalign-longdouble=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-short.cpp
deleted file mode 100644
index a22be9afccd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-short=%d,\nalign-longdouble=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-char.cpp
deleted file mode 100644
index 9c9916291f7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-double.cpp
deleted file mode 100644
index f28c18728c0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-float.cpp
deleted file mode 100644
index a3ce344f9d2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-int.cpp
deleted file mode 100644
index 24ee503655e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-int.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-long.cpp
deleted file mode 100644
index 400749a1065..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-longdouble.cpp
deleted file mode 100644
index 52214c4ca3b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-longlong.cpp
deleted file mode 100644
index 5af11bc9efd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-pointer.cpp
deleted file mode 100644
index 8f59f1d2585..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-short.cpp
deleted file mode 100644
index 872ef62553f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longdouble-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long double f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting classes with longdouble & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-char.cpp
deleted file mode 100644
index d33b5847d23..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-char=%d,\nalign-longlong=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-double.cpp
deleted file mode 100644
index 0b712dd62ef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-double=%d,\nalign-longlong=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-float.cpp
deleted file mode 100644
index 5883facf25e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-float=%d,\nalign-longlong=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-int.cpp
deleted file mode 100644
index a2e68fbccf4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-int=%d,\nalign-longlong=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-long.cpp
deleted file mode 100644
index bf7507f614c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-long=%d,\nalign-longlong=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-longdouble.cpp
deleted file mode 100644
index 518ece0b573..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-longdouble=%d,\nalign-longlong=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-longlong.cpp
deleted file mode 100644
index 58417efbe6f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-longlong=%d,\nalign-longlong=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-pointer.cpp
deleted file mode 100644
index 8fc32f4c11e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-pointer=%d,\nalign-longlong=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-short.cpp
deleted file mode 100644
index 2f3266b18df..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-short=%d,\nalign-longlong=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-char.cpp
deleted file mode 100644
index 9da8867f9c5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-double.cpp
deleted file mode 100644
index a9914a46086..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-float.cpp
deleted file mode 100644
index 55e5c27ea07..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-int.cpp
deleted file mode 100644
index 30dd7e9ae62..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-int.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-long.cpp
deleted file mode 100644
index d456b38fa00..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-longdouble.cpp
deleted file mode 100644
index cc19dbbac59..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-longlong.cpp
deleted file mode 100644
index c8417458ee3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-pointer.cpp
deleted file mode 100644
index f9f01a4e8b5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-short.cpp
deleted file mode 100644
index b9acb1a1ffa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-longlong-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  long long f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting classes with longlong & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-char.cpp
deleted file mode 100644
index c209406fcc9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-char=%d,\nalign-pointer=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-double.cpp
deleted file mode 100644
index ad69d400469..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-double=%d,\nalign-pointer=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-float.cpp
deleted file mode 100644
index c9164142a95..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-float=%d,\nalign-pointer=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-int.cpp
deleted file mode 100644
index edf30c93e9f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-int=%d,\nalign-pointer=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-long.cpp
deleted file mode 100644
index aafa4e08baa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-long=%d,\nalign-pointer=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-longdouble.cpp
deleted file mode 100644
index 9dc6320211d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-longdouble=%d,\nalign-pointer=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-longlong.cpp
deleted file mode 100644
index 9af6fedb01b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-longlong=%d,\nalign-pointer=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-pointer.cpp
deleted file mode 100644
index 281bc3bc9f7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-pointer=%d,\nalign-pointer=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-short.cpp
deleted file mode 100644
index 0d877f45e8f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-short=%d,\nalign-pointer=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-char.cpp
deleted file mode 100644
index 6e408a5ddd0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-double.cpp
deleted file mode 100644
index 6ccd32fc43f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-float.cpp
deleted file mode 100644
index 8f9c7582033..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-int.cpp
deleted file mode 100644
index e567b9c5cb3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-int.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-long.cpp
deleted file mode 100644
index 44c56f77ada..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-longdouble.cpp
deleted file mode 100644
index 3662f4a2372..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-longlong.cpp
deleted file mode 100644
index 994fc78b8f4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-pointer.cpp
deleted file mode 100644
index 9d10f87964f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-short.cpp
deleted file mode 100644
index 411c10b114e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-pointer-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  char * f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting classes with pointer & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-char.cpp
deleted file mode 100644
index 28320ccc306..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-char.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  char m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with char inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-char=%d,\nalign-short=%d,align-char=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-double.cpp
deleted file mode 100644
index 081714f3485..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-double.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with double inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-double=%d,\nalign-short=%d,align-double=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-float.cpp
deleted file mode 100644
index cf5ef687cc3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-float.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  float m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with float inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-float=%d,\nalign-short=%d,align-float=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-int.cpp
deleted file mode 100644
index 208f6669415..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-int.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  int m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with int inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-int=%d,\nalign-short=%d,align-int=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-long.cpp
deleted file mode 100644
index 330fdb9a259..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-long.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with long inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-long=%d,\nalign-short=%d,align-long=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-longdouble.cpp
deleted file mode 100644
index f6be2334706..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-longdouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  long double m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longdouble inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-longdouble=%d,\nalign-short=%d,align-longdouble=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-longlong.cpp
deleted file mode 100644
index c8220ed0917..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-longlong.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  long long m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with longlong inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-longlong=%d,\nalign-short=%d,align-longlong=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-pointer.cpp
deleted file mode 100644
index 133ec8a4697..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-pointer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  char * m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with pointer inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-pointer=%d,\nalign-short=%d,align-pointer=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-1-c-short.cpp
deleted file mode 100644
index c5b87824f85..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-1-c-short.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-
-static class sss: public c{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting class with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-short=%d,\nalign-short=%d,align-short=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-char.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-char.cpp
deleted file mode 100644
index 58fba87daca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-char.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  char f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-double.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-double.cpp
deleted file mode 100644
index c3d0e11b5a9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-double.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-float.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-float.cpp
deleted file mode 100644
index 5197bdbd902..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-float.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  float f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-int.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-int.cpp
deleted file mode 100644
index 13206fb491e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-int.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  int f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-long.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-long.cpp
deleted file mode 100644
index a9821d8fcdb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-long.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-longdouble.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-longdouble.cpp
deleted file mode 100644
index 5324f062d8d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-longdouble.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  long double f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-longlong.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-longlong.cpp
deleted file mode 100644
index ba15073ebda..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-longlong.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  long long f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-pointer.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-pointer.cpp
deleted file mode 100644
index 0b4b747cd12..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-pointer.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  char * f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-short.cpp b/gcc/testsuite/consistency.vlad/layout/c-short-2-c-short.cpp
deleted file mode 100644
index 387229fe00d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/c-short-2-c-short.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class c{
-public:
-  short f;
-};
-
-class c2{
-public:
-  short f2;
-};
-
-
-static class sss: public c, public c2{
-public:
-  short m;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++Class with short inhereting classes with short & short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-f=%d,offset-f2=%d,offset-m=%d,\nalign-f=%d,align-f2=%d,align-m=%d\n",
-          _offsetof (class sss, f), _offsetof (class sss, f2), _offsetof (class sss, m),
-          __alignof__ (sss.f), __alignof__ (sss.f2), __alignof__ (sss.m));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-char-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-char-and-virtual.cpp
deleted file mode 100644
index d00b7c418bb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-char-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  char m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with char and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-double-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-double-and-virtual.cpp
deleted file mode 100644
index 8de277d314f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-double-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  double m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with double and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-float-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-float-and-virtual.cpp
deleted file mode 100644
index fc207acbd12..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-float-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  float m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with float and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-int-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-int-and-virtual.cpp
deleted file mode 100644
index 4fb2f14368e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-int-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  int m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with int and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-long-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-long-and-virtual.cpp
deleted file mode 100644
index de5c77c5154..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-long-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  long m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with long and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-longdouble-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-longdouble-and-virtual.cpp
deleted file mode 100644
index 787dcb778e7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-longdouble-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  long double m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with longdouble and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-longlong-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-longlong-and-virtual.cpp
deleted file mode 100644
index fe42705ceeb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-longlong-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  long long m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with longlong and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-pointer-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-pointer-and-virtual.cpp
deleted file mode 100644
index 9b8008ee31c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-pointer-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  char * m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with pointer and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/class-short-and-virtual.cpp b/gcc/testsuite/consistency.vlad/layout/class-short-and-virtual.cpp
deleted file mode 100644
index 8555efc5071..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/class-short-and-virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-static class sss {
-public:
-  short m;
-  virtual int f (int i) {return i;}
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Class starting with short and containing virtual function:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-m=%d,align-m=%d\n",
-          _offsetof (class sss, m), __alignof__ (sss.m));
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/endian.c b/gcc/testsuite/consistency.vlad/layout/endian.c
deleted file mode 100644
index e172a1aaf1b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/endian.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-static int w[2];
-static char * bytes;
-
-int main(void)
-{
-  printf ("+++Endian test:\n");
-  if (sizeof (int) == 2)
-    {
-      w[0] = 0x4142;
-      w[1] = 0;
-      bytes = (char *) w;
-      if (strcmp(bytes, "AB") == 0)
-	printf ("big endian\n");
-      else if (strcmp(bytes, "BA") == 0)
-	printf ("little endian\n");
-      else
-	{
-	  printf ("nor big nor little endian\n");
-	  return 1;
-	}
-    }
-  else if (sizeof (int) == 4)
-    {
-      w[0] = 0x41424344;
-      w[1] = 0;
-      bytes = (char *) w;
-      if (strcmp(bytes, "ABCD") == 0)
-	printf ("big endian\n");
-      else if (strcmp(bytes, "DCBA") == 0)
-	printf ("little endian\n");
-      else
-	{
-	  printf ("nor big nor little endian\n");
-	  return 1;
-	}
-    }
-  else
-    {
-      printf ("unexpected size of int\n");
-      return 1;
-    }
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-0-0-5.c b/gcc/testsuite/consistency.vlad/layout/f-0-0-5.c
deleted file mode 100644
index 391de5a7746..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-0-0-5.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int :0;
-  int :0;
-  int i3:5;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i3 = 31.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-0-20-17.c b/gcc/testsuite/consistency.vlad/layout/f-0-20-17.c
deleted file mode 100644
index 97ce19b6137..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-0-20-17.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int :0;
-  int i2:20;
-  int i3:17;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i2 = 1048575.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-0-24-24.c b/gcc/testsuite/consistency.vlad/layout/f-0-24-24.c
deleted file mode 100644
index db52fcf1986..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-0-24-24.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int :0;
-  int i2:24;
-  int i3:24;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i2 = 16777215.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 16777215.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-1-21-31.c b/gcc/testsuite/consistency.vlad/layout/f-1-21-31.c
deleted file mode 100644
index 6371a78bc3e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-1-21-31.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:1;
-  int i2:21;
-  int i3:31;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 1.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 2097151.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 2147483647.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-1-3-1.c b/gcc/testsuite/consistency.vlad/layout/f-1-3-1.c
deleted file mode 100644
index 584f73cf26b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-1-3-1.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:1;
-  int i2:3;
-  int i3:1;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 1.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 7.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-10-11-10.c b/gcc/testsuite/consistency.vlad/layout/f-10-11-10.c
deleted file mode 100644
index 45b13c3245c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-10-11-10.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:10;
-  int i2:11;
-  int i3:10;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 1023.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 2047.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1023.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-11-12-10.c b/gcc/testsuite/consistency.vlad/layout/f-11-12-10.c
deleted file mode 100644
index 06463f3ef06..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-11-12-10.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:11;
-  int i2:12;
-  int i3:10;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2047.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 4095.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1023.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-14-22-10.c b/gcc/testsuite/consistency.vlad/layout/f-14-22-10.c
deleted file mode 100644
index 189e6cfce21..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-14-22-10.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:14;
-  int i2:22;
-  int i3:10;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 16383.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 4194303.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1023.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-14-29-30.c b/gcc/testsuite/consistency.vlad/layout/f-14-29-30.c
deleted file mode 100644
index 3d95e82234c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-14-29-30.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:14;
-  int i2:29;
-  int i3:30;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 16383.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 536870911.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1073741823.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-14-31-26.c b/gcc/testsuite/consistency.vlad/layout/f-14-31-26.c
deleted file mode 100644
index 7ce702df229..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-14-31-26.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:14;
-  int i2:31;
-  int i3:26;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 16383.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 2147483647.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 67108863.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-14-8-9.c b/gcc/testsuite/consistency.vlad/layout/f-14-8-9.c
deleted file mode 100644
index 26c84e9414a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-14-8-9.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:14;
-  int i2:8;
-  int i3:9;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 16383.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 255.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 511.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-15-1-22.c b/gcc/testsuite/consistency.vlad/layout/f-15-1-22.c
deleted file mode 100644
index be85652380e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-15-1-22.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:15;
-  int i2:1;
-  int i3:22;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 32767.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 1.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 4194303.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-16-30-15.c b/gcc/testsuite/consistency.vlad/layout/f-16-30-15.c
deleted file mode 100644
index c4de6e2dfbb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-16-30-15.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:16;
-  int i2:30;
-  int i3:15;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 65535.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 1073741823.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 32767.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-17-17-2.c b/gcc/testsuite/consistency.vlad/layout/f-17-17-2.c
deleted file mode 100644
index 1d58d73de51..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-17-17-2.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:17;
-  int i2:17;
-  int i3:2;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 3.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-17-17-20.c b/gcc/testsuite/consistency.vlad/layout/f-17-17-20.c
deleted file mode 100644
index 2740b76b781..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-17-17-20.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:17;
-  int i2:17;
-  int i3:20;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1048575.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-17-21-17.c b/gcc/testsuite/consistency.vlad/layout/f-17-21-17.c
deleted file mode 100644
index bed45371609..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-17-21-17.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:17;
-  int i2:21;
-  int i3:17;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 2097151.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-18-15-30.c b/gcc/testsuite/consistency.vlad/layout/f-18-15-30.c
deleted file mode 100644
index dbcf87c59f9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-18-15-30.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:18;
-  int i2:15;
-  int i3:30;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 262143.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 32767.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1073741823.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-18-26-0.c b/gcc/testsuite/consistency.vlad/layout/f-18-26-0.c
deleted file mode 100644
index b4707dd3698..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-18-26-0.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:18;
-  int i2:26;
-  int :0;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 262143.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 67108863.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-18-26-11.c b/gcc/testsuite/consistency.vlad/layout/f-18-26-11.c
deleted file mode 100644
index ac25c518fcb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-18-26-11.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:18;
-  int i2:26;
-  int i3:11;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 262143.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 67108863.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 2047.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-18-4-17.c b/gcc/testsuite/consistency.vlad/layout/f-18-4-17.c
deleted file mode 100644
index 7af7de1687d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-18-4-17.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:18;
-  int i2:4;
-  int i3:17;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 262143.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 15.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-18-5-16.c b/gcc/testsuite/consistency.vlad/layout/f-18-5-16.c
deleted file mode 100644
index 477a08627e0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-18-5-16.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:18;
-  int i2:5;
-  int i3:16;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 262143.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 31.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 65535.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-19-6-22.c b/gcc/testsuite/consistency.vlad/layout/f-19-6-22.c
deleted file mode 100644
index 7697e914840..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-19-6-22.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:19;
-  int i2:6;
-  int i3:22;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 524287.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 63.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 4194303.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-2-25-27.c b/gcc/testsuite/consistency.vlad/layout/f-2-25-27.c
deleted file mode 100644
index cd491b8e56d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-2-25-27.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:2;
-  int i2:25;
-  int i3:27;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 3.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 33554431.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 134217727.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-20-19-9.c b/gcc/testsuite/consistency.vlad/layout/f-20-19-9.c
deleted file mode 100644
index b0e851e587c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-20-19-9.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:20;
-  int i2:19;
-  int i3:9;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 1048575.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 524287.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 511.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-20-20-15.c b/gcc/testsuite/consistency.vlad/layout/f-20-20-15.c
deleted file mode 100644
index fde920c54b6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-20-20-15.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:20;
-  int i2:20;
-  int i3:15;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 1048575.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 1048575.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 32767.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-20-26-14.c b/gcc/testsuite/consistency.vlad/layout/f-20-26-14.c
deleted file mode 100644
index f42dadd27ec..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-20-26-14.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:20;
-  int i2:26;
-  int i3:14;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 1048575.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 67108863.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 16383.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-21-16-24.c b/gcc/testsuite/consistency.vlad/layout/f-21-16-24.c
deleted file mode 100644
index 0dc78bd9ac5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-21-16-24.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:21;
-  int i2:16;
-  int i3:24;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2097151.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 65535.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 16777215.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-21-19-4.c b/gcc/testsuite/consistency.vlad/layout/f-21-19-4.c
deleted file mode 100644
index 3a8583beded..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-21-19-4.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:21;
-  int i2:19;
-  int i3:4;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2097151.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 524287.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 15.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-21-22-1.c b/gcc/testsuite/consistency.vlad/layout/f-21-22-1.c
deleted file mode 100644
index 68ab4741283..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-21-22-1.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:21;
-  int i2:22;
-  int i3:1;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2097151.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 4194303.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-21-24-20.c b/gcc/testsuite/consistency.vlad/layout/f-21-24-20.c
deleted file mode 100644
index a0020e98c77..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-21-24-20.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:21;
-  int i2:24;
-  int i3:20;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2097151.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 16777215.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1048575.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-21-5-26.c b/gcc/testsuite/consistency.vlad/layout/f-21-5-26.c
deleted file mode 100644
index 8bb95d436a7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-21-5-26.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:21;
-  int i2:5;
-  int i3:26;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2097151.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 31.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 67108863.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-22-2-19.c b/gcc/testsuite/consistency.vlad/layout/f-22-2-19.c
deleted file mode 100644
index 75a31fd71d5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-22-2-19.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:22;
-  int i2:2;
-  int i3:19;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 4194303.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 3.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 524287.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-22-2-28.c b/gcc/testsuite/consistency.vlad/layout/f-22-2-28.c
deleted file mode 100644
index 4af7409b598..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-22-2-28.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:22;
-  int i2:2;
-  int i3:28;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 4194303.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 3.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 268435455.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-23-17-8.c b/gcc/testsuite/consistency.vlad/layout/f-23-17-8.c
deleted file mode 100644
index 2c0ebd5f1eb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-23-17-8.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:23;
-  int i2:17;
-  int i3:8;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 8388607.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 131071.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 255.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-24-18-9.c b/gcc/testsuite/consistency.vlad/layout/f-24-18-9.c
deleted file mode 100644
index c0a1e682cf1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-24-18-9.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:24;
-  int i2:18;
-  int i3:9;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 16777215.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 262143.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 511.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-24-27-8.c b/gcc/testsuite/consistency.vlad/layout/f-24-27-8.c
deleted file mode 100644
index c23fa1397bb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-24-27-8.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:24;
-  int i2:27;
-  int i3:8;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 16777215.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 134217727.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 255.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-25-6-23.c b/gcc/testsuite/consistency.vlad/layout/f-25-6-23.c
deleted file mode 100644
index b05519efb0c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-25-6-23.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:25;
-  int i2:6;
-  int i3:23;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 33554431.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 63.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 8388607.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-26-8-6.c b/gcc/testsuite/consistency.vlad/layout/f-26-8-6.c
deleted file mode 100644
index 7703dd91eb2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-26-8-6.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:26;
-  int i2:8;
-  int i3:6;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 67108863.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 255.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 63.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-27-22-7.c b/gcc/testsuite/consistency.vlad/layout/f-27-22-7.c
deleted file mode 100644
index 5a54216d95c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-27-22-7.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:27;
-  int i2:22;
-  int i3:7;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 134217727.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 4194303.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 127.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-29-16-7.c b/gcc/testsuite/consistency.vlad/layout/f-29-16-7.c
deleted file mode 100644
index cd558b3609b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-29-16-7.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:29;
-  int i2:16;
-  int i3:7;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 536870911.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 65535.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 127.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-29-4-10.c b/gcc/testsuite/consistency.vlad/layout/f-29-4-10.c
deleted file mode 100644
index 89c785717d8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-29-4-10.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:29;
-  int i2:4;
-  int i3:10;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 536870911.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 15.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1023.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-3-7-1.c b/gcc/testsuite/consistency.vlad/layout/f-3-7-1.c
deleted file mode 100644
index 65040b6366d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-3-7-1.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:3;
-  int i2:7;
-  int i3:1;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 7.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 127.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-30-15-26.c b/gcc/testsuite/consistency.vlad/layout/f-30-15-26.c
deleted file mode 100644
index 21558c2ae40..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-30-15-26.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:30;
-  int i2:15;
-  int i3:26;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 1073741823.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 32767.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 67108863.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-30-24-30.c b/gcc/testsuite/consistency.vlad/layout/f-30-24-30.c
deleted file mode 100644
index a88fb1c1014..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-30-24-30.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:30;
-  int i2:24;
-  int i3:30;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 1073741823.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 16777215.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 1073741823.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-31-28-16.c b/gcc/testsuite/consistency.vlad/layout/f-31-28-16.c
deleted file mode 100644
index f5573e5d4c0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-31-28-16.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:31;
-  int i2:28;
-  int i3:16;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2147483647.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 268435455.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 65535.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-31-4-14.c b/gcc/testsuite/consistency.vlad/layout/f-31-4-14.c
deleted file mode 100644
index 262606d1c1d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-31-4-14.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:31;
-  int i2:4;
-  int i3:14;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2147483647.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 15.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 16383.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-31-9-0.c b/gcc/testsuite/consistency.vlad/layout/f-31-9-0.c
deleted file mode 100644
index aba3248db61..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-31-9-0.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:31;
-  int i2:9;
-  int :0;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 2147483647.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 511.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-4-14-29.c b/gcc/testsuite/consistency.vlad/layout/f-4-14-29.c
deleted file mode 100644
index 6c668a01b21..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-4-14-29.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:4;
-  int i2:14;
-  int i3:29;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 15.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 16383.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 536870911.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-5-23-7.c b/gcc/testsuite/consistency.vlad/layout/f-5-23-7.c
deleted file mode 100644
index c512fc14fb3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-5-23-7.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:5;
-  int i2:23;
-  int i3:7;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 31.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 8388607.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 127.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/f-7-14-12.c b/gcc/testsuite/consistency.vlad/layout/f-7-14-12.c
deleted file mode 100644
index 000fc64feca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/f-7-14-12.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-struct sss{
-  int i1:7;
-  int i2:14;
-  int i3:12;
-};
-
-static union u{
-  struct sss sss;
-  unsigned char a[sizeof (struct sss)];
-} u;
-
-int main (void) {
-  int i;
-  for (i = 0; i < sizeof (struct sss); i++)
-    u.a[i] = 0;
-  u.sss.i1 = 127.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i2 = 16383.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  u.sss.i3 = 4095.0;
-  for (i = 0; i < sizeof (struct sss); i++)
-    printf ("%x ", u.a[i]);
-  printf ("\n");
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/README b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/README
deleted file mode 100644
index db408961bf1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/README
+++ /dev/null
@@ -1,6 +0,0 @@
-  This directory contains layout test results for 97r2 i960-vxworks
-compiler used with options
-
--O2 -fvtable-thunks -mno-strict-align -fno-rtti -fcheck-new-mca
--mold-align -mno-leaf-procedures
-
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-char.out
deleted file mode 100644
index 3993e1d9875..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array char:
-size=10,align=1,5th-elem-offset=5,5th-elem-align=1
-size=0,align=1,5th-elem-offset=15,5th-elem-align=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-char.out++
deleted file mode 100644
index 3993e1d9875..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array char:
-size=10,align=1,5th-elem-offset=5,5th-elem-align=1
-size=0,align=1,5th-elem-offset=15,5th-elem-align=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-double.out
deleted file mode 100644
index 22bb7317943..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array double:
-size=80,align=8,5th-elem-offset=40,5th-elem-align=8
-size=0,align=8,5th-elem-offset=120,5th-elem-align=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-double.out++
deleted file mode 100644
index 22bb7317943..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array double:
-size=80,align=8,5th-elem-offset=40,5th-elem-align=8
-size=0,align=8,5th-elem-offset=120,5th-elem-align=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-float.out
deleted file mode 100644
index 1464d94a94e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array float:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-float.out++
deleted file mode 100644
index 1464d94a94e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array float:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-int.out
deleted file mode 100644
index 9fafbf6813d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array int:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-int.out++
deleted file mode 100644
index 9fafbf6813d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array int:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-long.out
deleted file mode 100644
index 05e925ad178..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array long:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-long.out++
deleted file mode 100644
index 05e925ad178..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array long:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longdouble.out
deleted file mode 100644
index 0452ad8dcf1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array longdouble:
-size=160,align=16,5th-elem-offset=80,5th-elem-align=16
-size=0,align=16,5th-elem-offset=240,5th-elem-align=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longdouble.out++
deleted file mode 100644
index 0452ad8dcf1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array longdouble:
-size=160,align=16,5th-elem-offset=80,5th-elem-align=16
-size=0,align=16,5th-elem-offset=240,5th-elem-align=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longlong.out
deleted file mode 100644
index c6d29e0c5e5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array longlong:
-size=80,align=8,5th-elem-offset=40,5th-elem-align=8
-size=0,align=8,5th-elem-offset=120,5th-elem-align=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longlong.out++
deleted file mode 100644
index c6d29e0c5e5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array longlong:
-size=80,align=8,5th-elem-offset=40,5th-elem-align=8
-size=0,align=8,5th-elem-offset=120,5th-elem-align=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-char.out
deleted file mode 100644
index 29f19e8e764..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-char.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with char:
-size=10,align=1,displ-a[5]=5,align-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-char.out++
deleted file mode 100644
index 29f19e8e764..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-char.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with char:
-size=10,align=1,displ-a[5]=5,align-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-double.out
deleted file mode 100644
index d64c91a8817..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-double.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with double:
-size=80,align=8,displ-a[5]=40,align-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-double.out++
deleted file mode 100644
index d64c91a8817..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-double.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with double:
-size=80,align=8,displ-a[5]=40,align-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-float.out
deleted file mode 100644
index 75f8876a7f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-float.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with float:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-float.out++
deleted file mode 100644
index 75f8876a7f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-float.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with float:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-int.out
deleted file mode 100644
index f77c02f79ad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-int.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with int:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-int.out++
deleted file mode 100644
index f77c02f79ad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-int.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with int:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-long.out
deleted file mode 100644
index 46599e16ca6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-long.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with long:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-long.out++
deleted file mode 100644
index 46599e16ca6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-long.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with long:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longdouble.out
deleted file mode 100644
index 1e765412599..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longdouble.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with longdouble:
-size=240,align=12,displ-a[5]=120,align-a[5]=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longdouble.out++
deleted file mode 100644
index 1e765412599..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longdouble.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with longdouble:
-size=240,align=12,displ-a[5]=120,align-a[5]=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longlong.out
deleted file mode 100644
index ec23317651f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longlong.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with longlong:
-size=80,align=8,displ-a[5]=40,align-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longlong.out++
deleted file mode 100644
index ec23317651f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-longlong.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with longlong:
-size=80,align=8,displ-a[5]=40,align-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-pointer.out
deleted file mode 100644
index 2a1f6c24e4f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-pointer.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with pointer:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-pointer.out++
deleted file mode 100644
index 2a1f6c24e4f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-pointer.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with pointer:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-ptrdiff_t.out
deleted file mode 100644
index decef23f46a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-ptrdiff_t.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with ptrdiff_t:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-ptrdiff_t.out++
deleted file mode 100644
index decef23f46a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-ptrdiff_t.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with ptrdiff_t:
-size=40,align=4,displ-a[5]=20,align-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-short.out
deleted file mode 100644
index 5d8db477a98..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-short.out
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with short:
-size=20,align=2,displ-a[5]=10,align-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-short.out++
deleted file mode 100644
index 5d8db477a98..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-of-s-short.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-++++Array of struct with short:
-size=20,align=2,displ-a[5]=10,align-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-pointer.out
deleted file mode 100644
index 9e6fbc66755..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array pointer:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-pointer.out++
deleted file mode 100644
index 9e6fbc66755..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array pointer:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-ptrdiff_t.out
deleted file mode 100644
index 67196478eed..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array ptrdiff_t:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-ptrdiff_t.out++
deleted file mode 100644
index 67196478eed..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array ptrdiff_t:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-short.out
deleted file mode 100644
index 1b9e16d9350..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array short:
-size=20,align=2,5th-elem-offset=10,5th-elem-align=2
-size=0,align=2,5th-elem-offset=30,5th-elem-align=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-short.out++
deleted file mode 100644
index 1b9e16d9350..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array short:
-size=20,align=2,5th-elem-offset=10,5th-elem-align=2
-size=0,align=2,5th-elem-offset=30,5th-elem-align=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-size_t.out
deleted file mode 100644
index c906b5a4408..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array size_t:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-size_t.out++
deleted file mode 100644
index c906b5a4408..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array size_t:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-wchar_t.out
deleted file mode 100644
index de3f5ba88c8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array wchar_t:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-wchar_t.out++
deleted file mode 100644
index de3f5ba88c8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/a-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Array wchar_t:
-size=40,align=4,5th-elem-offset=20,5th-elem-align=4
-size=0,align=4,5th-elem-offset=60,5th-elem-align=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-bool.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-bool.out++
deleted file mode 100644
index 44947e3d488..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-bool.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Bool alignment:
-1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-char.out
deleted file mode 100644
index edb1dada245..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-char.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Char alignment:
-1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-char.out++
deleted file mode 100644
index edb1dada245..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-char.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Char alignment:
-1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-double.out
deleted file mode 100644
index c1d18907e97..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-double.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Double alignment:
-8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-double.out++
deleted file mode 100644
index c1d18907e97..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-double.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Double alignment:
-8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-float.out
deleted file mode 100644
index e7fdbf6e5c2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-float.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Float alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-float.out++
deleted file mode 100644
index e7fdbf6e5c2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-float.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Float alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-int.out
deleted file mode 100644
index 6654553c0ab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-int.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Int alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-int.out++
deleted file mode 100644
index 6654553c0ab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-int.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Int alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-long.out
deleted file mode 100644
index b6e9d867db6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-long.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-long.out++
deleted file mode 100644
index b6e9d867db6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-long.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longdouble.out
deleted file mode 100644
index e1d75ff1061..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longdouble.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long Double alignment:
-16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longdouble.out++
deleted file mode 100644
index e1d75ff1061..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longdouble.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long Double alignment:
-16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longlong.out
deleted file mode 100644
index 081af1c4b81..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longlong.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long long alignment:
-8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longlong.out++
deleted file mode 100644
index 081af1c4b81..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-longlong.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long long alignment:
-8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-pointer.out
deleted file mode 100644
index bd50aa2fbe8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-pointer.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Pointer alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-pointer.out++
deleted file mode 100644
index bd50aa2fbe8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-pointer.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Pointer alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-ptrdiff.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-ptrdiff.out
deleted file mode 100644
index b801ae2f6f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-ptrdiff.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++ptrdiff_t alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-ptrdiff.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-ptrdiff.out++
deleted file mode 100644
index b801ae2f6f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-ptrdiff.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++ptrdiff_t alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-short.out
deleted file mode 100644
index 8548a6f576b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-short.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Short alignment:
-2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-short.out++
deleted file mode 100644
index 8548a6f576b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-short.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Short alignment:
-2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-size.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-size.out
deleted file mode 100644
index e7721b99e6c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-size.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++size_t alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-size.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-size.out++
deleted file mode 100644
index e7721b99e6c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-size.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++size_t alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-wchar.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-wchar.out
deleted file mode 100644
index 254d2df2e74..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-wchar.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++wchar_t alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-wchar.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-wchar.out++
deleted file mode 100644
index 254d2df2e74..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/align-wchar.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++wchar_t alignment:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/biggest-field-align.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/biggest-field-align.out
deleted file mode 100644
index b030aed3a82..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/biggest-field-align.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Biggest field alignment:
-max field align=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/biggest-field-align.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/biggest-field-align.out++
deleted file mode 100644
index b030aed3a82..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/biggest-field-align.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Biggest field alignment:
-max field align=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-char.out++
deleted file mode 100644
index 279f5892856..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with char:
-size=2,align=1
-offset-char=0,offset-char=1,
-align-char=1,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-double.out++
deleted file mode 100644
index e9eb785286e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting class with char:
-size=16,align=8
-offset-char=0,offset-double=8,
-align-char=1,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-float.out++
deleted file mode 100644
index f5d42de3076..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with char:
-size=8,align=4
-offset-char=0,offset-float=4,
-align-char=1,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-int.out++
deleted file mode 100644
index e42baf13038..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with char:
-size=8,align=4
-offset-char=0,offset-int=4,
-align-char=1,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-long.out++
deleted file mode 100644
index ef54e381dbe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with char:
-size=8,align=4
-offset-char=0,offset-long=4,
-align-char=1,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-longdouble.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-longdouble.out+
deleted file mode 100644
index 69abcaaca82..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-longdouble.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting class with char:
-size=32,align=16
-offset-char=0,offset-longdouble=16,
-align-char=1,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-longlong.out++
deleted file mode 100644
index 83c4c58c0bb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting class with char:
-size=16,align=8
-offset-char=0,offset-longlong=8,
-align-char=1,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-pointer.out++
deleted file mode 100644
index 1ad15c82e62..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting class with char:
-size=8,align=4
-offset-char=0,offset-pointer=4,
-align-char=1,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-short.out++
deleted file mode 100644
index 6f633e5a72f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-1-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with char:
-size=4,align=2
-offset-char=0,offset-short=2,
-align-char=1,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-char.out++
deleted file mode 100644
index 3b21e9cc1d4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & char:
-size=3,align=1
-offset-f=0,offset-f2=1,offset-m=2,
-align-f=1,align-f2=1,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-double.out++
deleted file mode 100644
index 6d9bb8f6648..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & double:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=1,align-f2=8,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-float.out++
deleted file mode 100644
index dafd2cf7978..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & float:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=1,align-f2=4,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-int.out++
deleted file mode 100644
index 0882f0d7e7e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & int:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=1,align-f2=4,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-long.out++
deleted file mode 100644
index 72d2d43bdd8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & long:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=1,align-f2=4,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-longdouble.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-longdouble.out+
deleted file mode 100644
index 63b7baff118..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-longdouble.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & longdouble:
-size=48,align=12
-offset-f=0,offset-f2=12,offset-m=36,
-align-f=1,align-f2=16,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-longlong.out++
deleted file mode 100644
index d4620e08b31..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & longlong:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=1,align-f2=8,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-pointer.out++
deleted file mode 100644
index d4ab9cd1558..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & pointer:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=1,align-f2=4,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-short.out++
deleted file mode 100644
index f7ee95d8b22..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-char-2-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting classes with char & short:
-size=6,align=2
-offset-f=0,offset-f2=2,offset-m=4,
-align-f=1,align-f2=2,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-char.out++
deleted file mode 100644
index 1d1c20b72ac..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with double:
-size=16,align=8
-offset-double=0,offset-char=8,
-align-double=8,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-double.out++
deleted file mode 100644
index 31166648165..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting class with double:
-size=16,align=8
-offset-double=0,offset-double=8,
-align-double=8,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-float.out++
deleted file mode 100644
index 20eb74bb488..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with double:
-size=16,align=8
-offset-double=0,offset-float=8,
-align-double=8,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-int.out++
deleted file mode 100644
index aef0dea233b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with double:
-size=16,align=8
-offset-double=0,offset-int=8,
-align-double=8,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-long.out++
deleted file mode 100644
index f716234640c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with double:
-size=16,align=8
-offset-double=0,offset-long=8,
-align-double=8,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-longlong.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-longlong.out+
deleted file mode 100644
index 47497a51040..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-longlong.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting class with double:
-size=16,align=8
-offset-double=0,offset-longlong=8,
-align-double=8,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-pointer.out++
deleted file mode 100644
index 2753df57cf7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting class with double:
-size=16,align=8
-offset-double=0,offset-pointer=8,
-align-double=8,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-short.out++
deleted file mode 100644
index 9488b5b8cbb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-1-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with double:
-size=16,align=8
-offset-double=0,offset-short=8,
-align-double=8,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-char.out++
deleted file mode 100644
index 7e38a00d883..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting classes with double & char:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=1,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-double.out++
deleted file mode 100644
index 2ce99186a1e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting classes with double & double:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=8,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-float.out++
deleted file mode 100644
index e564968d292..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting classes with double & float:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=4,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-int.out++
deleted file mode 100644
index 79a4e220251..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting classes with double & int:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=4,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-long.out++
deleted file mode 100644
index 4badfcbae8a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting classes with double & long:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=4,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-longlong.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-longlong.out+
deleted file mode 100644
index 2aef53d3d8a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-longlong.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting classes with double & longlong:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=8,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-pointer.out++
deleted file mode 100644
index 90ee6b5b85b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting classes with double & pointer:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=4,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-short.out++
deleted file mode 100644
index e32467bf37e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-double-2-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting classes with double & short:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=2,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-char.out++
deleted file mode 100644
index 56173215e31..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with float:
-size=8,align=4
-offset-float=0,offset-char=4,
-align-float=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-double.out++
deleted file mode 100644
index c1690b10790..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting class with float:
-size=16,align=8
-offset-float=0,offset-double=8,
-align-float=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-float.out++
deleted file mode 100644
index 633b171675d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with float:
-size=8,align=4
-offset-float=0,offset-float=4,
-align-float=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-int.out++
deleted file mode 100644
index f78e0247b72..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with float:
-size=8,align=4
-offset-float=0,offset-int=4,
-align-float=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-long.out++
deleted file mode 100644
index 0357c8756ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with float:
-size=8,align=4
-offset-float=0,offset-long=4,
-align-float=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-longdouble.out
deleted file mode 100644
index ba46d7da362..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting class with float:
-size=32,align=16
-offset-float=0,offset-longdouble=16,
-align-float=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-longlong.out++
deleted file mode 100644
index a63831c04b5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting class with float:
-size=16,align=8
-offset-float=0,offset-longlong=8,
-align-float=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-pointer.out++
deleted file mode 100644
index 5ebfa08da80..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting class with float:
-size=8,align=4
-offset-float=0,offset-pointer=4,
-align-float=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-short.out++
deleted file mode 100644
index 8928f4951f0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-1-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with float:
-size=8,align=4
-offset-float=0,offset-short=4,
-align-float=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-char.out++
deleted file mode 100644
index a3e784dce8e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & char:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=1,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-double.out++
deleted file mode 100644
index a46ae357ea7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & double:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=4,align-f2=8,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-float.out++
deleted file mode 100644
index ac3f3f643ab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & float:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-int.out++
deleted file mode 100644
index 6c647fa9241..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & int:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-long.out++
deleted file mode 100644
index 6e4c7121833..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & long:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-longdouble.out
deleted file mode 100644
index cb71c0ab85e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & longdouble:
-size=48,align=12
-offset-f=0,offset-f2=12,offset-m=36,
-align-f=4,align-f2=16,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-longlong.out++
deleted file mode 100644
index 547174ffbeb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & longlong:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=4,align-f2=8,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-pointer.out++
deleted file mode 100644
index 46941983c95..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & pointer:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-short.out++
deleted file mode 100644
index 313796126e3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-float-2-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting classes with float & short:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=2,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-char.out++
deleted file mode 100644
index 29bed5da260..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with int:
-size=8,align=4
-offset-int=0,offset-char=4,
-align-int=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-double.out++
deleted file mode 100644
index 83919a5105d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting class with int:
-size=16,align=8
-offset-int=0,offset-double=8,
-align-int=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-float.out++
deleted file mode 100644
index 274054576b7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with int:
-size=8,align=4
-offset-int=0,offset-float=4,
-align-int=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-int.out++
deleted file mode 100644
index e9913725c4b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with int:
-size=8,align=4
-offset-int=0,offset-int=4,
-align-int=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-long.out++
deleted file mode 100644
index 9a12d3fcf1c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with int:
-size=8,align=4
-offset-int=0,offset-long=4,
-align-int=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-longdouble.out++
deleted file mode 100644
index 5811946ad87..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-longdouble.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting class with int:
-size=32,align=16
-offset-int=0,offset-longdouble=16,
-align-int=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-longlong.out++
deleted file mode 100644
index 8c0c7411b38..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting class with int:
-size=16,align=8
-offset-int=0,offset-longlong=8,
-align-int=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-pointer.out++
deleted file mode 100644
index 9d3e9a7d023..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting class with int:
-size=8,align=4
-offset-int=0,offset-pointer=4,
-align-int=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-short.out++
deleted file mode 100644
index 445140d8ea6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-1-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with int:
-size=8,align=4
-offset-int=0,offset-short=4,
-align-int=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-char.out++
deleted file mode 100644
index 10041fe3487..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & char:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=1,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-double.out++
deleted file mode 100644
index 94469c2621a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & double:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=4,align-f2=8,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-float.out++
deleted file mode 100644
index ef89a0a8316..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & float:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-int.out++
deleted file mode 100644
index 8134f2d5695..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & int:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-long.out++
deleted file mode 100644
index fee4e74fd9d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & long:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-longdouble.out++
deleted file mode 100644
index 8158388b69e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-longdouble.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & longdouble:
-size=48,align=12
-offset-f=0,offset-f2=12,offset-m=36,
-align-f=4,align-f2=16,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-longlong.out++
deleted file mode 100644
index f2842f37e0f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & longlong:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=4,align-f2=8,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-pointer.out++
deleted file mode 100644
index b7a35d12a69..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & pointer:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-short.out++
deleted file mode 100644
index b18b7618736..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-int-2-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting classes with int & short:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=2,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-char.out++
deleted file mode 100644
index 7e5412ee666..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with long:
-size=8,align=4
-offset-long=0,offset-char=4,
-align-long=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-double.out++
deleted file mode 100644
index 86ac60dbc31..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting class with long:
-size=16,align=8
-offset-long=0,offset-double=8,
-align-long=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-float.out++
deleted file mode 100644
index 45eab221a87..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with long:
-size=8,align=4
-offset-long=0,offset-float=4,
-align-long=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-int.out++
deleted file mode 100644
index e0137d3d225..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with long:
-size=8,align=4
-offset-long=0,offset-int=4,
-align-long=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-long.out++
deleted file mode 100644
index 98b6621d5f0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with long:
-size=8,align=4
-offset-long=0,offset-long=4,
-align-long=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-longdouble.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-longdouble.out+
deleted file mode 100644
index db6934f269a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-longdouble.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting class with long:
-size=32,align=16
-offset-long=0,offset-longdouble=16,
-align-long=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-longlong.out++
deleted file mode 100644
index d63b15f8175..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting class with long:
-size=16,align=8
-offset-long=0,offset-longlong=8,
-align-long=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-pointer.out++
deleted file mode 100644
index 1a80a9ea05e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting class with long:
-size=8,align=4
-offset-long=0,offset-pointer=4,
-align-long=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-short.out++
deleted file mode 100644
index fff8dd6a225..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-1-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with long:
-size=8,align=4
-offset-long=0,offset-short=4,
-align-long=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-char.out++
deleted file mode 100644
index 4e6c5db201c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & char:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=1,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-double.out++
deleted file mode 100644
index e6eaafb31b7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & double:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=4,align-f2=8,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-float.out++
deleted file mode 100644
index b2bb4896448..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & float:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-int.out++
deleted file mode 100644
index c31da054a42..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & int:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-long.out++
deleted file mode 100644
index fb8a80b6b80..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & long:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-longdouble.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-longdouble.out+
deleted file mode 100644
index 92799089f40..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-longdouble.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & longdouble:
-size=48,align=12
-offset-f=0,offset-f2=12,offset-m=36,
-align-f=4,align-f2=16,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-longlong.out++
deleted file mode 100644
index f5ff9e66c5f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & longlong:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=4,align-f2=8,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-pointer.out++
deleted file mode 100644
index 65fd6475bf8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & pointer:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-short.out++
deleted file mode 100644
index 4bf93d27577..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-long-2-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting classes with long & short:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=2,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-char.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-char.out+
deleted file mode 100644
index 8d35c57c24c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-char.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with longdouble:
-size=36,align=12
-offset-longdouble=0,offset-char=24,
-align-longdouble=16,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-float.out
deleted file mode 100644
index d5d0f3881df..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with longdouble:
-size=36,align=12
-offset-longdouble=0,offset-float=24,
-align-longdouble=16,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-int.out++
deleted file mode 100644
index cc8ec4ef3e4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with longdouble:
-size=36,align=12
-offset-longdouble=0,offset-int=24,
-align-longdouble=16,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-long.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-long.out+
deleted file mode 100644
index d8f356b63df..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-long.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with longdouble:
-size=36,align=12
-offset-longdouble=0,offset-long=24,
-align-longdouble=16,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-short.out
deleted file mode 100644
index baf1a591630..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-1-c-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with longdouble:
-size=36,align=12
-offset-longdouble=0,offset-short=24,
-align-longdouble=16,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-char.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-char.out+
deleted file mode 100644
index ece0d2852b6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-char.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting classes with longdouble & char:
-size=64,align=16
-offset-f=0,offset-f2=24,offset-m=48,
-align-f=16,align-f2=1,align-m=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-float.out
deleted file mode 100644
index 222c42811b2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting classes with longdouble & float:
-size=64,align=16
-offset-f=0,offset-f2=24,offset-m=48,
-align-f=16,align-f2=4,align-m=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-int.out++
deleted file mode 100644
index 8b663844114..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting classes with longdouble & int:
-size=64,align=16
-offset-f=0,offset-f2=24,offset-m=48,
-align-f=16,align-f2=4,align-m=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-long.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-long.out+
deleted file mode 100644
index ecfa8c9a358..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-long.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting classes with longdouble & long:
-size=64,align=16
-offset-f=0,offset-f2=24,offset-m=48,
-align-f=16,align-f2=4,align-m=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-short.out
deleted file mode 100644
index c0ca413234a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longdouble-2-c-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting classes with longdouble & short:
-size=64,align=16
-offset-f=0,offset-f2=24,offset-m=48,
-align-f=16,align-f2=2,align-m=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-char.out++
deleted file mode 100644
index 75dcbeab5e3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with longlong:
-size=16,align=8
-offset-longlong=0,offset-char=8,
-align-longlong=8,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-double.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-double.out+
deleted file mode 100644
index 8cc5b775192..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-double.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting class with longlong:
-size=16,align=8
-offset-longlong=0,offset-double=8,
-align-longlong=8,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-float.out++
deleted file mode 100644
index 7a0c08472cd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with longlong:
-size=16,align=8
-offset-longlong=0,offset-float=8,
-align-longlong=8,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-int.out++
deleted file mode 100644
index de4d337f1db..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with longlong:
-size=16,align=8
-offset-longlong=0,offset-int=8,
-align-longlong=8,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-long.out++
deleted file mode 100644
index 1bcc95b661c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with longlong:
-size=16,align=8
-offset-longlong=0,offset-long=8,
-align-longlong=8,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-pointer.out
deleted file mode 100644
index f3174a466a4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting class with longlong:
-size=16,align=8
-offset-longlong=0,offset-pointer=8,
-align-longlong=8,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-short.out++
deleted file mode 100644
index d4bca30ab39..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-1-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with longlong:
-size=16,align=8
-offset-longlong=0,offset-short=8,
-align-longlong=8,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-char.out++
deleted file mode 100644
index 9f9dc2e1772..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting classes with longlong & char:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=1,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-double.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-double.out+
deleted file mode 100644
index 400ac004382..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-double.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting classes with longlong & double:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=8,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-float.out++
deleted file mode 100644
index 3cc998b18ee..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting classes with longlong & float:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=4,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-int.out++
deleted file mode 100644
index 3c483096c85..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting classes with longlong & int:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=4,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-long.out++
deleted file mode 100644
index fc90f855d43..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting classes with longlong & long:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=4,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-pointer.out
deleted file mode 100644
index 99114f0dfe6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting classes with longlong & pointer:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=4,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-short.out++
deleted file mode 100644
index 20070a2aec8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-longlong-2-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting classes with longlong & short:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=8,align-f2=2,align-m=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-char.out++
deleted file mode 100644
index de753c69488..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with pointer:
-size=8,align=4
-offset-pointer=0,offset-char=4,
-align-pointer=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-double.out++
deleted file mode 100644
index 60c7ac08783..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting class with pointer:
-size=16,align=8
-offset-pointer=0,offset-double=8,
-align-pointer=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-float.out++
deleted file mode 100644
index 2a090a8a99e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with pointer:
-size=8,align=4
-offset-pointer=0,offset-float=4,
-align-pointer=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-int.out++
deleted file mode 100644
index 74bf08da014..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with pointer:
-size=8,align=4
-offset-pointer=0,offset-int=4,
-align-pointer=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-long.out++
deleted file mode 100644
index e07b8859dd9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with pointer:
-size=8,align=4
-offset-pointer=0,offset-long=4,
-align-pointer=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-longlong.out
deleted file mode 100644
index 065f7c72972..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting class with pointer:
-size=16,align=8
-offset-pointer=0,offset-longlong=8,
-align-pointer=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-pointer.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-pointer.out+
deleted file mode 100644
index 69a8275d78f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-pointer.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting class with pointer:
-size=8,align=4
-offset-pointer=0,offset-pointer=4,
-align-pointer=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-short.out++
deleted file mode 100644
index 63d74efa05b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-1-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with pointer:
-size=8,align=4
-offset-pointer=0,offset-short=4,
-align-pointer=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-char.out++
deleted file mode 100644
index 4ebd8c6fa3a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting classes with pointer & char:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=1,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-double.out++
deleted file mode 100644
index be43c0a1313..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting classes with pointer & double:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=4,align-f2=8,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-float.out++
deleted file mode 100644
index bacf441f6dd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting classes with pointer & float:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-int.out++
deleted file mode 100644
index 458d98126ff..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting classes with pointer & int:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-long.out++
deleted file mode 100644
index a8ea4e6f090..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting classes with pointer & long:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-longlong.out
deleted file mode 100644
index f0f4916e0c0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting classes with pointer & longlong:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=4,align-f2=8,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-pointer.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-pointer.out+
deleted file mode 100644
index 7d94d8a6eaf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-pointer.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting classes with pointer & pointer:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=4,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-short.out++
deleted file mode 100644
index e4a14d651d5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-pointer-2-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting classes with pointer & short:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=4,align-f2=2,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-char.out++
deleted file mode 100644
index 6669c4460bb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with char inhereting class with short:
-size=4,align=2
-offset-short=0,offset-char=2,
-align-short=2,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-double.out++
deleted file mode 100644
index ff2f9a640b0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with double inhereting class with short:
-size=16,align=8
-offset-short=0,offset-double=8,
-align-short=2,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-float.out++
deleted file mode 100644
index 16f6ec014fc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with float inhereting class with short:
-size=8,align=4
-offset-short=0,offset-float=4,
-align-short=2,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-int.out++
deleted file mode 100644
index b4bcefeccab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with int inhereting class with short:
-size=8,align=4
-offset-short=0,offset-int=4,
-align-short=2,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-long.out++
deleted file mode 100644
index 4d193f54548..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with long inhereting class with short:
-size=8,align=4
-offset-short=0,offset-long=4,
-align-short=2,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-longdouble.out
deleted file mode 100644
index 8dbadaa045b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longdouble inhereting class with short:
-size=32,align=16
-offset-short=0,offset-longdouble=16,
-align-short=2,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-longlong.out++
deleted file mode 100644
index cf43b8bf417..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with longlong inhereting class with short:
-size=16,align=8
-offset-short=0,offset-longlong=8,
-align-short=2,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-pointer.out++
deleted file mode 100644
index f226ea0dec2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with pointer inhereting class with short:
-size=8,align=4
-offset-short=0,offset-pointer=4,
-align-short=2,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-short.out++
deleted file mode 100644
index a5e05329ea1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-1-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting class with short:
-size=4,align=2
-offset-short=0,offset-short=2,
-align-short=2,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-char.out++
deleted file mode 100644
index e5af020db42..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & char:
-size=6,align=2
-offset-f=0,offset-f2=2,offset-m=4,
-align-f=2,align-f2=1,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-double.out++
deleted file mode 100644
index c2dc18fd0e1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & double:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=2,align-f2=8,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-float.out++
deleted file mode 100644
index 3f1deb028d5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & float:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=2,align-f2=4,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-int.out++
deleted file mode 100644
index c6808fc26c3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & int:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=2,align-f2=4,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-long.out++
deleted file mode 100644
index e1cda7d1f82..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & long:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=2,align-f2=4,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-longdouble.out
deleted file mode 100644
index f684c2d3893..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & longdouble:
-size=48,align=12
-offset-f=0,offset-f2=12,offset-m=36,
-align-f=2,align-f2=16,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-longlong.out++
deleted file mode 100644
index 2ea39c5e5c9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & longlong:
-size=24,align=8
-offset-f=0,offset-f2=8,offset-m=16,
-align-f=2,align-f2=8,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-pointer.out++
deleted file mode 100644
index 022eb54448b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & pointer:
-size=12,align=4
-offset-f=0,offset-f2=4,offset-m=8,
-align-f=2,align-f2=4,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-short.out++
deleted file mode 100644
index 1a38ec4e08b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/c-short-2-c-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-++Class with short inhereting classes with short & short:
-size=6,align=2
-offset-f=0,offset-f2=2,offset-m=4,
-align-f=2,align-f2=2,align-m=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-char-and-virtual.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-char-and-virtual.out
deleted file mode 100644
index 8f7fb86dd7c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-char-and-virtual.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Class starting with char and containing virtual function:
-size=8,align=4
-offset-m=0,align-m=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-int-and-virtual.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-int-and-virtual.out+
deleted file mode 100644
index 260e50feda2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-int-and-virtual.out+
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Class starting with int and containing virtual function:
-size=8,align=4
-offset-m=0,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-long-and-virtual.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-long-and-virtual.out
deleted file mode 100644
index beee7a850b3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/class-long-and-virtual.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Class starting with long and containing virtual function:
-size=8,align=4
-offset-m=0,align-m=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/endian.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/endian.out
deleted file mode 100644
index 4bdebc7088f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/endian.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Endian test:
-little endian
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/endian.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/endian.out++
deleted file mode 100644
index 4bdebc7088f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/endian.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Endian test:
-little endian
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-0-5.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-0-5.out
deleted file mode 100644
index e311df177fc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-0-5.out
+++ /dev/null
@@ -1 +0,0 @@
-1f 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-0-5.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-0-5.out++
deleted file mode 100644
index 51c5997a4be..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-0-5.out++
+++ /dev/null
@@ -1 +0,0 @@
-0 0 0 0 0 0 0 0 1f 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-20-17.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-20-17.out
deleted file mode 100644
index 913a56e29c2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-20-17.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ff ff f 0 0 0 0 0
-ff ff f 0 ff ff 1 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-20-17.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-20-17.out++
deleted file mode 100644
index 35ae680963b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-20-17.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0 0 ff ff f 0 0 0 0 0
-0 0 0 0 ff ff f 0 ff ff 1 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-24-24.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-24-24.out
deleted file mode 100644
index 87200474693..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-24-24.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ff ff ff 0 0 0 0 0
-ff ff ff 0 ff ff ff 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-24-24.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-24-24.out++
deleted file mode 100644
index feb871b5b4a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-0-24-24.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0 0 ff ff ff 0 0 0 0 0
-0 0 0 0 ff ff ff 0 ff ff ff 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-21-31.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-21-31.out
deleted file mode 100644
index d0b31c6b827..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-21-31.out
+++ /dev/null
@@ -1,3 +0,0 @@
-1 0 0 0 0 0 0 0
-ff ff 3f 0 0 0 0 0
-ff ff 3f 0 ff ff ff 7f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-21-31.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-21-31.out++
deleted file mode 100644
index d0b31c6b827..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-21-31.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-1 0 0 0 0 0 0 0
-ff ff 3f 0 0 0 0 0
-ff ff 3f 0 ff ff ff 7f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-3-1.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-3-1.out
deleted file mode 100644
index e3e4425b005..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-3-1.out
+++ /dev/null
@@ -1,3 +0,0 @@
-1 0 0 0
-f 0 0 0
-1f 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-3-1.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-3-1.out++
deleted file mode 100644
index e3e4425b005..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-1-3-1.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-1 0 0 0
-f 0 0 0
-1f 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-10-11-10.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-10-11-10.out
deleted file mode 100644
index 37e177809d2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-10-11-10.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3 0 0
-ff ff 1f 0
-ff ff ff 7f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-10-11-10.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-10-11-10.out++
deleted file mode 100644
index 37e177809d2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-10-11-10.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3 0 0
-ff ff 1f 0
-ff ff ff 7f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-11-12-10.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-11-12-10.out
deleted file mode 100644
index c513858f185..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-11-12-10.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 7 0 0 0 0 0 0
-ff ff 7f 0 0 0 0 0
-ff ff 7f 0 ff 3 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-11-12-10.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-11-12-10.out++
deleted file mode 100644
index c513858f185..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-11-12-10.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 7 0 0 0 0 0 0
-ff ff 7f 0 0 0 0 0
-ff ff 7f 0 ff 3 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-22-10.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-22-10.out
deleted file mode 100644
index 94139bf26b1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-22-10.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3f 0 0 0 0 0 0
-ff 3f 0 0 ff ff 3f 0
-ff 3f 0 0 ff ff ff ff
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-22-10.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-22-10.out++
deleted file mode 100644
index 94139bf26b1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-22-10.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3f 0 0 0 0 0 0
-ff 3f 0 0 ff ff 3f 0
-ff 3f 0 0 ff ff ff ff
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-29-30.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-29-30.out
deleted file mode 100644
index 1a730821777..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-29-30.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3f 0 0 0 0 0 0 0 0 0 0
-ff 3f 0 0 ff ff ff 1f 0 0 0 0
-ff 3f 0 0 ff ff ff 1f ff ff ff 3f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-29-30.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-29-30.out++
deleted file mode 100644
index 1a730821777..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-29-30.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3f 0 0 0 0 0 0 0 0 0 0
-ff 3f 0 0 ff ff ff 1f 0 0 0 0
-ff 3f 0 0 ff ff ff 1f ff ff ff 3f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-31-26.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-31-26.out
deleted file mode 100644
index e3ab22c4fea..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-31-26.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3f 0 0 0 0 0 0 0 0 0 0
-ff 3f 0 0 ff ff ff 7f 0 0 0 0
-ff 3f 0 0 ff ff ff 7f ff ff ff 3
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-31-26.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-31-26.out++
deleted file mode 100644
index e3ab22c4fea..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-31-26.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3f 0 0 0 0 0 0 0 0 0 0
-ff 3f 0 0 ff ff ff 7f 0 0 0 0
-ff 3f 0 0 ff ff ff 7f ff ff ff 3
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-8-9.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-8-9.out
deleted file mode 100644
index 14eb1b99dc2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-8-9.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3f 0 0
-ff ff 3f 0
-ff ff ff 7f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-8-9.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-8-9.out++
deleted file mode 100644
index 14eb1b99dc2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-14-8-9.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 3f 0 0
-ff ff 3f 0
-ff ff ff 7f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-15-1-22.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-15-1-22.out
deleted file mode 100644
index 0d46db22a99..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-15-1-22.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 7f 0 0 0 0 0 0
-ff ff 0 0 0 0 0 0
-ff ff 0 0 ff ff 3f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-15-1-22.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-15-1-22.out++
deleted file mode 100644
index 0d46db22a99..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-15-1-22.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff 7f 0 0 0 0 0 0
-ff ff 0 0 0 0 0 0
-ff ff 0 0 ff ff 3f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-16-30-15.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-16-30-15.out
deleted file mode 100644
index 43a62e0fe85..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-16-30-15.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 0 0 0 0 0 0 0 0 0 0
-ff ff 0 0 ff ff ff 3f 0 0 0 0
-ff ff 0 0 ff ff ff 3f ff 7f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-16-30-15.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-16-30-15.out++
deleted file mode 100644
index 43a62e0fe85..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-16-30-15.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 0 0 0 0 0 0 0 0 0 0
-ff ff 0 0 ff ff ff 3f 0 0 0 0
-ff ff 0 0 ff ff ff 3f ff 7f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-2.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-2.out
deleted file mode 100644
index 1fadb0ca91e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-2.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1 0 0 0 0 0
-ff ff 1 0 ff ff 1 0
-ff ff 1 0 ff ff 7 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-2.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-2.out++
deleted file mode 100644
index 1fadb0ca91e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-2.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1 0 0 0 0 0
-ff ff 1 0 ff ff 1 0
-ff ff 1 0 ff ff 7 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-20.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-20.out
deleted file mode 100644
index 05540ef7dfa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-20.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1 0 0 0 0 0 0 0 0 0
-ff ff 1 0 ff ff 1 0 0 0 0 0
-ff ff 1 0 ff ff 1 0 ff ff f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-20.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-20.out++
deleted file mode 100644
index 05540ef7dfa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-17-20.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1 0 0 0 0 0 0 0 0 0
-ff ff 1 0 ff ff 1 0 0 0 0 0
-ff ff 1 0 ff ff 1 0 ff ff f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-21-17.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-21-17.out
deleted file mode 100644
index 68fe8dfbebb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-21-17.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1 0 0 0 0 0 0 0 0 0
-ff ff 1 0 ff ff 1f 0 0 0 0 0
-ff ff 1 0 ff ff 1f 0 ff ff 1 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-21-17.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-21-17.out++
deleted file mode 100644
index 68fe8dfbebb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-17-21-17.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1 0 0 0 0 0 0 0 0 0
-ff ff 1 0 ff ff 1f 0 0 0 0 0
-ff ff 1 0 ff ff 1f 0 ff ff 1 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-15-30.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-15-30.out
deleted file mode 100644
index 3706dd75bf6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-15-30.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3 0 0 0 0 0 0 0 0 0
-ff ff 3 0 ff 7f 0 0 0 0 0 0
-ff ff 3 0 ff 7f 0 0 ff ff ff 3f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-15-30.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-15-30.out++
deleted file mode 100644
index 3706dd75bf6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-15-30.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3 0 0 0 0 0 0 0 0 0
-ff ff 3 0 ff 7f 0 0 0 0 0 0
-ff ff 3 0 ff 7f 0 0 ff ff ff 3f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-0.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-0.out
deleted file mode 100644
index 1723213e3df..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-0.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ff ff 3 0 0 0 0 0
-ff ff 3 0 ff ff ff 3
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-0.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-0.out++
deleted file mode 100644
index b35ea51f1a8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-0.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-ff ff 3 0 0 0 0 0 0 0 0 0
-ff ff 3 0 ff ff ff 3 0 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-11.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-11.out
deleted file mode 100644
index e73cd06a023..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-11.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3 0 0 0 0 0 0 0 0 0
-ff ff 3 0 ff ff ff 3 0 0 0 0
-ff ff 3 0 ff ff ff 3 ff 7 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-11.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-11.out++
deleted file mode 100644
index e73cd06a023..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-26-11.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3 0 0 0 0 0 0 0 0 0
-ff ff 3 0 ff ff ff 3 0 0 0 0
-ff ff 3 0 ff ff ff 3 ff 7 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-4-17.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-4-17.out
deleted file mode 100644
index b34b9d56915..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-4-17.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3 0 0 0 0 0
-ff ff 3f 0 0 0 0 0
-ff ff 3f 0 ff ff 1 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-4-17.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-4-17.out++
deleted file mode 100644
index b34b9d56915..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-4-17.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3 0 0 0 0 0
-ff ff 3f 0 0 0 0 0
-ff ff 3f 0 ff ff 1 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-5-16.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-5-16.out
deleted file mode 100644
index 43d6d15c347..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-5-16.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3 0 0 0 0 0
-ff ff 7f 0 0 0 0 0
-ff ff 7f 0 ff ff 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-5-16.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-5-16.out++
deleted file mode 100644
index 43d6d15c347..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-18-5-16.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3 0 0 0 0 0
-ff ff 7f 0 0 0 0 0
-ff ff 7f 0 ff ff 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-19-6-22.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-19-6-22.out
deleted file mode 100644
index e1e35d6c2e9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-19-6-22.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 7 0 0 0 0 0
-ff ff ff 1 0 0 0 0
-ff ff ff 1 ff ff 3f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-19-6-22.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-19-6-22.out++
deleted file mode 100644
index e1e35d6c2e9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-19-6-22.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 7 0 0 0 0 0
-ff ff ff 1 0 0 0 0
-ff ff ff 1 ff ff 3f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-2-25-27.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-2-25-27.out
deleted file mode 100644
index 197185c670b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-2-25-27.out
+++ /dev/null
@@ -1,3 +0,0 @@
-3 0 0 0 0 0 0 0
-ff ff ff 7 0 0 0 0
-ff ff ff 7 ff ff ff 7
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-2-25-27.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-2-25-27.out++
deleted file mode 100644
index 197185c670b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-2-25-27.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-3 0 0 0 0 0 0 0
-ff ff ff 7 0 0 0 0
-ff ff ff 7 ff ff ff 7
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-19-9.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-19-9.out
deleted file mode 100644
index 44b516d3636..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-19-9.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff f 0 0 0 0 0
-ff ff f 0 ff ff 7 0
-ff ff f 0 ff ff ff f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-19-9.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-19-9.out++
deleted file mode 100644
index 44b516d3636..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-19-9.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff f 0 0 0 0 0
-ff ff f 0 ff ff 7 0
-ff ff f 0 ff ff ff f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-20-15.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-20-15.out
deleted file mode 100644
index 532637d5650..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-20-15.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff f 0 0 0 0 0 0 0 0 0
-ff ff f 0 ff ff f 0 0 0 0 0
-ff ff f 0 ff ff f 0 ff 7f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-20-15.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-20-15.out++
deleted file mode 100644
index 532637d5650..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-20-15.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff f 0 0 0 0 0 0 0 0 0
-ff ff f 0 ff ff f 0 0 0 0 0
-ff ff f 0 ff ff f 0 ff 7f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-26-14.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-26-14.out
deleted file mode 100644
index e1798228006..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-26-14.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff f 0 0 0 0 0 0 0 0 0
-ff ff f 0 ff ff ff 3 0 0 0 0
-ff ff f 0 ff ff ff 3 ff 3f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-26-14.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-26-14.out++
deleted file mode 100644
index e1798228006..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-20-26-14.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff f 0 0 0 0 0 0 0 0 0
-ff ff f 0 ff ff ff 3 0 0 0 0
-ff ff f 0 ff ff ff 3 ff 3f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-16-24.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-16-24.out
deleted file mode 100644
index 61f421cff3e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-16-24.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0 0 0 0 0
-ff ff 1f 0 ff ff 0 0 0 0 0 0
-ff ff 1f 0 ff ff 0 0 ff ff ff 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-16-24.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-16-24.out++
deleted file mode 100644
index 61f421cff3e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-16-24.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0 0 0 0 0
-ff ff 1f 0 ff ff 0 0 0 0 0 0
-ff ff 1f 0 ff ff 0 0 ff ff ff 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-19-4.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-19-4.out
deleted file mode 100644
index 5756b32712e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-19-4.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0
-ff ff 1f 0 ff ff 7 0
-ff ff 1f 0 ff ff 7f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-19-4.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-19-4.out++
deleted file mode 100644
index 5756b32712e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-19-4.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0
-ff ff 1f 0 ff ff 7 0
-ff ff 1f 0 ff ff 7f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-22-1.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-22-1.out
deleted file mode 100644
index 4654dc7a34d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-22-1.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0
-ff ff 1f 0 ff ff 3f 0
-ff ff 1f 0 ff ff 7f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-22-1.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-22-1.out++
deleted file mode 100644
index 4654dc7a34d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-22-1.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0
-ff ff 1f 0 ff ff 3f 0
-ff ff 1f 0 ff ff 7f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-24-20.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-24-20.out
deleted file mode 100644
index d00cb6991f8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-24-20.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0 0 0 0 0
-ff ff 1f 0 ff ff ff 0 0 0 0 0
-ff ff 1f 0 ff ff ff 0 ff ff f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-24-20.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-24-20.out++
deleted file mode 100644
index d00cb6991f8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-24-20.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0 0 0 0 0
-ff ff 1f 0 ff ff ff 0 0 0 0 0
-ff ff 1f 0 ff ff ff 0 ff ff f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-5-26.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-5-26.out
deleted file mode 100644
index 60823841ce4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-5-26.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0
-ff ff ff 3 0 0 0 0
-ff ff ff 3 ff ff ff 3
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-5-26.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-5-26.out++
deleted file mode 100644
index 60823841ce4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-21-5-26.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 1f 0 0 0 0 0
-ff ff ff 3 0 0 0 0
-ff ff ff 3 ff ff ff 3
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-19.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-19.out
deleted file mode 100644
index ebd123c6f25..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-19.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3f 0 0 0 0 0
-ff ff ff 0 0 0 0 0
-ff ff ff 0 ff ff 7 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-19.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-19.out++
deleted file mode 100644
index ebd123c6f25..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-19.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3f 0 0 0 0 0
-ff ff ff 0 0 0 0 0
-ff ff ff 0 ff ff 7 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-28.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-28.out
deleted file mode 100644
index 2941dd64366..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-28.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3f 0 0 0 0 0
-ff ff ff 0 0 0 0 0
-ff ff ff 0 ff ff ff f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-28.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-28.out++
deleted file mode 100644
index 2941dd64366..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-22-2-28.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 3f 0 0 0 0 0
-ff ff ff 0 0 0 0 0
-ff ff ff 0 ff ff ff f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-23-17-8.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-23-17-8.out
deleted file mode 100644
index d992f297dc2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-23-17-8.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 7f 0 0 0 0 0
-ff ff 7f 0 ff ff 1 0
-ff ff 7f 0 ff ff ff 1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-23-17-8.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-23-17-8.out++
deleted file mode 100644
index d992f297dc2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-23-17-8.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff 7f 0 0 0 0 0
-ff ff 7f 0 ff ff 1 0
-ff ff 7f 0 ff ff ff 1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-18-9.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-18-9.out
deleted file mode 100644
index 7b577f42002..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-18-9.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 0 0 0 0 0
-ff ff ff 0 ff ff 3 0
-ff ff ff 0 ff ff ff 7
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-18-9.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-18-9.out++
deleted file mode 100644
index 7b577f42002..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-18-9.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 0 0 0 0 0
-ff ff ff 0 ff ff 3 0
-ff ff ff 0 ff ff ff 7
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-27-8.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-27-8.out
deleted file mode 100644
index b70d5049aea..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-27-8.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 0 0 0 0 0 0 0 0 0
-ff ff ff 0 ff ff ff 7 0 0 0 0
-ff ff ff 0 ff ff ff 7 ff 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-27-8.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-27-8.out++
deleted file mode 100644
index b70d5049aea..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-24-27-8.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 0 0 0 0 0 0 0 0 0
-ff ff ff 0 ff ff ff 7 0 0 0 0
-ff ff ff 0 ff ff ff 7 ff 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-25-6-23.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-25-6-23.out
deleted file mode 100644
index a5acc2a8dd6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-25-6-23.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 1 0 0 0 0
-ff ff ff 7f 0 0 0 0
-ff ff ff 7f ff ff 7f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-25-6-23.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-25-6-23.out++
deleted file mode 100644
index a5acc2a8dd6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-25-6-23.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 1 0 0 0 0
-ff ff ff 7f 0 0 0 0
-ff ff ff 7f ff ff 7f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-26-8-6.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-26-8-6.out
deleted file mode 100644
index 084e8081d71..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-26-8-6.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 3 0 0 0 0
-ff ff ff 3 ff 0 0 0
-ff ff ff 3 ff 3f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-26-8-6.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-26-8-6.out++
deleted file mode 100644
index 084e8081d71..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-26-8-6.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 3 0 0 0 0
-ff ff ff 3 ff 0 0 0
-ff ff ff 3 ff 3f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-27-22-7.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-27-22-7.out
deleted file mode 100644
index a72061762bb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-27-22-7.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 7 0 0 0 0
-ff ff ff 7 ff ff 3f 0
-ff ff ff 7 ff ff ff 1f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-27-22-7.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-27-22-7.out++
deleted file mode 100644
index a72061762bb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-27-22-7.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 7 0 0 0 0
-ff ff ff 7 ff ff 3f 0
-ff ff ff 7 ff ff ff 1f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-16-7.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-16-7.out
deleted file mode 100644
index 54a1beae1a6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-16-7.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 1f 0 0 0 0
-ff ff ff 1f ff ff 0 0
-ff ff ff 1f ff ff 7f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-16-7.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-16-7.out++
deleted file mode 100644
index 54a1beae1a6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-16-7.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 1f 0 0 0 0
-ff ff ff 1f ff ff 0 0
-ff ff ff 1f ff ff 7f 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-4-10.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-4-10.out
deleted file mode 100644
index 6ff7397db5d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-4-10.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 1f 0 0 0 0
-ff ff ff 1f f 0 0 0
-ff ff ff 1f ff 3f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-4-10.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-4-10.out++
deleted file mode 100644
index 6ff7397db5d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-29-4-10.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 1f 0 0 0 0
-ff ff ff 1f f 0 0 0
-ff ff ff 1f ff 3f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-3-7-1.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-3-7-1.out
deleted file mode 100644
index 1e6a828a403..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-3-7-1.out
+++ /dev/null
@@ -1,3 +0,0 @@
-7 0 0 0
-ff 3 0 0
-ff 7 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-3-7-1.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-3-7-1.out++
deleted file mode 100644
index 1e6a828a403..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-3-7-1.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-7 0 0 0
-ff 3 0 0
-ff 7 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-15-26.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-15-26.out
deleted file mode 100644
index aefc07d3581..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-15-26.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 3f 0 0 0 0 0 0 0 0
-ff ff ff 3f ff 7f 0 0 0 0 0 0
-ff ff ff 3f ff 7f 0 0 ff ff ff 3
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-15-26.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-15-26.out++
deleted file mode 100644
index aefc07d3581..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-15-26.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 3f 0 0 0 0 0 0 0 0
-ff ff ff 3f ff 7f 0 0 0 0 0 0
-ff ff ff 3f ff 7f 0 0 ff ff ff 3
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-24-30.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-24-30.out
deleted file mode 100644
index e5e955e1c99..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-24-30.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 3f 0 0 0 0 0 0 0 0
-ff ff ff 3f ff ff ff 0 0 0 0 0
-ff ff ff 3f ff ff ff 0 ff ff ff 3f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-24-30.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-24-30.out++
deleted file mode 100644
index e5e955e1c99..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-30-24-30.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 3f 0 0 0 0 0 0 0 0
-ff ff ff 3f ff ff ff 0 0 0 0 0
-ff ff ff 3f ff ff ff 0 ff ff ff 3f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-28-16.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-28-16.out
deleted file mode 100644
index 936d02286cd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-28-16.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 7f 0 0 0 0 0 0 0 0
-ff ff ff 7f ff ff ff f 0 0 0 0
-ff ff ff 7f ff ff ff f ff ff 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-28-16.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-28-16.out++
deleted file mode 100644
index 936d02286cd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-28-16.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 7f 0 0 0 0 0 0 0 0
-ff ff ff 7f ff ff ff f 0 0 0 0
-ff ff ff 7f ff ff ff f ff ff 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-4-14.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-4-14.out
deleted file mode 100644
index 78bcb76dbb9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-4-14.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 7f 0 0 0 0
-ff ff ff 7f f 0 0 0
-ff ff ff 7f ff ff 3 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-4-14.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-4-14.out++
deleted file mode 100644
index 78bcb76dbb9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-4-14.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-ff ff ff 7f 0 0 0 0
-ff ff ff 7f f 0 0 0
-ff ff ff 7f ff ff 3 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-9-0.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-9-0.out
deleted file mode 100644
index 2d3b99faa9d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-9-0.out
+++ /dev/null
@@ -1,2 +0,0 @@
-ff ff ff 7f 0 0 0 0
-ff ff ff 7f ff 1 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-9-0.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-9-0.out++
deleted file mode 100644
index 5c2bcf816b6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-31-9-0.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-ff ff ff 7f 0 0 0 0 0 0 0 0
-ff ff ff 7f ff 1 0 0 0 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-4-14-29.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-4-14-29.out
deleted file mode 100644
index 92528b5a5e3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-4-14-29.out
+++ /dev/null
@@ -1,3 +0,0 @@
-f 0 0 0 0 0 0 0
-ff ff 3 0 0 0 0 0
-ff ff 3 0 ff ff ff 1f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-4-14-29.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-4-14-29.out++
deleted file mode 100644
index 92528b5a5e3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-4-14-29.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-f 0 0 0 0 0 0 0
-ff ff 3 0 0 0 0 0
-ff ff 3 0 ff ff ff 1f
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-5-23-7.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-5-23-7.out
deleted file mode 100644
index 4abb2340ad4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-5-23-7.out
+++ /dev/null
@@ -1,3 +0,0 @@
-1f 0 0 0 0 0 0 0
-ff ff ff f 0 0 0 0
-ff ff ff f 7f 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-5-23-7.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-5-23-7.out++
deleted file mode 100644
index 4abb2340ad4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-5-23-7.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-1f 0 0 0 0 0 0 0
-ff ff ff f 0 0 0 0
-ff ff ff f 7f 0 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-7-14-12.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-7-14-12.out
deleted file mode 100644
index d0dc11a9eca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-7-14-12.out
+++ /dev/null
@@ -1,3 +0,0 @@
-7f 0 0 0 0 0 0 0
-ff ff 1f 0 0 0 0 0
-ff ff 1f 0 ff f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-7-14-12.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-7-14-12.out++
deleted file mode 100644
index d0dc11a9eca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/f-7-14-12.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-7f 0 0 0 0 0 0 0
-ff ff 1f 0 0 0 0 0
-ff ff 1f 0 ff f 0 0
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-char.out
deleted file mode 100644
index 0156963df79..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with char:
-size=11,align=1
-offset-char=0,offset-arrayof-char=1,
-align-char=1,align-arrayof-char=1
-offset-char-a[5]=6,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-char.out++
deleted file mode 100644
index 0156963df79..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with char:
-size=11,align=1
-offset-char=0,offset-arrayof-char=1,
-align-char=1,align-arrayof-char=1
-offset-char-a[5]=6,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-double.out
deleted file mode 100644
index 1d5f8f76133..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with char:
-size=88,align=8
-offset-char=0,offset-arrayof-double=8,
-align-char=1,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-double.out++
deleted file mode 100644
index 1d5f8f76133..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-double.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with char:
-size=88,align=8
-offset-char=0,offset-arrayof-double=8,
-align-char=1,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-float.out
deleted file mode 100644
index 41462abbc9e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with char:
-size=44,align=4
-offset-char=0,offset-arrayof-float=4,
-align-char=1,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-float.out++
deleted file mode 100644
index 41462abbc9e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with char:
-size=44,align=4
-offset-char=0,offset-arrayof-float=4,
-align-char=1,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-int.out
deleted file mode 100644
index cdfba6c4252..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with char:
-size=44,align=4
-offset-char=0,offset-arrayof-int=4,
-align-char=1,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-int.out++
deleted file mode 100644
index cdfba6c4252..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with char:
-size=44,align=4
-offset-char=0,offset-arrayof-int=4,
-align-char=1,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-long.out
deleted file mode 100644
index 09b945b1c59..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with char:
-size=44,align=4
-offset-char=0,offset-arrayof-long=4,
-align-char=1,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-long.out++
deleted file mode 100644
index 09b945b1c59..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with char:
-size=44,align=4
-offset-char=0,offset-arrayof-long=4,
-align-char=1,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longdouble.out
deleted file mode 100644
index ab5ecc04464..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longdouble.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with char:
-size=176,align=16
-offset-char=0,offset-arrayof-longdouble=16,
-align-char=1,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longdouble.out++
deleted file mode 100644
index ab5ecc04464..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longdouble.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with char:
-size=176,align=16
-offset-char=0,offset-arrayof-longdouble=16,
-align-char=1,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longlong.out
deleted file mode 100644
index 24ea4cb616e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longlong.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with char:
-size=88,align=8
-offset-char=0,offset-arrayof-longlong=8,
-align-char=1,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longlong.out++
deleted file mode 100644
index 24ea4cb616e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-longlong.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with char:
-size=88,align=8
-offset-char=0,offset-arrayof-longlong=8,
-align-char=1,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-pointer.out
deleted file mode 100644
index 583b62ed221..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with char:
-size=44,align=4
-offset-char=0,offset-arrayof-pointer=4,
-align-char=1,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-pointer.out++
deleted file mode 100644
index 583b62ed221..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-pointer.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with char:
-size=44,align=4
-offset-char=0,offset-arrayof-pointer=4,
-align-char=1,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-short.out
deleted file mode 100644
index fb36f80c332..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with char:
-size=22,align=2
-offset-char=0,offset-arrayof-short=2,
-align-char=1,align-arrayof-short=2
-offset-short-a[5]=12,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-short.out++
deleted file mode 100644
index fb36f80c332..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with char:
-size=22,align=2
-offset-char=0,offset-arrayof-short=2,
-align-char=1,align-arrayof-short=2
-offset-short-a[5]=12,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-char.out
deleted file mode 100644
index 730e121d0a8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-char:
-size=2,align=1,offset-char=0,offset-char=1,
-align-char=1,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-char.out++
deleted file mode 100644
index 730e121d0a8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-char:
-size=2,align=1,offset-char=0,offset-char=1,
-align-char=1,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-double.out
deleted file mode 100644
index 9cdd4f0d42d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-double:
-size=16,align=8,offset-char=0,offset-double=8,
-align-char=1,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-double.out++
deleted file mode 100644
index 9cdd4f0d42d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-double:
-size=16,align=8,offset-char=0,offset-double=8,
-align-char=1,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-float.out
deleted file mode 100644
index 68b08badc46..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-float:
-size=8,align=4,offset-char=0,offset-float=4,
-align-char=1,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-float.out++
deleted file mode 100644
index 68b08badc46..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-float:
-size=8,align=4,offset-char=0,offset-float=4,
-align-char=1,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-int.out
deleted file mode 100644
index 5577f36e3eb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-int:
-size=8,align=4,offset-char=0,offset-int=4,
-align-char=1,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-int.out++
deleted file mode 100644
index 5577f36e3eb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-int:
-size=8,align=4,offset-char=0,offset-int=4,
-align-char=1,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-long.out
deleted file mode 100644
index 4baa334e8ec..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-long:
-size=8,align=4,offset-char=0,offset-long=4,
-align-char=1,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-long.out++
deleted file mode 100644
index 4baa334e8ec..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-long:
-size=8,align=4,offset-char=0,offset-long=4,
-align-char=1,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longdouble.out
deleted file mode 100644
index 5afdea73f70..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-longdouble:
-size=32,align=16,offset-char=0,offset-longdouble=16,
-align-char=1,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longdouble.out++
deleted file mode 100644
index 5afdea73f70..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-longdouble:
-size=32,align=16,offset-char=0,offset-longdouble=16,
-align-char=1,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longlong.out
deleted file mode 100644
index 7889b0a7a99..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-longlong:
-size=16,align=8,offset-char=0,offset-longlong=8,
-align-char=1,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longlong.out++
deleted file mode 100644
index 7889b0a7a99..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-longlong:
-size=16,align=8,offset-char=0,offset-longlong=8,
-align-char=1,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-pointer.out
deleted file mode 100644
index 0604e593c6d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-pointer:
-size=8,align=4,offset-char=0,offset-pointer=4,
-align-char=1,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-pointer.out++
deleted file mode 100644
index 0604e593c6d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-pointer:
-size=8,align=4,offset-char=0,offset-pointer=4,
-align-char=1,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-ptrdiff_t.out
deleted file mode 100644
index 32717583b35..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-ptrdiff_t:
-size=8,align=4,offset-char=0,offset-ptrdiff_t=4,
-align-char=1,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-ptrdiff_t.out++
deleted file mode 100644
index 32717583b35..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-ptrdiff_t:
-size=8,align=4,offset-char=0,offset-ptrdiff_t=4,
-align-char=1,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-char.out
deleted file mode 100644
index 8715e52f04a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with char:
-size=2,align=1
-offset-char=0,offset-sss-char=1,
-align-char=1,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-char.out++
deleted file mode 100644
index 8715e52f04a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with char:
-size=2,align=1
-offset-char=0,offset-sss-char=1,
-align-char=1,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-double.out
deleted file mode 100644
index 758b487eb19..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with char:
-size=16,align=8
-offset-char=0,offset-sss-double=8,
-align-char=1,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-double.out++
deleted file mode 100644
index 758b487eb19..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with char:
-size=16,align=8
-offset-char=0,offset-sss-double=8,
-align-char=1,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-float.out
deleted file mode 100644
index 0e4dd7606aa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-sss-float=4,
-align-char=1,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-float.out++
deleted file mode 100644
index 0e4dd7606aa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-sss-float=4,
-align-char=1,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-int.out
deleted file mode 100644
index baace4be3a0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-sss-int=4,
-align-char=1,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-int.out++
deleted file mode 100644
index baace4be3a0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-sss-int=4,
-align-char=1,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-long.out
deleted file mode 100644
index c8b770df262..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-sss-long=4,
-align-char=1,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-long.out++
deleted file mode 100644
index c8b770df262..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-sss-long=4,
-align-char=1,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longdouble.out
deleted file mode 100644
index a1dd34bd1fe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with char:
-size=36,align=12
-offset-char=0,offset-sss-longdouble=12,
-align-char=1,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longdouble.out++
deleted file mode 100644
index a1dd34bd1fe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longdouble.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with char:
-size=36,align=12
-offset-char=0,offset-sss-longdouble=12,
-align-char=1,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longlong.out
deleted file mode 100644
index 81807503794..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with char:
-size=16,align=8
-offset-char=0,offset-sss-longlong=8,
-align-char=1,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longlong.out++
deleted file mode 100644
index 81807503794..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with char:
-size=16,align=8
-offset-char=0,offset-sss-longlong=8,
-align-char=1,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-pointer.out
deleted file mode 100644
index df73376fc0e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-sss-pointer=4,
-align-char=1,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-pointer.out++
deleted file mode 100644
index df73376fc0e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-sss-pointer=4,
-align-char=1,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-short.out
deleted file mode 100644
index d0ebbbeeec7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with char:
-size=4,align=2
-offset-char=0,offset-sss-short=2,
-align-char=1,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-short.out++
deleted file mode 100644
index d0ebbbeeec7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with char:
-size=4,align=2
-offset-char=0,offset-sss-short=2,
-align-char=1,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-short.out
deleted file mode 100644
index 91d9636252a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-short:
-size=4,align=2,offset-char=0,offset-short=2,
-align-char=1,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-short.out++
deleted file mode 100644
index 91d9636252a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-short:
-size=4,align=2,offset-char=0,offset-short=2,
-align-char=1,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-size_t.out
deleted file mode 100644
index b1d189de789..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-size_t:
-size=8,align=4,offset-char=0,offset-size_t=4,
-align-char=1,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-size_t.out++
deleted file mode 100644
index b1d189de789..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-size_t:
-size=8,align=4,offset-char=0,offset-size_t=4,
-align-char=1,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-wchar_t.out
deleted file mode 100644
index bc6d02e3fd0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-wchar_t:
-size=8,align=4,offset-char=0,offset-wchar_t=4,
-align-char=1,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-wchar_t.out++
deleted file mode 100644
index bc6d02e3fd0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct char-wchar_t:
-size=8,align=4,offset-char=0,offset-wchar_t=4,
-align-char=1,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-char.out
deleted file mode 100644
index 6bac81f6812..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-last=4,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-char.out++
deleted file mode 100644
index f898e242b39..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with char:
-size=12,align=4
-offset-char=0,offset-last=8,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-int.out
deleted file mode 100644
index ebd0c0a4ddb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-last=4,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-int.out++
deleted file mode 100644
index f8cd1e04775..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with char:
-size=12,align=4
-offset-char=0,offset-last=8,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-long.out
deleted file mode 100644
index 258aef1e614..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-last=4,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-long.out++
deleted file mode 100644
index 8fae85b1bc8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with char:
-size=12,align=4
-offset-char=0,offset-last=8,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-longlong.out
deleted file mode 100644
index e8b84fba652..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with char:
-size=12,align=4
-offset-char=0,offset-last=8,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-longlong.out++
deleted file mode 100644
index 41d04db05cb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with char:
-size=24,align=8
-offset-char=0,offset-last=16,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-short.out
deleted file mode 100644
index 62deecedff2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with char:
-size=8,align=4
-offset-char=0,offset-last=4,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-short.out++
deleted file mode 100644
index 4f8fcfff30d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-char-zf-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with char:
-size=12,align=4
-offset-char=0,offset-last=8,
-align-char=1,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-char.out
deleted file mode 100644
index f3f46be173f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with double:
-size=24,align=8
-offset-double=0,offset-arrayof-char=8,
-align-double=8,align-arrayof-char=1
-offset-char-a[5]=13,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-char.out++
deleted file mode 100644
index f3f46be173f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with double:
-size=24,align=8
-offset-double=0,offset-arrayof-char=8,
-align-double=8,align-arrayof-char=1
-offset-char-a[5]=13,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-double.out
deleted file mode 100644
index c70fd067854..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with double:
-size=88,align=8
-offset-double=0,offset-arrayof-double=8,
-align-double=8,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-double.out++
deleted file mode 100644
index c70fd067854..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-double.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with double:
-size=88,align=8
-offset-double=0,offset-arrayof-double=8,
-align-double=8,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-float.out
deleted file mode 100644
index 56a0a32a604..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with double:
-size=48,align=8
-offset-double=0,offset-arrayof-float=8,
-align-double=8,align-arrayof-float=4
-offset-float-a[5]=28,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-float.out++
deleted file mode 100644
index 56a0a32a604..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with double:
-size=48,align=8
-offset-double=0,offset-arrayof-float=8,
-align-double=8,align-arrayof-float=4
-offset-float-a[5]=28,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-int.out
deleted file mode 100644
index 7ec4c820bca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with double:
-size=48,align=8
-offset-double=0,offset-arrayof-int=8,
-align-double=8,align-arrayof-int=4
-offset-int-a[5]=28,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-int.out++
deleted file mode 100644
index 7ec4c820bca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with double:
-size=48,align=8
-offset-double=0,offset-arrayof-int=8,
-align-double=8,align-arrayof-int=4
-offset-int-a[5]=28,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-long.out
deleted file mode 100644
index 294825f7404..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with double:
-size=48,align=8
-offset-double=0,offset-arrayof-long=8,
-align-double=8,align-arrayof-long=4
-offset-long-a[5]=28,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-long.out++
deleted file mode 100644
index 294825f7404..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with double:
-size=48,align=8
-offset-double=0,offset-arrayof-long=8,
-align-double=8,align-arrayof-long=4
-offset-long-a[5]=28,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longdouble.out
deleted file mode 100644
index ecfa1a77bd7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longdouble.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with double:
-size=176,align=16
-offset-double=0,offset-arrayof-longdouble=16,
-align-double=8,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longdouble.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longdouble.out+
deleted file mode 100644
index ecfa1a77bd7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longdouble.out+
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with double:
-size=176,align=16
-offset-double=0,offset-arrayof-longdouble=16,
-align-double=8,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longlong.out
deleted file mode 100644
index f8bc3ffd32b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longlong.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with double:
-size=88,align=8
-offset-double=0,offset-arrayof-longlong=8,
-align-double=8,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longlong.out++
deleted file mode 100644
index f8bc3ffd32b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-longlong.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with double:
-size=88,align=8
-offset-double=0,offset-arrayof-longlong=8,
-align-double=8,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-pointer.out
deleted file mode 100644
index c2dc9b018fe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with double:
-size=48,align=8
-offset-double=0,offset-arrayof-pointer=8,
-align-double=8,align-arrayof-pointer=4
-offset-pointer-a[5]=28,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-pointer.out++
deleted file mode 100644
index c2dc9b018fe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-pointer.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with double:
-size=48,align=8
-offset-double=0,offset-arrayof-pointer=8,
-align-double=8,align-arrayof-pointer=4
-offset-pointer-a[5]=28,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-short.out
deleted file mode 100644
index b15ea7ec8cb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with double:
-size=32,align=8
-offset-double=0,offset-arrayof-short=8,
-align-double=8,align-arrayof-short=2
-offset-short-a[5]=18,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-short.out++
deleted file mode 100644
index b15ea7ec8cb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with double:
-size=32,align=8
-offset-double=0,offset-arrayof-short=8,
-align-double=8,align-arrayof-short=2
-offset-short-a[5]=18,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-char.out
deleted file mode 100644
index fdba1431330..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-char:
-size=16,align=8,offset-double=0,offset-char=8,
-align-double=8,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-char.out++
deleted file mode 100644
index fdba1431330..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-char:
-size=16,align=8,offset-double=0,offset-char=8,
-align-double=8,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-double.out
deleted file mode 100644
index f96f0a57289..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-double:
-size=16,align=8,offset-double=0,offset-double=8,
-align-double=8,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-double.out++
deleted file mode 100644
index f96f0a57289..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-double:
-size=16,align=8,offset-double=0,offset-double=8,
-align-double=8,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-float.out
deleted file mode 100644
index fd720db9f7a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-float:
-size=16,align=8,offset-double=0,offset-float=8,
-align-double=8,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-float.out++
deleted file mode 100644
index fd720db9f7a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-float:
-size=16,align=8,offset-double=0,offset-float=8,
-align-double=8,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-int.out
deleted file mode 100644
index dd04254eef6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-int:
-size=16,align=8,offset-double=0,offset-int=8,
-align-double=8,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-int.out++
deleted file mode 100644
index dd04254eef6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-int:
-size=16,align=8,offset-double=0,offset-int=8,
-align-double=8,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-long.out
deleted file mode 100644
index bfc2c9bef70..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-long:
-size=16,align=8,offset-double=0,offset-long=8,
-align-double=8,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-long.out++
deleted file mode 100644
index bfc2c9bef70..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-long:
-size=16,align=8,offset-double=0,offset-long=8,
-align-double=8,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longdouble.out
deleted file mode 100644
index 5d464258304..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-longdouble:
-size=32,align=16,offset-double=0,offset-longdouble=16,
-align-double=8,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longdouble.out++
deleted file mode 100644
index 5d464258304..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-longdouble:
-size=32,align=16,offset-double=0,offset-longdouble=16,
-align-double=8,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longlong.out
deleted file mode 100644
index db0d3b35a60..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-longlong:
-size=16,align=8,offset-double=0,offset-longlong=8,
-align-double=8,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longlong.out++
deleted file mode 100644
index db0d3b35a60..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-longlong:
-size=16,align=8,offset-double=0,offset-longlong=8,
-align-double=8,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-pointer.out
deleted file mode 100644
index d46c4248015..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-pointer:
-size=16,align=8,offset-double=0,offset-pointer=8,
-align-double=8,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-pointer.out++
deleted file mode 100644
index d46c4248015..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-pointer:
-size=16,align=8,offset-double=0,offset-pointer=8,
-align-double=8,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-ptrdiff_t.out
deleted file mode 100644
index 194e2a56d35..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-ptrdiff_t:
-size=16,align=8,offset-double=0,offset-ptrdiff_t=8,
-align-double=8,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-ptrdiff_t.out++
deleted file mode 100644
index 194e2a56d35..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-ptrdiff_t:
-size=16,align=8,offset-double=0,offset-ptrdiff_t=8,
-align-double=8,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-char.out
deleted file mode 100644
index c05a7a0c921..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-char=8,
-align-double=8,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-char.out++
deleted file mode 100644
index c05a7a0c921..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-char=8,
-align-double=8,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-double.out
deleted file mode 100644
index e894ee31f82..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-double=8,
-align-double=8,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-double.out++
deleted file mode 100644
index e894ee31f82..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-double=8,
-align-double=8,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-float.out
deleted file mode 100644
index a8940a2f2f3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-float=8,
-align-double=8,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-float.out++
deleted file mode 100644
index a8940a2f2f3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-float=8,
-align-double=8,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-int.out
deleted file mode 100644
index e45627bb0ad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-int=8,
-align-double=8,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-int.out++
deleted file mode 100644
index e45627bb0ad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-int=8,
-align-double=8,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-long.out
deleted file mode 100644
index 1559ea97408..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-long=8,
-align-double=8,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-long.out++
deleted file mode 100644
index 1559ea97408..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-long=8,
-align-double=8,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longdouble.out
deleted file mode 100644
index 25df8d650a7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with double:
-size=36,align=12
-offset-double=0,offset-sss-longdouble=12,
-align-double=8,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longdouble.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longdouble.out+
deleted file mode 100644
index 25df8d650a7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longdouble.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with double:
-size=36,align=12
-offset-double=0,offset-sss-longdouble=12,
-align-double=8,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longlong.out
deleted file mode 100644
index e1264544ac3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-longlong=8,
-align-double=8,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longlong.out++
deleted file mode 100644
index e1264544ac3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-longlong=8,
-align-double=8,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-pointer.out
deleted file mode 100644
index 6b317419c28..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-pointer=8,
-align-double=8,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-pointer.out++
deleted file mode 100644
index 6b317419c28..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-pointer=8,
-align-double=8,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-short.out
deleted file mode 100644
index da28384cd51..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-short=8,
-align-double=8,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-short.out++
deleted file mode 100644
index da28384cd51..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-sss-short=8,
-align-double=8,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-short.out
deleted file mode 100644
index 67949f6ee65..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-short:
-size=16,align=8,offset-double=0,offset-short=8,
-align-double=8,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-short.out++
deleted file mode 100644
index 67949f6ee65..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-short:
-size=16,align=8,offset-double=0,offset-short=8,
-align-double=8,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-size_t.out
deleted file mode 100644
index 8f9ddebe858..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-size_t:
-size=16,align=8,offset-double=0,offset-size_t=8,
-align-double=8,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-size_t.out++
deleted file mode 100644
index 8f9ddebe858..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-size_t:
-size=16,align=8,offset-double=0,offset-size_t=8,
-align-double=8,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-wchar_t.out
deleted file mode 100644
index 2a50490968f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-wchar_t:
-size=16,align=8,offset-double=0,offset-wchar_t=8,
-align-double=8,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-wchar_t.out++
deleted file mode 100644
index 2a50490968f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct double-wchar_t:
-size=16,align=8,offset-double=0,offset-wchar_t=8,
-align-double=8,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-char.out
deleted file mode 100644
index 5afda573366..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=8,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-char.out++
deleted file mode 100644
index c34d6ef68ff..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=12,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-int.out
deleted file mode 100644
index c01621e020f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=8,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-int.out++
deleted file mode 100644
index 2169442de90..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=12,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-long.out
deleted file mode 100644
index c72dc4fd6e0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=8,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-long.out++
deleted file mode 100644
index 3deb48d319c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=12,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-longlong.out
deleted file mode 100644
index bc7026ff464..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=8,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-longlong.out++
deleted file mode 100644
index 8d1a3cd1fda..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with double:
-size=24,align=8
-offset-double=0,offset-last=16,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-short.out
deleted file mode 100644
index 0222cafbd7e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=8,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-short.out++
deleted file mode 100644
index e2ed5fc469c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-double-zf-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with double:
-size=16,align=8
-offset-double=0,offset-last=12,
-align-double=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-char.out
deleted file mode 100644
index 5003486aa86..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with float:
-size=16,align=4
-offset-float=0,offset-arrayof-char=4,
-align-float=4,align-arrayof-char=1
-offset-char-a[5]=9,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-char.out++
deleted file mode 100644
index 5003486aa86..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with float:
-size=16,align=4
-offset-float=0,offset-arrayof-char=4,
-align-float=4,align-arrayof-char=1
-offset-char-a[5]=9,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-double.out
deleted file mode 100644
index 979a3de5960..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with float:
-size=88,align=8
-offset-float=0,offset-arrayof-double=8,
-align-float=4,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-double.out++
deleted file mode 100644
index 979a3de5960..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-double.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with float:
-size=88,align=8
-offset-float=0,offset-arrayof-double=8,
-align-float=4,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-float.out
deleted file mode 100644
index ceeae05fe0e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with float:
-size=44,align=4
-offset-float=0,offset-arrayof-float=4,
-align-float=4,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-float.out++
deleted file mode 100644
index ceeae05fe0e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with float:
-size=44,align=4
-offset-float=0,offset-arrayof-float=4,
-align-float=4,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-int.out
deleted file mode 100644
index 0d13416ba79..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with float:
-size=44,align=4
-offset-float=0,offset-arrayof-int=4,
-align-float=4,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-int.out++
deleted file mode 100644
index 0d13416ba79..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with float:
-size=44,align=4
-offset-float=0,offset-arrayof-int=4,
-align-float=4,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-long.out
deleted file mode 100644
index 797132b8bad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with float:
-size=44,align=4
-offset-float=0,offset-arrayof-long=4,
-align-float=4,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-long.out++
deleted file mode 100644
index 797132b8bad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with float:
-size=44,align=4
-offset-float=0,offset-arrayof-long=4,
-align-float=4,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longdouble.out
deleted file mode 100644
index df65c73ef87..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longdouble.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with float:
-size=176,align=16
-offset-float=0,offset-arrayof-longdouble=16,
-align-float=4,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longdouble.out++
deleted file mode 100644
index df65c73ef87..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longdouble.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with float:
-size=176,align=16
-offset-float=0,offset-arrayof-longdouble=16,
-align-float=4,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longlong.out
deleted file mode 100644
index 06b0d22e72d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longlong.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with float:
-size=88,align=8
-offset-float=0,offset-arrayof-longlong=8,
-align-float=4,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longlong.out++
deleted file mode 100644
index 06b0d22e72d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-longlong.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with float:
-size=88,align=8
-offset-float=0,offset-arrayof-longlong=8,
-align-float=4,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-pointer.out
deleted file mode 100644
index da9f42237b6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with float:
-size=44,align=4
-offset-float=0,offset-arrayof-pointer=4,
-align-float=4,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-pointer.out++
deleted file mode 100644
index da9f42237b6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-pointer.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with float:
-size=44,align=4
-offset-float=0,offset-arrayof-pointer=4,
-align-float=4,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-short.out
deleted file mode 100644
index e3e8b58b5ee..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with float:
-size=24,align=4
-offset-float=0,offset-arrayof-short=4,
-align-float=4,align-arrayof-short=2
-offset-short-a[5]=14,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-short.out++
deleted file mode 100644
index e3e8b58b5ee..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with float:
-size=24,align=4
-offset-float=0,offset-arrayof-short=4,
-align-float=4,align-arrayof-short=2
-offset-short-a[5]=14,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-char.out
deleted file mode 100644
index 8427debf4ab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-char:
-size=8,align=4,offset-float=0,offset-char=4,
-align-float=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-char.out++
deleted file mode 100644
index 8427debf4ab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-char:
-size=8,align=4,offset-float=0,offset-char=4,
-align-float=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-double.out
deleted file mode 100644
index 9a9a5298acd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-double:
-size=16,align=8,offset-float=0,offset-double=8,
-align-float=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-double.out++
deleted file mode 100644
index 9a9a5298acd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-double:
-size=16,align=8,offset-float=0,offset-double=8,
-align-float=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-float.out
deleted file mode 100644
index 54a99653c7d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-float:
-size=8,align=4,offset-float=0,offset-float=4,
-align-float=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-float.out++
deleted file mode 100644
index 54a99653c7d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-float:
-size=8,align=4,offset-float=0,offset-float=4,
-align-float=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-int.out
deleted file mode 100644
index 700a6089cb2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-int:
-size=8,align=4,offset-float=0,offset-int=4,
-align-float=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-int.out++
deleted file mode 100644
index 700a6089cb2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-int:
-size=8,align=4,offset-float=0,offset-int=4,
-align-float=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-long.out
deleted file mode 100644
index 4b7eb3c161b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-long:
-size=8,align=4,offset-float=0,offset-long=4,
-align-float=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-long.out++
deleted file mode 100644
index 4b7eb3c161b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-long:
-size=8,align=4,offset-float=0,offset-long=4,
-align-float=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longdouble.out
deleted file mode 100644
index 1b1d6ba2806..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-longdouble:
-size=32,align=16,offset-float=0,offset-longdouble=16,
-align-float=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longdouble.out++
deleted file mode 100644
index 1b1d6ba2806..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-longdouble:
-size=32,align=16,offset-float=0,offset-longdouble=16,
-align-float=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longlong.out
deleted file mode 100644
index 3979a8334d1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-longlong:
-size=16,align=8,offset-float=0,offset-longlong=8,
-align-float=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longlong.out++
deleted file mode 100644
index 3979a8334d1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-longlong:
-size=16,align=8,offset-float=0,offset-longlong=8,
-align-float=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-pointer.out
deleted file mode 100644
index a428e70bd0b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-pointer:
-size=8,align=4,offset-float=0,offset-pointer=4,
-align-float=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-pointer.out++
deleted file mode 100644
index a428e70bd0b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-pointer:
-size=8,align=4,offset-float=0,offset-pointer=4,
-align-float=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-ptrdiff_t.out
deleted file mode 100644
index 65797899d11..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-ptrdiff_t:
-size=8,align=4,offset-float=0,offset-ptrdiff_t=4,
-align-float=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-ptrdiff_t.out++
deleted file mode 100644
index 65797899d11..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-ptrdiff_t:
-size=8,align=4,offset-float=0,offset-ptrdiff_t=4,
-align-float=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-char.out
deleted file mode 100644
index 7a477ba6cc0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-char=4,
-align-float=4,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-char.out++
deleted file mode 100644
index 7a477ba6cc0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-char=4,
-align-float=4,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-double.out
deleted file mode 100644
index 49c9d54a7e0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with float:
-size=16,align=8
-offset-float=0,offset-sss-double=8,
-align-float=4,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-double.out++
deleted file mode 100644
index 49c9d54a7e0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with float:
-size=16,align=8
-offset-float=0,offset-sss-double=8,
-align-float=4,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-float.out
deleted file mode 100644
index 003af393237..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-float=4,
-align-float=4,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-float.out++
deleted file mode 100644
index 003af393237..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-float=4,
-align-float=4,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-int.out
deleted file mode 100644
index d69245b16ff..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-int=4,
-align-float=4,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-int.out++
deleted file mode 100644
index d69245b16ff..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-int=4,
-align-float=4,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-long.out
deleted file mode 100644
index fd35909aee6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-long=4,
-align-float=4,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-long.out++
deleted file mode 100644
index fd35909aee6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-long=4,
-align-float=4,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longdouble.out
deleted file mode 100644
index e52194ddbb4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with float:
-size=36,align=12
-offset-float=0,offset-sss-longdouble=12,
-align-float=4,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longdouble.out++
deleted file mode 100644
index e52194ddbb4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longdouble.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with float:
-size=36,align=12
-offset-float=0,offset-sss-longdouble=12,
-align-float=4,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longlong.out
deleted file mode 100644
index 14adb6074ce..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with float:
-size=16,align=8
-offset-float=0,offset-sss-longlong=8,
-align-float=4,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longlong.out++
deleted file mode 100644
index 14adb6074ce..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with float:
-size=16,align=8
-offset-float=0,offset-sss-longlong=8,
-align-float=4,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-pointer.out
deleted file mode 100644
index 021a39c533a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-pointer=4,
-align-float=4,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-pointer.out++
deleted file mode 100644
index 021a39c533a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-pointer=4,
-align-float=4,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-short.out
deleted file mode 100644
index 6f7d0739ef3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-short=4,
-align-float=4,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-short.out++
deleted file mode 100644
index 6f7d0739ef3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-sss-short=4,
-align-float=4,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-short.out
deleted file mode 100644
index b91cba76abe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-short:
-size=8,align=4,offset-float=0,offset-short=4,
-align-float=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-short.out++
deleted file mode 100644
index b91cba76abe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-short:
-size=8,align=4,offset-float=0,offset-short=4,
-align-float=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-size_t.out
deleted file mode 100644
index 1242654f96c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-size_t:
-size=8,align=4,offset-float=0,offset-size_t=4,
-align-float=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-size_t.out++
deleted file mode 100644
index 1242654f96c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-size_t:
-size=8,align=4,offset-float=0,offset-size_t=4,
-align-float=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-wchar_t.out
deleted file mode 100644
index be6756250ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-wchar_t:
-size=8,align=4,offset-float=0,offset-wchar_t=4,
-align-float=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-wchar_t.out++
deleted file mode 100644
index be6756250ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct float-wchar_t:
-size=8,align=4,offset-float=0,offset-wchar_t=4,
-align-float=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-char.out
deleted file mode 100644
index 7efe6a02025..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-last=4,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-char.out++
deleted file mode 100644
index 3e8ae81a9f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with float:
-size=12,align=4
-offset-float=0,offset-last=8,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-int.out
deleted file mode 100644
index 2926000efed..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-last=4,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-int.out++
deleted file mode 100644
index 84a6ec1993d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with float:
-size=12,align=4
-offset-float=0,offset-last=8,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-long.out
deleted file mode 100644
index 395499c58c0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-last=4,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-long.out++
deleted file mode 100644
index 9c1ed591b2a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with float:
-size=12,align=4
-offset-float=0,offset-last=8,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-longlong.out
deleted file mode 100644
index 2c9be84b76a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with float:
-size=12,align=4
-offset-float=0,offset-last=8,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-longlong.out++
deleted file mode 100644
index 16481db3a79..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with float:
-size=24,align=8
-offset-float=0,offset-last=16,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-short.out
deleted file mode 100644
index 651ae66f7a3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with float:
-size=8,align=4
-offset-float=0,offset-last=4,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-short.out++
deleted file mode 100644
index e4fe3c6cc34..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-float-zf-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with float:
-size=12,align=4
-offset-float=0,offset-last=8,
-align-float=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-char.out
deleted file mode 100644
index be6590b22ba..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with int:
-size=16,align=4
-offset-int=0,offset-arrayof-char=4,
-align-int=4,align-arrayof-char=1
-offset-char-a[5]=9,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-char.out++
deleted file mode 100644
index be6590b22ba..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with int:
-size=16,align=4
-offset-int=0,offset-arrayof-char=4,
-align-int=4,align-arrayof-char=1
-offset-char-a[5]=9,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-double.out
deleted file mode 100644
index c57194513bd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with int:
-size=88,align=8
-offset-int=0,offset-arrayof-double=8,
-align-int=4,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-double.out++
deleted file mode 100644
index c57194513bd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-double.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with int:
-size=88,align=8
-offset-int=0,offset-arrayof-double=8,
-align-int=4,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-float.out
deleted file mode 100644
index c23cc89e606..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with int:
-size=44,align=4
-offset-int=0,offset-arrayof-float=4,
-align-int=4,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-float.out++
deleted file mode 100644
index c23cc89e606..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with int:
-size=44,align=4
-offset-int=0,offset-arrayof-float=4,
-align-int=4,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-int.out
deleted file mode 100644
index 106f11aa9fb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with int:
-size=44,align=4
-offset-int=0,offset-arrayof-int=4,
-align-int=4,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-int.out++
deleted file mode 100644
index 106f11aa9fb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with int:
-size=44,align=4
-offset-int=0,offset-arrayof-int=4,
-align-int=4,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-long.out
deleted file mode 100644
index 1b4b15afb64..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with int:
-size=44,align=4
-offset-int=0,offset-arrayof-long=4,
-align-int=4,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-long.out++
deleted file mode 100644
index 1b4b15afb64..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with int:
-size=44,align=4
-offset-int=0,offset-arrayof-long=4,
-align-int=4,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longdouble.out
deleted file mode 100644
index 4f38f73aab1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longdouble.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with int:
-size=176,align=16
-offset-int=0,offset-arrayof-longdouble=16,
-align-int=4,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longdouble.out++
deleted file mode 100644
index 4f38f73aab1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longdouble.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with int:
-size=176,align=16
-offset-int=0,offset-arrayof-longdouble=16,
-align-int=4,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longlong.out
deleted file mode 100644
index fd2546bb8a9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longlong.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with int:
-size=88,align=8
-offset-int=0,offset-arrayof-longlong=8,
-align-int=4,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longlong.out++
deleted file mode 100644
index fd2546bb8a9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-longlong.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with int:
-size=88,align=8
-offset-int=0,offset-arrayof-longlong=8,
-align-int=4,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-pointer.out
deleted file mode 100644
index 5fd6091633f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with int:
-size=44,align=4
-offset-int=0,offset-arrayof-pointer=4,
-align-int=4,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-pointer.out++
deleted file mode 100644
index 5fd6091633f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-pointer.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with int:
-size=44,align=4
-offset-int=0,offset-arrayof-pointer=4,
-align-int=4,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-short.out
deleted file mode 100644
index 25408a8690f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with int:
-size=24,align=4
-offset-int=0,offset-arrayof-short=4,
-align-int=4,align-arrayof-short=2
-offset-short-a[5]=14,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-short.out++
deleted file mode 100644
index 25408a8690f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with int:
-size=24,align=4
-offset-int=0,offset-arrayof-short=4,
-align-int=4,align-arrayof-short=2
-offset-short-a[5]=14,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-char.out
deleted file mode 100644
index efe70786726..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-char:
-size=8,align=4,offset-int=0,offset-char=4,
-align-int=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-char.out++
deleted file mode 100644
index efe70786726..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-char:
-size=8,align=4,offset-int=0,offset-char=4,
-align-int=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-double.out
deleted file mode 100644
index 78e56def727..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-double:
-size=16,align=8,offset-int=0,offset-double=8,
-align-int=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-double.out++
deleted file mode 100644
index 78e56def727..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-double:
-size=16,align=8,offset-int=0,offset-double=8,
-align-int=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-float.out
deleted file mode 100644
index 923df032399..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-float:
-size=8,align=4,offset-int=0,offset-float=4,
-align-int=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-float.out++
deleted file mode 100644
index 923df032399..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-float:
-size=8,align=4,offset-int=0,offset-float=4,
-align-int=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-int.out
deleted file mode 100644
index 655f99bf2ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-int:
-size=8,align=4,offset-int=0,offset-int=4,
-align-int=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-int.out++
deleted file mode 100644
index 655f99bf2ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-int:
-size=8,align=4,offset-int=0,offset-int=4,
-align-int=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-long.out
deleted file mode 100644
index 86cee27b476..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-long:
-size=8,align=4,offset-int=0,offset-long=4,
-align-int=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-long.out++
deleted file mode 100644
index 86cee27b476..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-long:
-size=8,align=4,offset-int=0,offset-long=4,
-align-int=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longdouble.out
deleted file mode 100644
index 67f563c7c66..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-longdouble:
-size=32,align=16,offset-int=0,offset-longdouble=16,
-align-int=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longdouble.out++
deleted file mode 100644
index 67f563c7c66..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-longdouble:
-size=32,align=16,offset-int=0,offset-longdouble=16,
-align-int=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longlong.out
deleted file mode 100644
index 9fb8af1482c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-longlong:
-size=16,align=8,offset-int=0,offset-longlong=8,
-align-int=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longlong.out++
deleted file mode 100644
index 9fb8af1482c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-longlong:
-size=16,align=8,offset-int=0,offset-longlong=8,
-align-int=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-pointer.out
deleted file mode 100644
index 50028ecd8dc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-pointer:
-size=8,align=4,offset-int=0,offset-pointer=4,
-align-int=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-pointer.out++
deleted file mode 100644
index 50028ecd8dc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-pointer:
-size=8,align=4,offset-int=0,offset-pointer=4,
-align-int=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-ptrdiff_t.out
deleted file mode 100644
index cd4371cbba2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-ptrdiff_t:
-size=8,align=4,offset-int=0,offset-ptrdiff_t=4,
-align-int=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-ptrdiff_t.out++
deleted file mode 100644
index cd4371cbba2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-ptrdiff_t:
-size=8,align=4,offset-int=0,offset-ptrdiff_t=4,
-align-int=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-char.out
deleted file mode 100644
index ee7168e9a63..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-char=4,
-align-int=4,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-char.out++
deleted file mode 100644
index ee7168e9a63..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-char=4,
-align-int=4,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-double.out
deleted file mode 100644
index af30215ff11..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with int:
-size=16,align=8
-offset-int=0,offset-sss-double=8,
-align-int=4,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-double.out++
deleted file mode 100644
index af30215ff11..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with int:
-size=16,align=8
-offset-int=0,offset-sss-double=8,
-align-int=4,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-float.out
deleted file mode 100644
index 4a19bd0160c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-float=4,
-align-int=4,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-float.out++
deleted file mode 100644
index 4a19bd0160c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-float=4,
-align-int=4,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-int.out
deleted file mode 100644
index c7159ed55ea..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-int=4,
-align-int=4,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-int.out++
deleted file mode 100644
index c7159ed55ea..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-int=4,
-align-int=4,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-long.out
deleted file mode 100644
index 87f80a5c826..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-long=4,
-align-int=4,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-long.out++
deleted file mode 100644
index 87f80a5c826..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-long=4,
-align-int=4,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longdouble.out
deleted file mode 100644
index 8a78f58c75d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with int:
-size=36,align=12
-offset-int=0,offset-sss-longdouble=12,
-align-int=4,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longdouble.out++
deleted file mode 100644
index 8a78f58c75d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longdouble.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with int:
-size=36,align=12
-offset-int=0,offset-sss-longdouble=12,
-align-int=4,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longlong.out
deleted file mode 100644
index c44774169b4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with int:
-size=16,align=8
-offset-int=0,offset-sss-longlong=8,
-align-int=4,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longlong.out++
deleted file mode 100644
index c44774169b4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with int:
-size=16,align=8
-offset-int=0,offset-sss-longlong=8,
-align-int=4,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-pointer.out
deleted file mode 100644
index 7c9e63cad12..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-pointer=4,
-align-int=4,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-pointer.out++
deleted file mode 100644
index 7c9e63cad12..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-pointer=4,
-align-int=4,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-short.out
deleted file mode 100644
index 2db671e55ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-short=4,
-align-int=4,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-short.out++
deleted file mode 100644
index 2db671e55ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-sss-short=4,
-align-int=4,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-short.out
deleted file mode 100644
index 4fb12c14a6e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-short:
-size=8,align=4,offset-int=0,offset-short=4,
-align-int=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-short.out++
deleted file mode 100644
index 4fb12c14a6e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-short:
-size=8,align=4,offset-int=0,offset-short=4,
-align-int=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-size_t.out
deleted file mode 100644
index aa3eb866b70..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-size_t:
-size=8,align=4,offset-int=0,offset-size_t=4,
-align-int=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-size_t.out++
deleted file mode 100644
index aa3eb866b70..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-size_t:
-size=8,align=4,offset-int=0,offset-size_t=4,
-align-int=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-wchar_t.out
deleted file mode 100644
index e63ba95d04b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-wchar_t:
-size=8,align=4,offset-int=0,offset-wchar_t=4,
-align-int=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-wchar_t.out++
deleted file mode 100644
index e63ba95d04b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct int-wchar_t:
-size=8,align=4,offset-int=0,offset-wchar_t=4,
-align-int=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-char.out
deleted file mode 100644
index cf6fe570272..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-last=4,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-char.out++
deleted file mode 100644
index fc9d98a129d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with int:
-size=12,align=4
-offset-int=0,offset-last=8,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-int.out
deleted file mode 100644
index 973defde7fe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-last=4,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-int.out++
deleted file mode 100644
index f623dccbc61..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with int:
-size=12,align=4
-offset-int=0,offset-last=8,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-long.out
deleted file mode 100644
index 7c2a90c2e9f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-last=4,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-long.out++
deleted file mode 100644
index 0d40e9ebaf2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with int:
-size=12,align=4
-offset-int=0,offset-last=8,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-longlong.out
deleted file mode 100644
index 6d3d432499f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with int:
-size=12,align=4
-offset-int=0,offset-last=8,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-longlong.out++
deleted file mode 100644
index ac69cc6f1e2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with int:
-size=24,align=8
-offset-int=0,offset-last=16,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-short.out
deleted file mode 100644
index 77593b00f4c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with int:
-size=8,align=4
-offset-int=0,offset-last=4,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-short.out++
deleted file mode 100644
index 4bf33afe159..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-int-zf-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with int:
-size=12,align=4
-offset-int=0,offset-last=8,
-align-int=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-char.out
deleted file mode 100644
index b79ba08e92d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with long:
-size=16,align=4
-offset-long=0,offset-arrayof-char=4,
-align-long=4,align-arrayof-char=1
-offset-char-a[5]=9,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-char.out++
deleted file mode 100644
index b79ba08e92d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with long:
-size=16,align=4
-offset-long=0,offset-arrayof-char=4,
-align-long=4,align-arrayof-char=1
-offset-char-a[5]=9,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-double.out
deleted file mode 100644
index daccb9b5fca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with long:
-size=88,align=8
-offset-long=0,offset-arrayof-double=8,
-align-long=4,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-double.out++
deleted file mode 100644
index daccb9b5fca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-double.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with long:
-size=88,align=8
-offset-long=0,offset-arrayof-double=8,
-align-long=4,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-float.out
deleted file mode 100644
index 38aec4e8408..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with long:
-size=44,align=4
-offset-long=0,offset-arrayof-float=4,
-align-long=4,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-float.out++
deleted file mode 100644
index 38aec4e8408..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with long:
-size=44,align=4
-offset-long=0,offset-arrayof-float=4,
-align-long=4,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-int.out
deleted file mode 100644
index 68f1ec0bd4e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with long:
-size=44,align=4
-offset-long=0,offset-arrayof-int=4,
-align-long=4,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-int.out++
deleted file mode 100644
index 68f1ec0bd4e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with long:
-size=44,align=4
-offset-long=0,offset-arrayof-int=4,
-align-long=4,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-long.out
deleted file mode 100644
index 7821c6e883f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with long:
-size=44,align=4
-offset-long=0,offset-arrayof-long=4,
-align-long=4,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-long.out++
deleted file mode 100644
index 7821c6e883f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with long:
-size=44,align=4
-offset-long=0,offset-arrayof-long=4,
-align-long=4,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longdouble.out
deleted file mode 100644
index 7a2c468e592..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longdouble.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with long:
-size=176,align=16
-offset-long=0,offset-arrayof-longdouble=16,
-align-long=4,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longdouble.out++
deleted file mode 100644
index 7a2c468e592..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longdouble.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with long:
-size=176,align=16
-offset-long=0,offset-arrayof-longdouble=16,
-align-long=4,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longlong.out
deleted file mode 100644
index 9d65c939055..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longlong.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with long:
-size=88,align=8
-offset-long=0,offset-arrayof-longlong=8,
-align-long=4,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longlong.out++
deleted file mode 100644
index 9d65c939055..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-longlong.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with long:
-size=88,align=8
-offset-long=0,offset-arrayof-longlong=8,
-align-long=4,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-pointer.out
deleted file mode 100644
index 77604ed728f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with long:
-size=44,align=4
-offset-long=0,offset-arrayof-pointer=4,
-align-long=4,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-pointer.out++
deleted file mode 100644
index 77604ed728f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-pointer.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with long:
-size=44,align=4
-offset-long=0,offset-arrayof-pointer=4,
-align-long=4,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-short.out
deleted file mode 100644
index e4a160297fc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with long:
-size=24,align=4
-offset-long=0,offset-arrayof-short=4,
-align-long=4,align-arrayof-short=2
-offset-short-a[5]=14,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-short.out++
deleted file mode 100644
index e4a160297fc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with long:
-size=24,align=4
-offset-long=0,offset-arrayof-short=4,
-align-long=4,align-arrayof-short=2
-offset-short-a[5]=14,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-char.out
deleted file mode 100644
index 0254223eb35..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-char:
-size=8,align=4,offset-long=0,offset-char=4,
-align-long=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-char.out++
deleted file mode 100644
index 0254223eb35..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-char:
-size=8,align=4,offset-long=0,offset-char=4,
-align-long=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-double.out
deleted file mode 100644
index 4ef1119fec4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-double:
-size=16,align=8,offset-long=0,offset-double=8,
-align-long=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-double.out++
deleted file mode 100644
index 4ef1119fec4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-double:
-size=16,align=8,offset-long=0,offset-double=8,
-align-long=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-float.out
deleted file mode 100644
index 54fd39b7dd4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-float:
-size=8,align=4,offset-long=0,offset-float=4,
-align-long=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-float.out++
deleted file mode 100644
index 54fd39b7dd4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-float:
-size=8,align=4,offset-long=0,offset-float=4,
-align-long=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-int.out
deleted file mode 100644
index c383bd77613..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-int:
-size=8,align=4,offset-long=0,offset-int=4,
-align-long=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-int.out++
deleted file mode 100644
index c383bd77613..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-int:
-size=8,align=4,offset-long=0,offset-int=4,
-align-long=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-long.out
deleted file mode 100644
index 2058ec52edb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-long:
-size=8,align=4,offset-long=0,offset-long=4,
-align-long=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-long.out++
deleted file mode 100644
index 2058ec52edb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-long:
-size=8,align=4,offset-long=0,offset-long=4,
-align-long=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longdouble.out
deleted file mode 100644
index 0269ff25d59..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-longdouble:
-size=32,align=16,offset-long=0,offset-longdouble=16,
-align-long=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longdouble.out++
deleted file mode 100644
index 0269ff25d59..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-longdouble:
-size=32,align=16,offset-long=0,offset-longdouble=16,
-align-long=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longlong.out
deleted file mode 100644
index 65b4e989e4a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-longlong:
-size=16,align=8,offset-long=0,offset-longlong=8,
-align-long=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longlong.out++
deleted file mode 100644
index 65b4e989e4a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-longlong:
-size=16,align=8,offset-long=0,offset-longlong=8,
-align-long=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-pointer.out
deleted file mode 100644
index 0c7de0cc623..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-pointer:
-size=8,align=4,offset-long=0,offset-pointer=4,
-align-long=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-pointer.out++
deleted file mode 100644
index 0c7de0cc623..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-pointer:
-size=8,align=4,offset-long=0,offset-pointer=4,
-align-long=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-ptrdiff_t.out
deleted file mode 100644
index f32424f5c22..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-ptrdiff_t:
-size=8,align=4,offset-long=0,offset-ptrdiff_t=4,
-align-long=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-ptrdiff_t.out++
deleted file mode 100644
index f32424f5c22..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-ptrdiff_t:
-size=8,align=4,offset-long=0,offset-ptrdiff_t=4,
-align-long=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-char.out
deleted file mode 100644
index a8bc1b38166..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-char=4,
-align-long=4,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-char.out++
deleted file mode 100644
index a8bc1b38166..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-char=4,
-align-long=4,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-double.out
deleted file mode 100644
index e2f439e957d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with long:
-size=16,align=8
-offset-long=0,offset-sss-double=8,
-align-long=4,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-double.out++
deleted file mode 100644
index e2f439e957d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with long:
-size=16,align=8
-offset-long=0,offset-sss-double=8,
-align-long=4,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-float.out
deleted file mode 100644
index 26e986df4e3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-float=4,
-align-long=4,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-float.out++
deleted file mode 100644
index 26e986df4e3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-float=4,
-align-long=4,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-int.out
deleted file mode 100644
index 89c5164679c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-int=4,
-align-long=4,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-int.out++
deleted file mode 100644
index 89c5164679c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-int=4,
-align-long=4,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-long.out
deleted file mode 100644
index 32fedca2dc9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-long=4,
-align-long=4,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-long.out++
deleted file mode 100644
index 32fedca2dc9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-long=4,
-align-long=4,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longdouble.out
deleted file mode 100644
index b9901efda20..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with long:
-size=36,align=12
-offset-long=0,offset-sss-longdouble=12,
-align-long=4,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longdouble.out++
deleted file mode 100644
index b9901efda20..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longdouble.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with long:
-size=36,align=12
-offset-long=0,offset-sss-longdouble=12,
-align-long=4,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longlong.out
deleted file mode 100644
index 6e658c12236..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with long:
-size=16,align=8
-offset-long=0,offset-sss-longlong=8,
-align-long=4,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longlong.out++
deleted file mode 100644
index 6e658c12236..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with long:
-size=16,align=8
-offset-long=0,offset-sss-longlong=8,
-align-long=4,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-pointer.out
deleted file mode 100644
index a2ff8978ec0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-pointer=4,
-align-long=4,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-pointer.out++
deleted file mode 100644
index a2ff8978ec0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-pointer=4,
-align-long=4,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-short.out
deleted file mode 100644
index d9851668429..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-short=4,
-align-long=4,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-short.out++
deleted file mode 100644
index d9851668429..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-sss-short=4,
-align-long=4,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-short.out
deleted file mode 100644
index f1042856f85..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-short:
-size=8,align=4,offset-long=0,offset-short=4,
-align-long=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-short.out++
deleted file mode 100644
index f1042856f85..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-short:
-size=8,align=4,offset-long=0,offset-short=4,
-align-long=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-size_t.out
deleted file mode 100644
index ba63c65aac5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-size_t:
-size=8,align=4,offset-long=0,offset-size_t=4,
-align-long=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-size_t.out++
deleted file mode 100644
index ba63c65aac5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-size_t:
-size=8,align=4,offset-long=0,offset-size_t=4,
-align-long=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-wchar_t.out
deleted file mode 100644
index 5c25c680554..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-wchar_t:
-size=8,align=4,offset-long=0,offset-wchar_t=4,
-align-long=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-wchar_t.out++
deleted file mode 100644
index 5c25c680554..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct long-wchar_t:
-size=8,align=4,offset-long=0,offset-wchar_t=4,
-align-long=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-char.out
deleted file mode 100644
index ea092bca626..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-last=4,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-char.out++
deleted file mode 100644
index 65829385722..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with long:
-size=12,align=4
-offset-long=0,offset-last=8,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-int.out
deleted file mode 100644
index 83ac3817e68..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-last=4,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-int.out++
deleted file mode 100644
index 3aabd059181..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with long:
-size=12,align=4
-offset-long=0,offset-last=8,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-long.out
deleted file mode 100644
index 53fdd260b81..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-last=4,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-long.out++
deleted file mode 100644
index 71fe9e1cb06..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with long:
-size=12,align=4
-offset-long=0,offset-last=8,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-longlong.out
deleted file mode 100644
index 49eae1b5b93..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with long:
-size=12,align=4
-offset-long=0,offset-last=8,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-longlong.out++
deleted file mode 100644
index 40b0964e1c8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with long:
-size=24,align=8
-offset-long=0,offset-last=16,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-short.out
deleted file mode 100644
index 3cd4a51436f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with long:
-size=8,align=4
-offset-long=0,offset-last=4,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-short.out++
deleted file mode 100644
index fe23d73326f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-long-zf-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with long:
-size=12,align=4
-offset-long=0,offset-last=8,
-align-long=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-char.out
deleted file mode 100644
index 3ffb9108b7d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-arrayof-char=16,
-align-longdouble=16,align-arrayof-char=1
-offset-char-a[5]=21,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-char.out++
deleted file mode 100644
index 3ffb9108b7d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-arrayof-char=16,
-align-longdouble=16,align-arrayof-char=1
-offset-char-a[5]=21,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-double.out
deleted file mode 100644
index 70bf664d91a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with longdouble:
-size=96,align=16
-offset-longdouble=0,offset-arrayof-double=16,
-align-longdouble=16,align-arrayof-double=8
-offset-double-a[5]=56,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-double.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-double.out+
deleted file mode 100644
index 70bf664d91a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-double.out+
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with longdouble:
-size=96,align=16
-offset-longdouble=0,offset-arrayof-double=16,
-align-longdouble=16,align-arrayof-double=8
-offset-double-a[5]=56,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-float.out
deleted file mode 100644
index 8f045f9f3c8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with longdouble:
-size=64,align=16
-offset-longdouble=0,offset-arrayof-float=16,
-align-longdouble=16,align-arrayof-float=4
-offset-float-a[5]=36,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-float.out++
deleted file mode 100644
index 8f045f9f3c8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with longdouble:
-size=64,align=16
-offset-longdouble=0,offset-arrayof-float=16,
-align-longdouble=16,align-arrayof-float=4
-offset-float-a[5]=36,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-int.out
deleted file mode 100644
index 6cb1a33d6f9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with longdouble:
-size=64,align=16
-offset-longdouble=0,offset-arrayof-int=16,
-align-longdouble=16,align-arrayof-int=4
-offset-int-a[5]=36,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-int.out++
deleted file mode 100644
index 6cb1a33d6f9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with longdouble:
-size=64,align=16
-offset-longdouble=0,offset-arrayof-int=16,
-align-longdouble=16,align-arrayof-int=4
-offset-int-a[5]=36,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-long.out
deleted file mode 100644
index e2da0168754..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with longdouble:
-size=64,align=16
-offset-longdouble=0,offset-arrayof-long=16,
-align-longdouble=16,align-arrayof-long=4
-offset-long-a[5]=36,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-long.out++
deleted file mode 100644
index e2da0168754..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with longdouble:
-size=64,align=16
-offset-longdouble=0,offset-arrayof-long=16,
-align-longdouble=16,align-arrayof-long=4
-offset-long-a[5]=36,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-pointer.out
deleted file mode 100644
index e44846a04b0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with longdouble:
-size=64,align=16
-offset-longdouble=0,offset-arrayof-pointer=16,
-align-longdouble=16,align-arrayof-pointer=4
-offset-pointer-a[5]=36,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-short.out
deleted file mode 100644
index f8a5a8a3f23..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with longdouble:
-size=48,align=16
-offset-longdouble=0,offset-arrayof-short=16,
-align-longdouble=16,align-arrayof-short=2
-offset-short-a[5]=26,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-short.out++
deleted file mode 100644
index f8a5a8a3f23..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with longdouble:
-size=48,align=16
-offset-longdouble=0,offset-arrayof-short=16,
-align-longdouble=16,align-arrayof-short=2
-offset-short-a[5]=26,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-char.out
deleted file mode 100644
index d8eb01357ad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-char:
-size=32,align=16,offset-longdouble=0,offset-char=16,
-align-longdouble=16,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-char.out++
deleted file mode 100644
index d8eb01357ad..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-char:
-size=32,align=16,offset-longdouble=0,offset-char=16,
-align-longdouble=16,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-double.out
deleted file mode 100644
index f82570dd3d7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-double:
-size=32,align=16,offset-longdouble=0,offset-double=16,
-align-longdouble=16,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-double.out++
deleted file mode 100644
index f82570dd3d7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-double:
-size=32,align=16,offset-longdouble=0,offset-double=16,
-align-longdouble=16,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-float.out
deleted file mode 100644
index 00302ab8c93..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-float:
-size=32,align=16,offset-longdouble=0,offset-float=16,
-align-longdouble=16,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-float.out++
deleted file mode 100644
index 00302ab8c93..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-float:
-size=32,align=16,offset-longdouble=0,offset-float=16,
-align-longdouble=16,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-int.out
deleted file mode 100644
index e9c6b4cdd9b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-int:
-size=32,align=16,offset-longdouble=0,offset-int=16,
-align-longdouble=16,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-int.out++
deleted file mode 100644
index e9c6b4cdd9b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-int:
-size=32,align=16,offset-longdouble=0,offset-int=16,
-align-longdouble=16,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-long.out
deleted file mode 100644
index da3b31f82b6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-long:
-size=32,align=16,offset-longdouble=0,offset-long=16,
-align-longdouble=16,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-long.out++
deleted file mode 100644
index da3b31f82b6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-long:
-size=32,align=16,offset-longdouble=0,offset-long=16,
-align-longdouble=16,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-longlong.out
deleted file mode 100644
index 1d534f73db1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-longlong:
-size=32,align=16,offset-longdouble=0,offset-longlong=16,
-align-longdouble=16,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-longlong.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-longlong.out+
deleted file mode 100644
index 1d534f73db1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-longlong.out+
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-longlong:
-size=32,align=16,offset-longdouble=0,offset-longlong=16,
-align-longdouble=16,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-pointer.out
deleted file mode 100644
index cf8ac28740b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-pointer:
-size=32,align=16,offset-longdouble=0,offset-pointer=16,
-align-longdouble=16,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-pointer.out++
deleted file mode 100644
index cf8ac28740b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-pointer:
-size=32,align=16,offset-longdouble=0,offset-pointer=16,
-align-longdouble=16,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-ptrdiff_t.out
deleted file mode 100644
index 69da9f766d9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-ptrdiff_t:
-size=32,align=16,offset-longdouble=0,offset-ptrdiff_t=16,
-align-longdouble=16,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-char.out
deleted file mode 100644
index f57f5f48449..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-char=16,
-align-longdouble=16,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-char.out++
deleted file mode 100644
index f57f5f48449..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-char=16,
-align-longdouble=16,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-double.out
deleted file mode 100644
index 8871297e2ab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-double=16,
-align-longdouble=16,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-double.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-double.out+
deleted file mode 100644
index 8871297e2ab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-double.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-double=16,
-align-longdouble=16,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-float.out
deleted file mode 100644
index 637b3c7a86a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-float=16,
-align-longdouble=16,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-float.out++
deleted file mode 100644
index 637b3c7a86a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-float=16,
-align-longdouble=16,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-int.out
deleted file mode 100644
index 21fd9354076..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-int=16,
-align-longdouble=16,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-int.out++
deleted file mode 100644
index 21fd9354076..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-int=16,
-align-longdouble=16,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-long.out
deleted file mode 100644
index 7a94bdf5d5a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-long=16,
-align-longdouble=16,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-long.out++
deleted file mode 100644
index 7a94bdf5d5a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-long=16,
-align-longdouble=16,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-pointer.out
deleted file mode 100644
index a2cf7e59c3f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-pointer=16,
-align-longdouble=16,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-short.out
deleted file mode 100644
index 3e96891fe29..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-short=16,
-align-longdouble=16,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-short.out++
deleted file mode 100644
index 3e96891fe29..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-sss-short=16,
-align-longdouble=16,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-short.out
deleted file mode 100644
index db4542ff7ed..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-short:
-size=32,align=16,offset-longdouble=0,offset-short=16,
-align-longdouble=16,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-short.out++
deleted file mode 100644
index db4542ff7ed..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-short:
-size=32,align=16,offset-longdouble=0,offset-short=16,
-align-longdouble=16,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-size_t.out
deleted file mode 100644
index 59f5d356764..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-size_t:
-size=32,align=16,offset-longdouble=0,offset-size_t=16,
-align-longdouble=16,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-size_t.out++
deleted file mode 100644
index 59f5d356764..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-size_t:
-size=32,align=16,offset-longdouble=0,offset-size_t=16,
-align-longdouble=16,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-wchar_t.out
deleted file mode 100644
index b345be740ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-wchar_t:
-size=32,align=16,offset-longdouble=0,offset-wchar_t=16,
-align-longdouble=16,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-wchar_t.out++
deleted file mode 100644
index b345be740ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longdouble-wchar_t:
-size=32,align=16,offset-longdouble=0,offset-wchar_t=16,
-align-longdouble=16,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-char.out
deleted file mode 100644
index 4ec1f185f44..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-last=16,
-align-longdouble=16,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-char.out++
deleted file mode 100644
index db7307617ed..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-last=20,
-align-longdouble=16,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-int.out
deleted file mode 100644
index 58a528d7173..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-last=16,
-align-longdouble=16,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-int.out++
deleted file mode 100644
index eb6289341c4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-last=20,
-align-longdouble=16,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-long.out
deleted file mode 100644
index 28a01fd08fd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-last=16,
-align-longdouble=16,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-long.out++
deleted file mode 100644
index fb4e844af67..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-last=20,
-align-longdouble=16,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-short.out
deleted file mode 100644
index 43b6c20c828..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-last=16,
-align-longdouble=16,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-short.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-short.out+
deleted file mode 100644
index 6cf2da08283..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longdouble-zf-short.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with longdouble:
-size=32,align=16
-offset-longdouble=0,offset-last=20,
-align-longdouble=16,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-char.out
deleted file mode 100644
index 455888d198c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with longlong:
-size=24,align=8
-offset-longlong=0,offset-arrayof-char=8,
-align-longlong=8,align-arrayof-char=1
-offset-char-a[5]=13,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-char.out++
deleted file mode 100644
index 455888d198c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with longlong:
-size=24,align=8
-offset-longlong=0,offset-arrayof-char=8,
-align-longlong=8,align-arrayof-char=1
-offset-char-a[5]=13,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-double.out
deleted file mode 100644
index 693fcf6bdb9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with longlong:
-size=88,align=8
-offset-longlong=0,offset-arrayof-double=8,
-align-longlong=8,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-double.out++
deleted file mode 100644
index 693fcf6bdb9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-double.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with longlong:
-size=88,align=8
-offset-longlong=0,offset-arrayof-double=8,
-align-longlong=8,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-float.out
deleted file mode 100644
index 5ced60bde55..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with longlong:
-size=48,align=8
-offset-longlong=0,offset-arrayof-float=8,
-align-longlong=8,align-arrayof-float=4
-offset-float-a[5]=28,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-float.out++
deleted file mode 100644
index 5ced60bde55..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with longlong:
-size=48,align=8
-offset-longlong=0,offset-arrayof-float=8,
-align-longlong=8,align-arrayof-float=4
-offset-float-a[5]=28,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-int.out
deleted file mode 100644
index c75bf71ca3e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with longlong:
-size=48,align=8
-offset-longlong=0,offset-arrayof-int=8,
-align-longlong=8,align-arrayof-int=4
-offset-int-a[5]=28,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-int.out++
deleted file mode 100644
index c75bf71ca3e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with longlong:
-size=48,align=8
-offset-longlong=0,offset-arrayof-int=8,
-align-longlong=8,align-arrayof-int=4
-offset-int-a[5]=28,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-long.out
deleted file mode 100644
index 9889305ac5a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with longlong:
-size=48,align=8
-offset-longlong=0,offset-arrayof-long=8,
-align-longlong=8,align-arrayof-long=4
-offset-long-a[5]=28,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-long.out++
deleted file mode 100644
index 9889305ac5a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with longlong:
-size=48,align=8
-offset-longlong=0,offset-arrayof-long=8,
-align-longlong=8,align-arrayof-long=4
-offset-long-a[5]=28,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-longlong.out
deleted file mode 100644
index 79ec6449604..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-longlong.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with longlong:
-size=88,align=8
-offset-longlong=0,offset-arrayof-longlong=8,
-align-longlong=8,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-longlong.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-longlong.out+
deleted file mode 100644
index 79ec6449604..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-longlong.out+
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with longlong:
-size=88,align=8
-offset-longlong=0,offset-arrayof-longlong=8,
-align-longlong=8,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-pointer.out
deleted file mode 100644
index fdd4db715f3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with longlong:
-size=48,align=8
-offset-longlong=0,offset-arrayof-pointer=8,
-align-longlong=8,align-arrayof-pointer=4
-offset-pointer-a[5]=28,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-pointer.out++
deleted file mode 100644
index fdd4db715f3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-pointer.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with longlong:
-size=48,align=8
-offset-longlong=0,offset-arrayof-pointer=8,
-align-longlong=8,align-arrayof-pointer=4
-offset-pointer-a[5]=28,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-short.out
deleted file mode 100644
index 0efc621d7db..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with longlong:
-size=32,align=8
-offset-longlong=0,offset-arrayof-short=8,
-align-longlong=8,align-arrayof-short=2
-offset-short-a[5]=18,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-short.out++
deleted file mode 100644
index 0efc621d7db..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with longlong:
-size=32,align=8
-offset-longlong=0,offset-arrayof-short=8,
-align-longlong=8,align-arrayof-short=2
-offset-short-a[5]=18,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-char.out
deleted file mode 100644
index 1a916168cab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-char:
-size=16,align=8,offset-longlong=0,offset-char=8,
-align-longlong=8,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-char.out++
deleted file mode 100644
index 1a916168cab..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-char:
-size=16,align=8,offset-longlong=0,offset-char=8,
-align-longlong=8,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-double.out
deleted file mode 100644
index 5a14cf2dc02..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-double:
-size=16,align=8,offset-longlong=0,offset-double=8,
-align-longlong=8,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-double.out++
deleted file mode 100644
index 5a14cf2dc02..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-double:
-size=16,align=8,offset-longlong=0,offset-double=8,
-align-longlong=8,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-float.out
deleted file mode 100644
index 050270561a8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-float:
-size=16,align=8,offset-longlong=0,offset-float=8,
-align-longlong=8,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-float.out++
deleted file mode 100644
index 050270561a8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-float:
-size=16,align=8,offset-longlong=0,offset-float=8,
-align-longlong=8,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-int.out
deleted file mode 100644
index 5afa2c939ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-int:
-size=16,align=8,offset-longlong=0,offset-int=8,
-align-longlong=8,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-int.out++
deleted file mode 100644
index 5afa2c939ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-int:
-size=16,align=8,offset-longlong=0,offset-int=8,
-align-longlong=8,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-long.out
deleted file mode 100644
index 4bbcef4ccd7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-long:
-size=16,align=8,offset-longlong=0,offset-long=8,
-align-longlong=8,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-long.out++
deleted file mode 100644
index 4bbcef4ccd7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-long:
-size=16,align=8,offset-longlong=0,offset-long=8,
-align-longlong=8,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longdouble.out
deleted file mode 100644
index 54d04573ba2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-longdouble:
-size=32,align=16,offset-longlong=0,offset-longdouble=16,
-align-longlong=8,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longdouble.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longdouble.out+
deleted file mode 100644
index 54d04573ba2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longdouble.out+
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-longdouble:
-size=32,align=16,offset-longlong=0,offset-longdouble=16,
-align-longlong=8,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longlong.out
deleted file mode 100644
index e027da3535e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-longlong:
-size=16,align=8,offset-longlong=0,offset-longlong=8,
-align-longlong=8,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longlong.out++
deleted file mode 100644
index e027da3535e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-longlong:
-size=16,align=8,offset-longlong=0,offset-longlong=8,
-align-longlong=8,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-pointer.out
deleted file mode 100644
index b278c5dde4a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-pointer:
-size=16,align=8,offset-longlong=0,offset-pointer=8,
-align-longlong=8,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-pointer.out++
deleted file mode 100644
index b278c5dde4a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-pointer:
-size=16,align=8,offset-longlong=0,offset-pointer=8,
-align-longlong=8,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-ptrdiff_t.out
deleted file mode 100644
index 1b21084cc4c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-ptrdiff_t:
-size=16,align=8,offset-longlong=0,offset-ptrdiff_t=8,
-align-longlong=8,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-ptrdiff_t.out++
deleted file mode 100644
index 1b21084cc4c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-ptrdiff_t:
-size=16,align=8,offset-longlong=0,offset-ptrdiff_t=8,
-align-longlong=8,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-char.out
deleted file mode 100644
index d5b4d7925f2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-char=8,
-align-longlong=8,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-char.out++
deleted file mode 100644
index d5b4d7925f2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-char=8,
-align-longlong=8,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-double.out
deleted file mode 100644
index 249b4eb1b5a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-double=8,
-align-longlong=8,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-double.out++
deleted file mode 100644
index 249b4eb1b5a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-double=8,
-align-longlong=8,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-float.out
deleted file mode 100644
index f5af3795e34..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-float=8,
-align-longlong=8,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-float.out++
deleted file mode 100644
index f5af3795e34..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-float=8,
-align-longlong=8,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-int.out
deleted file mode 100644
index 754b9ea011d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-int=8,
-align-longlong=8,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-int.out++
deleted file mode 100644
index 754b9ea011d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-int=8,
-align-longlong=8,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-long.out
deleted file mode 100644
index 3c0ef9d782d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-long=8,
-align-longlong=8,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-long.out++
deleted file mode 100644
index 3c0ef9d782d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-long=8,
-align-longlong=8,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-longlong.out
deleted file mode 100644
index 0492ab03cf7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-longlong=8,
-align-longlong=8,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-longlong.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-longlong.out+
deleted file mode 100644
index 0492ab03cf7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-longlong.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-longlong=8,
-align-longlong=8,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-pointer.out
deleted file mode 100644
index 81849178136..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-pointer=8,
-align-longlong=8,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-pointer.out++
deleted file mode 100644
index 81849178136..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-pointer=8,
-align-longlong=8,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-short.out
deleted file mode 100644
index 606b0678983..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-short=8,
-align-longlong=8,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-short.out++
deleted file mode 100644
index 606b0678983..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-sss-short=8,
-align-longlong=8,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-short.out
deleted file mode 100644
index 6526dadcf6e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-short:
-size=16,align=8,offset-longlong=0,offset-short=8,
-align-longlong=8,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-short.out++
deleted file mode 100644
index 6526dadcf6e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-short:
-size=16,align=8,offset-longlong=0,offset-short=8,
-align-longlong=8,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-size_t.out
deleted file mode 100644
index a063c90e905..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-size_t:
-size=16,align=8,offset-longlong=0,offset-size_t=8,
-align-longlong=8,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-size_t.out++
deleted file mode 100644
index a063c90e905..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-size_t:
-size=16,align=8,offset-longlong=0,offset-size_t=8,
-align-longlong=8,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-wchar_t.out
deleted file mode 100644
index d0d88dc0c36..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-wchar_t:
-size=16,align=8,offset-longlong=0,offset-wchar_t=8,
-align-longlong=8,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-wchar_t.out++
deleted file mode 100644
index d0d88dc0c36..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct longlong-wchar_t:
-size=16,align=8,offset-longlong=0,offset-wchar_t=8,
-align-longlong=8,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-char.out
deleted file mode 100644
index f8befc101bd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-last=8,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-char.out++
deleted file mode 100644
index 02e9c0039f1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-last=12,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-int.out
deleted file mode 100644
index b708d47404d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-last=8,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-int.out++
deleted file mode 100644
index 585d4d9bfda..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-last=12,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-long.out
deleted file mode 100644
index 0ff7ef5887c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-last=8,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-long.out++
deleted file mode 100644
index 36b9d16df04..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-last=12,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-longlong.out
deleted file mode 100644
index b0b9a7178d8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with longlong:
-size=24,align=8
-offset-longlong=0,offset-last=16,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-short.out
deleted file mode 100644
index 41fd5ce940d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-last=8,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-short.out++
deleted file mode 100644
index 7899b1037c6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-longlong-zf-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with longlong:
-size=16,align=8
-offset-longlong=0,offset-last=12,
-align-longlong=8,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-char.out
deleted file mode 100644
index a856f20d445..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with pointer:
-size=16,align=4
-offset-pointer=0,offset-arrayof-char=4,
-align-pointer=4,align-arrayof-char=1
-offset-char-a[5]=9,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-char.out++
deleted file mode 100644
index a856f20d445..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with pointer:
-size=16,align=4
-offset-pointer=0,offset-arrayof-char=4,
-align-pointer=4,align-arrayof-char=1
-offset-char-a[5]=9,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-double.out
deleted file mode 100644
index 6f195a05e5b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with pointer:
-size=88,align=8
-offset-pointer=0,offset-arrayof-double=8,
-align-pointer=4,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-double.out++
deleted file mode 100644
index 6f195a05e5b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-double.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with pointer:
-size=88,align=8
-offset-pointer=0,offset-arrayof-double=8,
-align-pointer=4,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-float.out
deleted file mode 100644
index 633270ce72d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with pointer:
-size=44,align=4
-offset-pointer=0,offset-arrayof-float=4,
-align-pointer=4,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-float.out++
deleted file mode 100644
index 633270ce72d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with pointer:
-size=44,align=4
-offset-pointer=0,offset-arrayof-float=4,
-align-pointer=4,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-int.out
deleted file mode 100644
index 2f7395e06f4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with pointer:
-size=44,align=4
-offset-pointer=0,offset-arrayof-int=4,
-align-pointer=4,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-int.out++
deleted file mode 100644
index 2f7395e06f4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with pointer:
-size=44,align=4
-offset-pointer=0,offset-arrayof-int=4,
-align-pointer=4,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-long.out
deleted file mode 100644
index b28e15c7899..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with pointer:
-size=44,align=4
-offset-pointer=0,offset-arrayof-long=4,
-align-pointer=4,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-long.out++
deleted file mode 100644
index b28e15c7899..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with pointer:
-size=44,align=4
-offset-pointer=0,offset-arrayof-long=4,
-align-pointer=4,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longdouble.out
deleted file mode 100644
index ef3fee4def8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longdouble.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with pointer:
-size=176,align=16
-offset-pointer=0,offset-arrayof-longdouble=16,
-align-pointer=4,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longlong.out
deleted file mode 100644
index 9a9ba48abb0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longlong.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with pointer:
-size=88,align=8
-offset-pointer=0,offset-arrayof-longlong=8,
-align-pointer=4,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longlong.out++
deleted file mode 100644
index 9a9ba48abb0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-longlong.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with pointer:
-size=88,align=8
-offset-pointer=0,offset-arrayof-longlong=8,
-align-pointer=4,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-pointer.out
deleted file mode 100644
index 367aeb84c3a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with pointer:
-size=44,align=4
-offset-pointer=0,offset-arrayof-pointer=4,
-align-pointer=4,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-pointer.out++
deleted file mode 100644
index 367aeb84c3a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-pointer.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with pointer:
-size=44,align=4
-offset-pointer=0,offset-arrayof-pointer=4,
-align-pointer=4,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-short.out
deleted file mode 100644
index b8d1c719166..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with pointer:
-size=24,align=4
-offset-pointer=0,offset-arrayof-short=4,
-align-pointer=4,align-arrayof-short=2
-offset-short-a[5]=14,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-short.out++
deleted file mode 100644
index b8d1c719166..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with pointer:
-size=24,align=4
-offset-pointer=0,offset-arrayof-short=4,
-align-pointer=4,align-arrayof-short=2
-offset-short-a[5]=14,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-char.out
deleted file mode 100644
index a78958a7e54..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-char:
-size=8,align=4,offset-pointer=0,offset-char=4,
-align-pointer=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-char.out++
deleted file mode 100644
index a78958a7e54..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-char:
-size=8,align=4,offset-pointer=0,offset-char=4,
-align-pointer=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-double.out
deleted file mode 100644
index e8bcceb8786..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-double:
-size=16,align=8,offset-pointer=0,offset-double=8,
-align-pointer=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-double.out++
deleted file mode 100644
index e8bcceb8786..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-double:
-size=16,align=8,offset-pointer=0,offset-double=8,
-align-pointer=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-float.out
deleted file mode 100644
index ab3d8b02add..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-float:
-size=8,align=4,offset-pointer=0,offset-float=4,
-align-pointer=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-float.out++
deleted file mode 100644
index ab3d8b02add..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-float:
-size=8,align=4,offset-pointer=0,offset-float=4,
-align-pointer=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-int.out
deleted file mode 100644
index 61e7ea71bac..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-int:
-size=8,align=4,offset-pointer=0,offset-int=4,
-align-pointer=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-int.out++
deleted file mode 100644
index 61e7ea71bac..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-int:
-size=8,align=4,offset-pointer=0,offset-int=4,
-align-pointer=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-long.out
deleted file mode 100644
index 4e2073e6b34..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-long:
-size=8,align=4,offset-pointer=0,offset-long=4,
-align-pointer=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-long.out++
deleted file mode 100644
index 4e2073e6b34..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-long:
-size=8,align=4,offset-pointer=0,offset-long=4,
-align-pointer=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longdouble.out
deleted file mode 100644
index 7e9b4e1ee1e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-longdouble:
-size=32,align=16,offset-pointer=0,offset-longdouble=16,
-align-pointer=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longdouble.out++
deleted file mode 100644
index 7e9b4e1ee1e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-longdouble:
-size=32,align=16,offset-pointer=0,offset-longdouble=16,
-align-pointer=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longlong.out
deleted file mode 100644
index e023a3c91ef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-longlong:
-size=16,align=8,offset-pointer=0,offset-longlong=8,
-align-pointer=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longlong.out++
deleted file mode 100644
index e023a3c91ef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-longlong:
-size=16,align=8,offset-pointer=0,offset-longlong=8,
-align-pointer=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-pointer.out
deleted file mode 100644
index 41e2fba9249..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-pointer:
-size=8,align=4,offset-pointer=0,offset-pointer=4,
-align-pointer=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-pointer.out++
deleted file mode 100644
index 41e2fba9249..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-pointer:
-size=8,align=4,offset-pointer=0,offset-pointer=4,
-align-pointer=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-ptrdiff_t.out
deleted file mode 100644
index f8da13f35e2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-ptrdiff_t:
-size=8,align=4,offset-pointer=0,offset-ptrdiff_t=4,
-align-pointer=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-ptrdiff_t.out++
deleted file mode 100644
index f8da13f35e2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-ptrdiff_t:
-size=8,align=4,offset-pointer=0,offset-ptrdiff_t=4,
-align-pointer=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-char.out
deleted file mode 100644
index 5f94bb6fb93..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-char=4,
-align-pointer=4,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-char.out++
deleted file mode 100644
index 5f94bb6fb93..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-char=4,
-align-pointer=4,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-double.out
deleted file mode 100644
index 2ca5b43208c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with pointer:
-size=16,align=8
-offset-pointer=0,offset-sss-double=8,
-align-pointer=4,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-double.out++
deleted file mode 100644
index 2ca5b43208c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with pointer:
-size=16,align=8
-offset-pointer=0,offset-sss-double=8,
-align-pointer=4,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-float.out
deleted file mode 100644
index 3fa4c1cd2b2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-float=4,
-align-pointer=4,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-float.out++
deleted file mode 100644
index 3fa4c1cd2b2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-float=4,
-align-pointer=4,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-int.out
deleted file mode 100644
index 6149b357573..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-int=4,
-align-pointer=4,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-int.out++
deleted file mode 100644
index 6149b357573..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-int=4,
-align-pointer=4,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-long.out
deleted file mode 100644
index 8377c111cc7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-long=4,
-align-pointer=4,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-long.out++
deleted file mode 100644
index 8377c111cc7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-long=4,
-align-pointer=4,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longdouble.out
deleted file mode 100644
index 1cca1c9ca90..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with pointer:
-size=36,align=12
-offset-pointer=0,offset-sss-longdouble=12,
-align-pointer=4,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longlong.out
deleted file mode 100644
index 5866b4cf00f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with pointer:
-size=16,align=8
-offset-pointer=0,offset-sss-longlong=8,
-align-pointer=4,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longlong.out++
deleted file mode 100644
index 5866b4cf00f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with pointer:
-size=16,align=8
-offset-pointer=0,offset-sss-longlong=8,
-align-pointer=4,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-pointer.out
deleted file mode 100644
index 89b7e14bccb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-pointer=4,
-align-pointer=4,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-pointer.out++
deleted file mode 100644
index 89b7e14bccb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-pointer=4,
-align-pointer=4,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-short.out
deleted file mode 100644
index 76b704080b0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-short=4,
-align-pointer=4,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-short.out++
deleted file mode 100644
index 76b704080b0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-sss-short=4,
-align-pointer=4,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-short.out
deleted file mode 100644
index a6a8d26905f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-short:
-size=8,align=4,offset-pointer=0,offset-short=4,
-align-pointer=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-short.out++
deleted file mode 100644
index a6a8d26905f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-short:
-size=8,align=4,offset-pointer=0,offset-short=4,
-align-pointer=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-size_t.out
deleted file mode 100644
index 2db57f52434..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-size_t:
-size=8,align=4,offset-pointer=0,offset-size_t=4,
-align-pointer=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-size_t.out++
deleted file mode 100644
index 2db57f52434..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-size_t:
-size=8,align=4,offset-pointer=0,offset-size_t=4,
-align-pointer=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-wchar_t.out
deleted file mode 100644
index d52f7db2d8d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-wchar_t:
-size=8,align=4,offset-pointer=0,offset-wchar_t=4,
-align-pointer=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-wchar_t.out++
deleted file mode 100644
index d52f7db2d8d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct pointer-wchar_t:
-size=8,align=4,offset-pointer=0,offset-wchar_t=4,
-align-pointer=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-char.out
deleted file mode 100644
index 25498e7675c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-last=4,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-char.out++
deleted file mode 100644
index e1710a60018..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with pointer:
-size=12,align=4
-offset-pointer=0,offset-last=8,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-int.out
deleted file mode 100644
index ae6096c6c6d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-last=4,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-int.out++
deleted file mode 100644
index a94950a169c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with pointer:
-size=12,align=4
-offset-pointer=0,offset-last=8,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-long.out
deleted file mode 100644
index 52418b75129..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-last=4,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-long.out++
deleted file mode 100644
index 6bef187fcf4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with pointer:
-size=12,align=4
-offset-pointer=0,offset-last=8,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-longlong.out
deleted file mode 100644
index ff211276f14..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with pointer:
-size=12,align=4
-offset-pointer=0,offset-last=8,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-longlong.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-longlong.out+
deleted file mode 100644
index e67cde4d3d3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-longlong.out+
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with pointer:
-size=24,align=8
-offset-pointer=0,offset-last=16,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-short.out
deleted file mode 100644
index 44ada9e3b74..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with pointer:
-size=8,align=4
-offset-pointer=0,offset-last=4,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-short.out++
deleted file mode 100644
index a8a41ebb957..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-pointer-zf-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with pointer:
-size=12,align=4
-offset-pointer=0,offset-last=8,
-align-pointer=4,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-char.out
deleted file mode 100644
index ee6aa5e24d7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-char:
-size=8,align=4,offset-ptrdiff_t=0,offset-char=4,
-align-ptrdiff_t=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-char.out++
deleted file mode 100644
index ee6aa5e24d7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-char:
-size=8,align=4,offset-ptrdiff_t=0,offset-char=4,
-align-ptrdiff_t=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-double.out
deleted file mode 100644
index 0ef52ecc65e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-double:
-size=16,align=8,offset-ptrdiff_t=0,offset-double=8,
-align-ptrdiff_t=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-double.out++
deleted file mode 100644
index 0ef52ecc65e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-double:
-size=16,align=8,offset-ptrdiff_t=0,offset-double=8,
-align-ptrdiff_t=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-float.out
deleted file mode 100644
index 19ad497a127..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-float:
-size=8,align=4,offset-ptrdiff_t=0,offset-float=4,
-align-ptrdiff_t=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-float.out++
deleted file mode 100644
index 19ad497a127..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-float:
-size=8,align=4,offset-ptrdiff_t=0,offset-float=4,
-align-ptrdiff_t=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-int.out
deleted file mode 100644
index 22a19622d0b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-int:
-size=8,align=4,offset-ptrdiff_t=0,offset-int=4,
-align-ptrdiff_t=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-int.out++
deleted file mode 100644
index 22a19622d0b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-int:
-size=8,align=4,offset-ptrdiff_t=0,offset-int=4,
-align-ptrdiff_t=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-long.out
deleted file mode 100644
index 9fa1eebcc97..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-long:
-size=8,align=4,offset-ptrdiff_t=0,offset-long=4,
-align-ptrdiff_t=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-long.out++
deleted file mode 100644
index 9fa1eebcc97..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-long:
-size=8,align=4,offset-ptrdiff_t=0,offset-long=4,
-align-ptrdiff_t=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longdouble.out
deleted file mode 100644
index 5521ef900ba..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-longdouble:
-size=32,align=16,offset-ptrdiff_t=0,offset-longdouble=16,
-align-ptrdiff_t=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longlong.out
deleted file mode 100644
index dd19608bcf3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-longlong:
-size=16,align=8,offset-ptrdiff_t=0,offset-longlong=8,
-align-ptrdiff_t=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longlong.out++
deleted file mode 100644
index dd19608bcf3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-longlong:
-size=16,align=8,offset-ptrdiff_t=0,offset-longlong=8,
-align-ptrdiff_t=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-pointer.out
deleted file mode 100644
index 14d47de3d38..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-pointer:
-size=8,align=4,offset-ptrdiff_t=0,offset-pointer=4,
-align-ptrdiff_t=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-pointer.out++
deleted file mode 100644
index 14d47de3d38..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-pointer:
-size=8,align=4,offset-ptrdiff_t=0,offset-pointer=4,
-align-ptrdiff_t=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-ptrdiff_t.out
deleted file mode 100644
index 3013b33e251..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-ptrdiff_t:
-size=8,align=4,offset-ptrdiff_t=0,offset-ptrdiff_t=4,
-align-ptrdiff_t=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-ptrdiff_t.out+ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-ptrdiff_t.out+
deleted file mode 100644
index 3013b33e251..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-ptrdiff_t.out+
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-ptrdiff_t:
-size=8,align=4,offset-ptrdiff_t=0,offset-ptrdiff_t=4,
-align-ptrdiff_t=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-short.out
deleted file mode 100644
index 1824fe2f50c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-short:
-size=8,align=4,offset-ptrdiff_t=0,offset-short=4,
-align-ptrdiff_t=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-short.out++
deleted file mode 100644
index 1824fe2f50c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-short:
-size=8,align=4,offset-ptrdiff_t=0,offset-short=4,
-align-ptrdiff_t=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-size_t.out
deleted file mode 100644
index 304301bf657..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-size_t:
-size=8,align=4,offset-ptrdiff_t=0,offset-size_t=4,
-align-ptrdiff_t=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-size_t.out++
deleted file mode 100644
index 304301bf657..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-size_t:
-size=8,align=4,offset-ptrdiff_t=0,offset-size_t=4,
-align-ptrdiff_t=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-wchar_t.out
deleted file mode 100644
index 7f5bb99995d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-wchar_t:
-size=8,align=4,offset-ptrdiff_t=0,offset-wchar_t=4,
-align-ptrdiff_t=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-wchar_t.out++
deleted file mode 100644
index 7f5bb99995d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-ptrdiff_t-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct ptrdiff_t-wchar_t:
-size=8,align=4,offset-ptrdiff_t=0,offset-wchar_t=4,
-align-ptrdiff_t=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-char.out
deleted file mode 100644
index d14959b98a0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-char.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with short:
-size=12,align=2
-offset-short=0,offset-arrayof-char=2,
-align-short=2,align-arrayof-char=1
-offset-char-a[5]=7,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-char.out++
deleted file mode 100644
index d14959b98a0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-char.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of char in struct starting with short:
-size=12,align=2
-offset-short=0,offset-arrayof-char=2,
-align-short=2,align-arrayof-char=1
-offset-char-a[5]=7,align-char-a[5]=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-double.out
deleted file mode 100644
index 06fb3c0c33c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-double.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with short:
-size=88,align=8
-offset-short=0,offset-arrayof-double=8,
-align-short=2,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-double.out++
deleted file mode 100644
index 06fb3c0c33c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-double.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of double in struct starting with short:
-size=88,align=8
-offset-short=0,offset-arrayof-double=8,
-align-short=2,align-arrayof-double=8
-offset-double-a[5]=48,align-double-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-float.out
deleted file mode 100644
index 6fa15593e0a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-float.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with short:
-size=44,align=4
-offset-short=0,offset-arrayof-float=4,
-align-short=2,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-float.out++
deleted file mode 100644
index 6fa15593e0a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-float.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of float in struct starting with short:
-size=44,align=4
-offset-short=0,offset-arrayof-float=4,
-align-short=2,align-arrayof-float=4
-offset-float-a[5]=24,align-float-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-int.out
deleted file mode 100644
index 95709d9760f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-int.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with short:
-size=44,align=4
-offset-short=0,offset-arrayof-int=4,
-align-short=2,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-int.out++
deleted file mode 100644
index 95709d9760f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-int.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of int in struct starting with short:
-size=44,align=4
-offset-short=0,offset-arrayof-int=4,
-align-short=2,align-arrayof-int=4
-offset-int-a[5]=24,align-int-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-long.out
deleted file mode 100644
index fdd4fd187fb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-long.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with short:
-size=44,align=4
-offset-short=0,offset-arrayof-long=4,
-align-short=2,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-long.out++
deleted file mode 100644
index fdd4fd187fb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-long.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of long in struct starting with short:
-size=44,align=4
-offset-short=0,offset-arrayof-long=4,
-align-short=2,align-arrayof-long=4
-offset-long-a[5]=24,align-long-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longdouble.out
deleted file mode 100644
index 5642b3322c2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longdouble.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with short:
-size=176,align=16
-offset-short=0,offset-arrayof-longdouble=16,
-align-short=2,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longdouble.out++
deleted file mode 100644
index 5642b3322c2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longdouble.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longdouble in struct starting with short:
-size=176,align=16
-offset-short=0,offset-arrayof-longdouble=16,
-align-short=2,align-arrayof-longdouble=16
-offset-longdouble-a[5]=96,align-longdouble-a[5]=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longlong.out
deleted file mode 100644
index 6cfebcf6388..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longlong.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with short:
-size=88,align=8
-offset-short=0,offset-arrayof-longlong=8,
-align-short=2,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longlong.out++
deleted file mode 100644
index 6cfebcf6388..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-longlong.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of longlong in struct starting with short:
-size=88,align=8
-offset-short=0,offset-arrayof-longlong=8,
-align-short=2,align-arrayof-longlong=8
-offset-longlong-a[5]=48,align-longlong-a[5]=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-pointer.out
deleted file mode 100644
index c9997ced370..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-pointer.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with short:
-size=44,align=4
-offset-short=0,offset-arrayof-pointer=4,
-align-short=2,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-pointer.out++
deleted file mode 100644
index c9997ced370..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-pointer.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of pointer in struct starting with short:
-size=44,align=4
-offset-short=0,offset-arrayof-pointer=4,
-align-short=2,align-arrayof-pointer=4
-offset-pointer-a[5]=24,align-pointer-a[5]=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-short.out
deleted file mode 100644
index 67b0535089f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-short.out
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with short:
-size=22,align=2
-offset-short=0,offset-arrayof-short=2,
-align-short=2,align-arrayof-short=2
-offset-short-a[5]=12,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-short.out++
deleted file mode 100644
index 67b0535089f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-a-short.out++
+++ /dev/null
@@ -1,5 +0,0 @@
-++++Array of short in struct starting with short:
-size=22,align=2
-offset-short=0,offset-arrayof-short=2,
-align-short=2,align-arrayof-short=2
-offset-short-a[5]=12,align-short-a[5]=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-char.out
deleted file mode 100644
index aaf2b57e017..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-char:
-size=4,align=2,offset-short=0,offset-char=2,
-align-short=2,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-char.out++
deleted file mode 100644
index aaf2b57e017..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-char:
-size=4,align=2,offset-short=0,offset-char=2,
-align-short=2,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-double.out
deleted file mode 100644
index 22068a15499..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-double:
-size=16,align=8,offset-short=0,offset-double=8,
-align-short=2,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-double.out++
deleted file mode 100644
index 22068a15499..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-double:
-size=16,align=8,offset-short=0,offset-double=8,
-align-short=2,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-float.out
deleted file mode 100644
index 027b69e98b7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-float:
-size=8,align=4,offset-short=0,offset-float=4,
-align-short=2,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-float.out++
deleted file mode 100644
index 027b69e98b7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-float:
-size=8,align=4,offset-short=0,offset-float=4,
-align-short=2,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-int.out
deleted file mode 100644
index c33851bf34c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-int:
-size=8,align=4,offset-short=0,offset-int=4,
-align-short=2,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-int.out++
deleted file mode 100644
index c33851bf34c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-int:
-size=8,align=4,offset-short=0,offset-int=4,
-align-short=2,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-long.out
deleted file mode 100644
index b16572b22e8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-long:
-size=8,align=4,offset-short=0,offset-long=4,
-align-short=2,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-long.out++
deleted file mode 100644
index b16572b22e8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-long:
-size=8,align=4,offset-short=0,offset-long=4,
-align-short=2,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longdouble.out
deleted file mode 100644
index ecae39433db..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-longdouble:
-size=32,align=16,offset-short=0,offset-longdouble=16,
-align-short=2,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longdouble.out++
deleted file mode 100644
index ecae39433db..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-longdouble:
-size=32,align=16,offset-short=0,offset-longdouble=16,
-align-short=2,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longlong.out
deleted file mode 100644
index 5282bb5ca8d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-longlong:
-size=16,align=8,offset-short=0,offset-longlong=8,
-align-short=2,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longlong.out++
deleted file mode 100644
index 5282bb5ca8d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-longlong:
-size=16,align=8,offset-short=0,offset-longlong=8,
-align-short=2,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-pointer.out
deleted file mode 100644
index 6330d0b6148..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-pointer:
-size=8,align=4,offset-short=0,offset-pointer=4,
-align-short=2,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-pointer.out++
deleted file mode 100644
index 6330d0b6148..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-pointer:
-size=8,align=4,offset-short=0,offset-pointer=4,
-align-short=2,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-ptrdiff_t.out
deleted file mode 100644
index 525f4e7dfa0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-ptrdiff_t:
-size=8,align=4,offset-short=0,offset-ptrdiff_t=4,
-align-short=2,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-ptrdiff_t.out++
deleted file mode 100644
index 525f4e7dfa0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-ptrdiff_t:
-size=8,align=4,offset-short=0,offset-ptrdiff_t=4,
-align-short=2,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-char.out
deleted file mode 100644
index e91aaafac44..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with short:
-size=4,align=2
-offset-short=0,offset-sss-char=2,
-align-short=2,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-char.out++
deleted file mode 100644
index e91aaafac44..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct char inside struct starting with short:
-size=4,align=2
-offset-short=0,offset-sss-char=2,
-align-short=2,align-sss-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-double.out
deleted file mode 100644
index c4486223ce1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-double.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with short:
-size=16,align=8
-offset-short=0,offset-sss-double=8,
-align-short=2,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-double.out++
deleted file mode 100644
index c4486223ce1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-double.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct double inside struct starting with short:
-size=16,align=8
-offset-short=0,offset-sss-double=8,
-align-short=2,align-sss-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-float.out
deleted file mode 100644
index a216f01eb0d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-float.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-sss-float=4,
-align-short=2,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-float.out++
deleted file mode 100644
index a216f01eb0d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-float.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct float inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-sss-float=4,
-align-short=2,align-sss-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-int.out
deleted file mode 100644
index 93d8d66366f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-sss-int=4,
-align-short=2,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-int.out++
deleted file mode 100644
index 93d8d66366f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct int inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-sss-int=4,
-align-short=2,align-sss-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-long.out
deleted file mode 100644
index b33b8638aa0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-sss-long=4,
-align-short=2,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-long.out++
deleted file mode 100644
index b33b8638aa0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct long inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-sss-long=4,
-align-short=2,align-sss-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longdouble.out
deleted file mode 100644
index 8f3c78ca0a6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longdouble.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with short:
-size=36,align=12
-offset-short=0,offset-sss-longdouble=12,
-align-short=2,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longdouble.out++
deleted file mode 100644
index 8f3c78ca0a6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longdouble.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longdouble inside struct starting with short:
-size=36,align=12
-offset-short=0,offset-sss-longdouble=12,
-align-short=2,align-sss-longdouble=12
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longlong.out
deleted file mode 100644
index 8e03b258254..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with short:
-size=16,align=8
-offset-short=0,offset-sss-longlong=8,
-align-short=2,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longlong.out++
deleted file mode 100644
index 8e03b258254..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct longlong inside struct starting with short:
-size=16,align=8
-offset-short=0,offset-sss-longlong=8,
-align-short=2,align-sss-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-pointer.out
deleted file mode 100644
index cc9301fc287..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-pointer.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-sss-pointer=4,
-align-short=2,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-pointer.out++
deleted file mode 100644
index cc9301fc287..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-pointer.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct pointer inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-sss-pointer=4,
-align-short=2,align-sss-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-short.out
deleted file mode 100644
index be9ca574cfa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with short:
-size=4,align=2
-offset-short=0,offset-sss-short=2,
-align-short=2,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-short.out++
deleted file mode 100644
index be9ca574cfa..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-s-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++Struct short inside struct starting with short:
-size=4,align=2
-offset-short=0,offset-sss-short=2,
-align-short=2,align-sss-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-short.out
deleted file mode 100644
index 4f0df5b8fbd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-short:
-size=4,align=2,offset-short=0,offset-short=2,
-align-short=2,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-short.out++
deleted file mode 100644
index 4f0df5b8fbd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-short:
-size=4,align=2,offset-short=0,offset-short=2,
-align-short=2,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-size_t.out
deleted file mode 100644
index 2075e26ef38..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-size_t:
-size=8,align=4,offset-short=0,offset-size_t=4,
-align-short=2,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-size_t.out++
deleted file mode 100644
index 2075e26ef38..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-size_t:
-size=8,align=4,offset-short=0,offset-size_t=4,
-align-short=2,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-wchar_t.out
deleted file mode 100644
index 55eb7977b4b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-wchar_t:
-size=8,align=4,offset-short=0,offset-wchar_t=4,
-align-short=2,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-wchar_t.out++
deleted file mode 100644
index 55eb7977b4b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct short-wchar_t:
-size=8,align=4,offset-short=0,offset-wchar_t=4,
-align-short=2,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-char.out
deleted file mode 100644
index fde86d97c04..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-char.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-last=4,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-char.out++
deleted file mode 100644
index 7c0141dc75d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-char.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++char zerofield inside struct starting with short:
-size=12,align=4
-offset-short=0,offset-last=8,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-int.out
deleted file mode 100644
index 8e3e4884e98..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-int.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-last=4,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-int.out++
deleted file mode 100644
index d2f5a512be1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-int.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++int zerofield inside struct starting with short:
-size=12,align=4
-offset-short=0,offset-last=8,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-long.out
deleted file mode 100644
index 9d5417298b8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-long.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-last=4,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-long.out++
deleted file mode 100644
index a0352fab50c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-long.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++long zerofield inside struct starting with short:
-size=12,align=4
-offset-short=0,offset-last=8,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-longlong.out
deleted file mode 100644
index 86b8b6f8900..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-longlong.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with short:
-size=12,align=4
-offset-short=0,offset-last=8,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-longlong.out++
deleted file mode 100644
index f1f8d5e8fd8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-longlong.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++longlong zerofield inside struct starting with short:
-size=24,align=8
-offset-short=0,offset-last=16,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-short.out
deleted file mode 100644
index e3a16ff5e20..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-short.out
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with short:
-size=8,align=4
-offset-short=0,offset-last=4,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-short.out++
deleted file mode 100644
index a03fc27c67a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-short-zf-short.out++
+++ /dev/null
@@ -1,4 +0,0 @@
-+++short zerofield inside struct starting with short:
-size=12,align=4
-offset-short=0,offset-last=8,
-align-short=2,align-last=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-char.out
deleted file mode 100644
index ef07893b10c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-char:
-size=8,align=4,offset-size_t=0,offset-char=4,
-align-size_t=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-char.out++
deleted file mode 100644
index ef07893b10c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-char:
-size=8,align=4,offset-size_t=0,offset-char=4,
-align-size_t=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-double.out
deleted file mode 100644
index bf6d5cb8180..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-double:
-size=16,align=8,offset-size_t=0,offset-double=8,
-align-size_t=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-double.out++
deleted file mode 100644
index bf6d5cb8180..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-double:
-size=16,align=8,offset-size_t=0,offset-double=8,
-align-size_t=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-float.out
deleted file mode 100644
index 6923a51cb4b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-float:
-size=8,align=4,offset-size_t=0,offset-float=4,
-align-size_t=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-float.out++
deleted file mode 100644
index 6923a51cb4b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-float:
-size=8,align=4,offset-size_t=0,offset-float=4,
-align-size_t=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-int.out
deleted file mode 100644
index 3434dbddb88..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-int:
-size=8,align=4,offset-size_t=0,offset-int=4,
-align-size_t=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-int.out++
deleted file mode 100644
index 3434dbddb88..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-int:
-size=8,align=4,offset-size_t=0,offset-int=4,
-align-size_t=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-long.out
deleted file mode 100644
index 37fc119a1af..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-long:
-size=8,align=4,offset-size_t=0,offset-long=4,
-align-size_t=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-long.out++
deleted file mode 100644
index 37fc119a1af..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-long:
-size=8,align=4,offset-size_t=0,offset-long=4,
-align-size_t=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longdouble.out
deleted file mode 100644
index 50a492e880b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-longdouble:
-size=32,align=16,offset-size_t=0,offset-longdouble=16,
-align-size_t=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longdouble.out++
deleted file mode 100644
index 50a492e880b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-longdouble:
-size=32,align=16,offset-size_t=0,offset-longdouble=16,
-align-size_t=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longlong.out
deleted file mode 100644
index 5b4f797bee7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-longlong:
-size=16,align=8,offset-size_t=0,offset-longlong=8,
-align-size_t=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longlong.out++
deleted file mode 100644
index 5b4f797bee7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-longlong:
-size=16,align=8,offset-size_t=0,offset-longlong=8,
-align-size_t=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-pointer.out
deleted file mode 100644
index f032c321c97..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-pointer:
-size=8,align=4,offset-size_t=0,offset-pointer=4,
-align-size_t=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-pointer.out++
deleted file mode 100644
index f032c321c97..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-pointer:
-size=8,align=4,offset-size_t=0,offset-pointer=4,
-align-size_t=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-ptrdiff_t.out
deleted file mode 100644
index 73eacea4fef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-ptrdiff_t:
-size=8,align=4,offset-size_t=0,offset-ptrdiff_t=4,
-align-size_t=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-ptrdiff_t.out++
deleted file mode 100644
index 73eacea4fef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-ptrdiff_t:
-size=8,align=4,offset-size_t=0,offset-ptrdiff_t=4,
-align-size_t=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-short.out
deleted file mode 100644
index 71bb0249b45..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-short:
-size=8,align=4,offset-size_t=0,offset-short=4,
-align-size_t=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-short.out++
deleted file mode 100644
index 71bb0249b45..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-short:
-size=8,align=4,offset-size_t=0,offset-short=4,
-align-size_t=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-size_t.out
deleted file mode 100644
index 40db239e1d7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-size_t:
-size=8,align=4,offset-size_t=0,offset-size_t=4,
-align-size_t=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-size_t.out++
deleted file mode 100644
index 40db239e1d7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-size_t:
-size=8,align=4,offset-size_t=0,offset-size_t=4,
-align-size_t=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-wchar_t.out
deleted file mode 100644
index e78427cf119..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-wchar_t:
-size=8,align=4,offset-size_t=0,offset-wchar_t=4,
-align-size_t=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-wchar_t.out++
deleted file mode 100644
index e78427cf119..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-size_t-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct size_t-wchar_t:
-size=8,align=4,offset-size_t=0,offset-wchar_t=4,
-align-size_t=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-char.out
deleted file mode 100644
index 128f720e388..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-char.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-char:
-size=8,align=4,offset-wchar_t=0,offset-char=4,
-align-wchar_t=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-char.out++
deleted file mode 100644
index 128f720e388..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-char.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-char:
-size=8,align=4,offset-wchar_t=0,offset-char=4,
-align-wchar_t=4,align-char=1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-double.out
deleted file mode 100644
index 7378b39d73c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-double.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-double:
-size=16,align=8,offset-wchar_t=0,offset-double=8,
-align-wchar_t=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-double.out++
deleted file mode 100644
index 7378b39d73c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-double.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-double:
-size=16,align=8,offset-wchar_t=0,offset-double=8,
-align-wchar_t=4,align-double=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-float.out
deleted file mode 100644
index 0d771ad6d17..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-float.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-float:
-size=8,align=4,offset-wchar_t=0,offset-float=4,
-align-wchar_t=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-float.out++
deleted file mode 100644
index 0d771ad6d17..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-float.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-float:
-size=8,align=4,offset-wchar_t=0,offset-float=4,
-align-wchar_t=4,align-float=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-int.out
deleted file mode 100644
index 963286aa3cd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-int.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-int:
-size=8,align=4,offset-wchar_t=0,offset-int=4,
-align-wchar_t=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-int.out++
deleted file mode 100644
index 963286aa3cd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-int.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-int:
-size=8,align=4,offset-wchar_t=0,offset-int=4,
-align-wchar_t=4,align-int=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-long.out
deleted file mode 100644
index 54cb149a63c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-long.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-long:
-size=8,align=4,offset-wchar_t=0,offset-long=4,
-align-wchar_t=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-long.out++
deleted file mode 100644
index 54cb149a63c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-long.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-long:
-size=8,align=4,offset-wchar_t=0,offset-long=4,
-align-wchar_t=4,align-long=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longdouble.out
deleted file mode 100644
index 909a886f1b2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longdouble.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-longdouble:
-size=32,align=16,offset-wchar_t=0,offset-longdouble=16,
-align-wchar_t=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longdouble.out++
deleted file mode 100644
index 909a886f1b2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longdouble.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-longdouble:
-size=32,align=16,offset-wchar_t=0,offset-longdouble=16,
-align-wchar_t=4,align-longdouble=16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longlong.out
deleted file mode 100644
index f5889532edb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longlong.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-longlong:
-size=16,align=8,offset-wchar_t=0,offset-longlong=8,
-align-wchar_t=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longlong.out++
deleted file mode 100644
index f5889532edb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-longlong.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-longlong:
-size=16,align=8,offset-wchar_t=0,offset-longlong=8,
-align-wchar_t=4,align-longlong=8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-pointer.out
deleted file mode 100644
index 7a4b3bf646d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-pointer.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-pointer:
-size=8,align=4,offset-wchar_t=0,offset-pointer=4,
-align-wchar_t=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-pointer.out++
deleted file mode 100644
index 7a4b3bf646d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-pointer.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-pointer:
-size=8,align=4,offset-wchar_t=0,offset-pointer=4,
-align-wchar_t=4,align-pointer=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-ptrdiff_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-ptrdiff_t.out
deleted file mode 100644
index ed9881afb1a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-ptrdiff_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-ptrdiff_t:
-size=8,align=4,offset-wchar_t=0,offset-ptrdiff_t=4,
-align-wchar_t=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-ptrdiff_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-ptrdiff_t.out++
deleted file mode 100644
index ed9881afb1a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-ptrdiff_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-ptrdiff_t:
-size=8,align=4,offset-wchar_t=0,offset-ptrdiff_t=4,
-align-wchar_t=4,align-ptrdiff_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-short.out
deleted file mode 100644
index cb5523447a3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-short.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-short:
-size=8,align=4,offset-wchar_t=0,offset-short=4,
-align-wchar_t=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-short.out++
deleted file mode 100644
index cb5523447a3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-short.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-short:
-size=8,align=4,offset-wchar_t=0,offset-short=4,
-align-wchar_t=4,align-short=2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-size_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-size_t.out
deleted file mode 100644
index c2ab4e3cb54..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-size_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-size_t:
-size=8,align=4,offset-wchar_t=0,offset-size_t=4,
-align-wchar_t=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-size_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-size_t.out++
deleted file mode 100644
index c2ab4e3cb54..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-size_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-size_t:
-size=8,align=4,offset-wchar_t=0,offset-size_t=4,
-align-wchar_t=4,align-size_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-wchar_t.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-wchar_t.out
deleted file mode 100644
index 359cadbbbbc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-wchar_t.out
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-wchar_t:
-size=8,align=4,offset-wchar_t=0,offset-wchar_t=4,
-align-wchar_t=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-wchar_t.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-wchar_t.out++
deleted file mode 100644
index 359cadbbbbc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/s-wchar_t-wchar_t.out++
+++ /dev/null
@@ -1,3 +0,0 @@
-+++Struct wchar_t-wchar_t:
-size=8,align=4,offset-wchar_t=0,offset-wchar_t=4,
-align-wchar_t=4,align-wchar_t=4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-bool.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-bool.out++
deleted file mode 100644
index 7dd64d98fde..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-bool.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Bool size:
-1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-char.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-char.out
deleted file mode 100644
index ea4dd650cdd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-char.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Char size:
-1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-char.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-char.out++
deleted file mode 100644
index ea4dd650cdd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-char.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Char size:
-1
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-double.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-double.out
deleted file mode 100644
index 24816ee22e9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-double.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Double size:
-8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-double.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-double.out++
deleted file mode 100644
index 24816ee22e9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-double.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Double size:
-8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-float.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-float.out
deleted file mode 100644
index 8a721cde77e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-float.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Float size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-float.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-float.out++
deleted file mode 100644
index 8a721cde77e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-float.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Float size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-int.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-int.out
deleted file mode 100644
index f5db1cc19d6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-int.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Int size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-int.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-int.out++
deleted file mode 100644
index f5db1cc19d6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-int.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Int size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-long.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-long.out
deleted file mode 100644
index dd3c7d595ee..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-long.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-long.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-long.out++
deleted file mode 100644
index dd3c7d595ee..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-long.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longdouble.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longdouble.out
deleted file mode 100644
index ff7d41c8d4e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longdouble.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long Double size:
-16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longdouble.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longdouble.out++
deleted file mode 100644
index ff7d41c8d4e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longdouble.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long Double size:
-16
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longlong.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longlong.out
deleted file mode 100644
index 0c69b340e15..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longlong.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long long size:
-8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longlong.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longlong.out++
deleted file mode 100644
index 0c69b340e15..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-longlong.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Long long size:
-8
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-pointer.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-pointer.out
deleted file mode 100644
index b0242248482..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-pointer.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Pointer size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-pointer.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-pointer.out++
deleted file mode 100644
index b0242248482..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-pointer.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Pointer size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-ptrdiff.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-ptrdiff.out
deleted file mode 100644
index de520e21172..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-ptrdiff.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++ptrdiff_t size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-ptrdiff.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-ptrdiff.out++
deleted file mode 100644
index de520e21172..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-ptrdiff.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++ptrdiff_t size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-short.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-short.out
deleted file mode 100644
index 308f676d678..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-short.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Short size:
-2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-short.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-short.out++
deleted file mode 100644
index 308f676d678..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-short.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++Short size:
-2
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-size.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-size.out
deleted file mode 100644
index 4a1c74fa287..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-size.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++size_t size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-size.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-size.out++
deleted file mode 100644
index 4a1c74fa287..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-size.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++size_t size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-wchar.out b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-wchar.out
deleted file mode 100644
index 0d13a603c5c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-wchar.out
+++ /dev/null
@@ -1,2 +0,0 @@
-+++wchar_t size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-wchar.out++ b/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-wchar.out++
deleted file mode 100644
index 0d13a603c5c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/i960-97r2-results/size-wchar.out++
+++ /dev/null
@@ -1,2 +0,0 @@
-+++wchar_t size:
-4
diff --git a/gcc/testsuite/consistency.vlad/layout/minimal-struct-size-align.c b/gcc/testsuite/consistency.vlad/layout/minimal-struct-size-align.c
deleted file mode 100644
index 131ea4d41d8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/minimal-struct-size-align.c
+++ /dev/null
@@ -1,551 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct {} s0;
-static union {} u0;
-static struct {int :0;} s1;
-static union {int :0;} u1;
-static struct {char m;} s2;
-static union {char m;} u2;
-static struct {short m;} s3;
-static union {short m;} u3;
-static struct {int m;} s4;
-static union {int m;} u4;
-static struct {long m;} s5;
-static union {long m;} u5;
-static struct {long long m;} s6;
-static union {long long m;} u6;
-static struct {char * m;} s7;
-static union {char * m;} u7;
-static struct {float m;} s8;
-static union {float m;} u8;
-static struct {double m;} s9;
-static union {double m;} u9;
-static struct {long double m;} s10;
-static union {long double m;} u10;
-static struct {ptrdiff_t m;} s11;
-static union {ptrdiff_t m;} u11;
-static struct {size_t m;} s12;
-static union {size_t m;} u12;
-static struct {wchar_t m;} s13;
-static union {wchar_t m;} u13;
-static struct {struct {char m;}m;} s14;
-static union {struct {char m;}m;} u14;
-static struct {union {char m;}m;} s15;
-static union {union {char m;}m;} u15;
-static struct {struct {short m;}m;} s16;
-static union {struct {short m;}m;} u16;
-static struct {union {short m;}m;} s17;
-static union {union {short m;}m;} u17;
-static struct {struct {int m;}m;} s18;
-static union {struct {int m;}m;} u18;
-static struct {union {int m;}m;} s19;
-static union {union {int m;}m;} u19;
-static struct {struct {long m;}m;} s20;
-static union {struct {long m;}m;} u20;
-static struct {union {long m;}m;} s21;
-static union {union {long m;}m;} u21;
-static struct {struct {long long m;}m;} s22;
-static union {struct {long long m;}m;} u22;
-static struct {union {long long m;}m;} s23;
-static union {union {long long m;}m;} u23;
-static struct {struct {char * m;}m;} s24;
-static union {struct {char * m;}m;} u24;
-static struct {union {char * m;}m;} s25;
-static union {union {char * m;}m;} u25;
-static struct {struct {float m;}m;} s26;
-static union {struct {float m;}m;} u26;
-static struct {union {float m;}m;} s27;
-static union {union {float m;}m;} u27;
-static struct {struct {double m;}m;} s28;
-static union {struct {double m;}m;} u28;
-static struct {union {double m;}m;} s29;
-static union {union {double m;}m;} u29;
-static struct {struct {long double m;}m;} s30;
-static union {struct {long double m;}m;} u30;
-static struct {union {long double m;}m;} s31;
-static union {union {long double m;}m;} u31;
-static struct {struct {ptrdiff_t m;}m;} s32;
-static union {struct {ptrdiff_t m;}m;} u32;
-static struct {union {ptrdiff_t m;}m;} s33;
-static union {union {ptrdiff_t m;}m;} u33;
-static struct {struct {size_t m;}m;} s34;
-static union {struct {size_t m;}m;} u34;
-static struct {union {size_t m;}m;} s35;
-static union {union {size_t m;}m;} u35;
-static struct {struct {wchar_t m;}m;} s36;
-static union {struct {wchar_t m;}m;} u36;
-static struct {union {wchar_t m;}m;} s37;
-static union {union {wchar_t m;}m;} u37;
-static struct {struct {}m;} s38;
-static union {struct {}m;} u38;
-static struct {union {}m;} s39;
-static union {union {}m;} u39;
-static struct {struct {int :0;}m;} s40;
-static union {struct {int :0;}m;} u40;
-static struct {union {int :0;}m;} s41;
-static union {union {int :0;}m;} u41;
-static struct {char m [0];} s42;
-static union {char m [0];} u42;
-static struct {short m [0];} s43;
-static union {short m [0];} u43;
-static struct {int m [0];} s44;
-static union {int m [0];} u44;
-static struct {long m [0];} s45;
-static union {long m [0];} u45;
-static struct {long long m [0];} s46;
-static union {long long m [0];} u46;
-static struct {char * m [0];} s47;
-static union {char * m [0];} u47;
-static struct {float m [0];} s48;
-static union {float m [0];} u48;
-static struct {double m [0];} s49;
-static union {double m [0];} u49;
-static struct {long double m [0];} s50;
-static union {long double m [0];} u50;
-static struct {ptrdiff_t m [0];} s51;
-static union {ptrdiff_t m [0];} u51;
-static struct {size_t m [0];} s52;
-static union {size_t m [0];} u52;
-static struct {wchar_t m [0];} s53;
-static union {wchar_t m [0];} u53;
-int main (void) {
-  int min_size = 0;
-  int min_align = 0;
-  printf ("+++Minimal struct size/alignment:\n");
-  if (min_size > sizeof (s0))
-     min_size = sizeof (s0);
-  if (min_align > __alignof__ (s0))
-     min_align = __alignof__ (s0);
-  if (min_size > sizeof (u0))
-     min_size = sizeof (u0);
-  if (min_align > __alignof__ (u0))
-     min_align = __alignof__ (u0);
-  if (min_size > sizeof (s1))
-     min_size = sizeof (s1);
-  if (min_align > __alignof__ (s1))
-     min_align = __alignof__ (s1);
-  if (min_size > sizeof (u1))
-     min_size = sizeof (u1);
-  if (min_align > __alignof__ (u1))
-     min_align = __alignof__ (u1);
-  if (min_size > sizeof (s2))
-     min_size = sizeof (s2);
-  if (min_align > __alignof__ (s2))
-     min_align = __alignof__ (s2);
-  if (min_size > sizeof (u2))
-     min_size = sizeof (u2);
-  if (min_align > __alignof__ (u2))
-     min_align = __alignof__ (u2);
-  if (min_size > sizeof (s3))
-     min_size = sizeof (s3);
-  if (min_align > __alignof__ (s3))
-     min_align = __alignof__ (s3);
-  if (min_size > sizeof (u3))
-     min_size = sizeof (u3);
-  if (min_align > __alignof__ (u3))
-     min_align = __alignof__ (u3);
-  if (min_size > sizeof (s4))
-     min_size = sizeof (s4);
-  if (min_align > __alignof__ (s4))
-     min_align = __alignof__ (s4);
-  if (min_size > sizeof (u4))
-     min_size = sizeof (u4);
-  if (min_align > __alignof__ (u4))
-     min_align = __alignof__ (u4);
-  if (min_size > sizeof (s5))
-     min_size = sizeof (s5);
-  if (min_align > __alignof__ (s5))
-     min_align = __alignof__ (s5);
-  if (min_size > sizeof (u5))
-     min_size = sizeof (u5);
-  if (min_align > __alignof__ (u5))
-     min_align = __alignof__ (u5);
-  if (min_size > sizeof (s6))
-     min_size = sizeof (s6);
-  if (min_align > __alignof__ (s6))
-     min_align = __alignof__ (s6);
-  if (min_size > sizeof (u6))
-     min_size = sizeof (u6);
-  if (min_align > __alignof__ (u6))
-     min_align = __alignof__ (u6);
-  if (min_size > sizeof (s7))
-     min_size = sizeof (s7);
-  if (min_align > __alignof__ (s7))
-     min_align = __alignof__ (s7);
-  if (min_size > sizeof (u7))
-     min_size = sizeof (u7);
-  if (min_align > __alignof__ (u7))
-     min_align = __alignof__ (u7);
-  if (min_size > sizeof (s8))
-     min_size = sizeof (s8);
-  if (min_align > __alignof__ (s8))
-     min_align = __alignof__ (s8);
-  if (min_size > sizeof (u8))
-     min_size = sizeof (u8);
-  if (min_align > __alignof__ (u8))
-     min_align = __alignof__ (u8);
-  if (min_size > sizeof (s9))
-     min_size = sizeof (s9);
-  if (min_align > __alignof__ (s9))
-     min_align = __alignof__ (s9);
-  if (min_size > sizeof (u9))
-     min_size = sizeof (u9);
-  if (min_align > __alignof__ (u9))
-     min_align = __alignof__ (u9);
-  if (min_size > sizeof (s10))
-     min_size = sizeof (s10);
-  if (min_align > __alignof__ (s10))
-     min_align = __alignof__ (s10);
-  if (min_size > sizeof (u10))
-     min_size = sizeof (u10);
-  if (min_align > __alignof__ (u10))
-     min_align = __alignof__ (u10);
-  if (min_size > sizeof (s11))
-     min_size = sizeof (s11);
-  if (min_align > __alignof__ (s11))
-     min_align = __alignof__ (s11);
-  if (min_size > sizeof (u11))
-     min_size = sizeof (u11);
-  if (min_align > __alignof__ (u11))
-     min_align = __alignof__ (u11);
-  if (min_size > sizeof (s12))
-     min_size = sizeof (s12);
-  if (min_align > __alignof__ (s12))
-     min_align = __alignof__ (s12);
-  if (min_size > sizeof (u12))
-     min_size = sizeof (u12);
-  if (min_align > __alignof__ (u12))
-     min_align = __alignof__ (u12);
-  if (min_size > sizeof (s13))
-     min_size = sizeof (s13);
-  if (min_align > __alignof__ (s13))
-     min_align = __alignof__ (s13);
-  if (min_size > sizeof (u13))
-     min_size = sizeof (u13);
-  if (min_align > __alignof__ (u13))
-     min_align = __alignof__ (u13);
-  if (min_size > sizeof (s14))
-     min_size = sizeof (s14);
-  if (min_align > __alignof__ (s14))
-     min_align = __alignof__ (s14);
-  if (min_size > sizeof (u14))
-     min_size = sizeof (u14);
-  if (min_align > __alignof__ (u14))
-     min_align = __alignof__ (u14);
-  if (min_size > sizeof (s15))
-     min_size = sizeof (s15);
-  if (min_align > __alignof__ (s15))
-     min_align = __alignof__ (s15);
-  if (min_size > sizeof (u15))
-     min_size = sizeof (u15);
-  if (min_align > __alignof__ (u15))
-     min_align = __alignof__ (u15);
-  if (min_size > sizeof (s16))
-     min_size = sizeof (s16);
-  if (min_align > __alignof__ (s16))
-     min_align = __alignof__ (s16);
-  if (min_size > sizeof (u16))
-     min_size = sizeof (u16);
-  if (min_align > __alignof__ (u16))
-     min_align = __alignof__ (u16);
-  if (min_size > sizeof (s17))
-     min_size = sizeof (s17);
-  if (min_align > __alignof__ (s17))
-     min_align = __alignof__ (s17);
-  if (min_size > sizeof (u17))
-     min_size = sizeof (u17);
-  if (min_align > __alignof__ (u17))
-     min_align = __alignof__ (u17);
-  if (min_size > sizeof (s18))
-     min_size = sizeof (s18);
-  if (min_align > __alignof__ (s18))
-     min_align = __alignof__ (s18);
-  if (min_size > sizeof (u18))
-     min_size = sizeof (u18);
-  if (min_align > __alignof__ (u18))
-     min_align = __alignof__ (u18);
-  if (min_size > sizeof (s19))
-     min_size = sizeof (s19);
-  if (min_align > __alignof__ (s19))
-     min_align = __alignof__ (s19);
-  if (min_size > sizeof (u19))
-     min_size = sizeof (u19);
-  if (min_align > __alignof__ (u19))
-     min_align = __alignof__ (u19);
-  if (min_size > sizeof (s20))
-     min_size = sizeof (s20);
-  if (min_align > __alignof__ (s20))
-     min_align = __alignof__ (s20);
-  if (min_size > sizeof (u20))
-     min_size = sizeof (u20);
-  if (min_align > __alignof__ (u20))
-     min_align = __alignof__ (u20);
-  if (min_size > sizeof (s21))
-     min_size = sizeof (s21);
-  if (min_align > __alignof__ (s21))
-     min_align = __alignof__ (s21);
-  if (min_size > sizeof (u21))
-     min_size = sizeof (u21);
-  if (min_align > __alignof__ (u21))
-     min_align = __alignof__ (u21);
-  if (min_size > sizeof (s22))
-     min_size = sizeof (s22);
-  if (min_align > __alignof__ (s22))
-     min_align = __alignof__ (s22);
-  if (min_size > sizeof (u22))
-     min_size = sizeof (u22);
-  if (min_align > __alignof__ (u22))
-     min_align = __alignof__ (u22);
-  if (min_size > sizeof (s23))
-     min_size = sizeof (s23);
-  if (min_align > __alignof__ (s23))
-     min_align = __alignof__ (s23);
-  if (min_size > sizeof (u23))
-     min_size = sizeof (u23);
-  if (min_align > __alignof__ (u23))
-     min_align = __alignof__ (u23);
-  if (min_size > sizeof (s24))
-     min_size = sizeof (s24);
-  if (min_align > __alignof__ (s24))
-     min_align = __alignof__ (s24);
-  if (min_size > sizeof (u24))
-     min_size = sizeof (u24);
-  if (min_align > __alignof__ (u24))
-     min_align = __alignof__ (u24);
-  if (min_size > sizeof (s25))
-     min_size = sizeof (s25);
-  if (min_align > __alignof__ (s25))
-     min_align = __alignof__ (s25);
-  if (min_size > sizeof (u25))
-     min_size = sizeof (u25);
-  if (min_align > __alignof__ (u25))
-     min_align = __alignof__ (u25);
-  if (min_size > sizeof (s26))
-     min_size = sizeof (s26);
-  if (min_align > __alignof__ (s26))
-     min_align = __alignof__ (s26);
-  if (min_size > sizeof (u26))
-     min_size = sizeof (u26);
-  if (min_align > __alignof__ (u26))
-     min_align = __alignof__ (u26);
-  if (min_size > sizeof (s27))
-     min_size = sizeof (s27);
-  if (min_align > __alignof__ (s27))
-     min_align = __alignof__ (s27);
-  if (min_size > sizeof (u27))
-     min_size = sizeof (u27);
-  if (min_align > __alignof__ (u27))
-     min_align = __alignof__ (u27);
-  if (min_size > sizeof (s28))
-     min_size = sizeof (s28);
-  if (min_align > __alignof__ (s28))
-     min_align = __alignof__ (s28);
-  if (min_size > sizeof (u28))
-     min_size = sizeof (u28);
-  if (min_align > __alignof__ (u28))
-     min_align = __alignof__ (u28);
-  if (min_size > sizeof (s29))
-     min_size = sizeof (s29);
-  if (min_align > __alignof__ (s29))
-     min_align = __alignof__ (s29);
-  if (min_size > sizeof (u29))
-     min_size = sizeof (u29);
-  if (min_align > __alignof__ (u29))
-     min_align = __alignof__ (u29);
-  if (min_size > sizeof (s30))
-     min_size = sizeof (s30);
-  if (min_align > __alignof__ (s30))
-     min_align = __alignof__ (s30);
-  if (min_size > sizeof (u30))
-     min_size = sizeof (u30);
-  if (min_align > __alignof__ (u30))
-     min_align = __alignof__ (u30);
-  if (min_size > sizeof (s31))
-     min_size = sizeof (s31);
-  if (min_align > __alignof__ (s31))
-     min_align = __alignof__ (s31);
-  if (min_size > sizeof (u31))
-     min_size = sizeof (u31);
-  if (min_align > __alignof__ (u31))
-     min_align = __alignof__ (u31);
-  if (min_size > sizeof (s32))
-     min_size = sizeof (s32);
-  if (min_align > __alignof__ (s32))
-     min_align = __alignof__ (s32);
-  if (min_size > sizeof (u32))
-     min_size = sizeof (u32);
-  if (min_align > __alignof__ (u32))
-     min_align = __alignof__ (u32);
-  if (min_size > sizeof (s33))
-     min_size = sizeof (s33);
-  if (min_align > __alignof__ (s33))
-     min_align = __alignof__ (s33);
-  if (min_size > sizeof (u33))
-     min_size = sizeof (u33);
-  if (min_align > __alignof__ (u33))
-     min_align = __alignof__ (u33);
-  if (min_size > sizeof (s34))
-     min_size = sizeof (s34);
-  if (min_align > __alignof__ (s34))
-     min_align = __alignof__ (s34);
-  if (min_size > sizeof (u34))
-     min_size = sizeof (u34);
-  if (min_align > __alignof__ (u34))
-     min_align = __alignof__ (u34);
-  if (min_size > sizeof (s35))
-     min_size = sizeof (s35);
-  if (min_align > __alignof__ (s35))
-     min_align = __alignof__ (s35);
-  if (min_size > sizeof (u35))
-     min_size = sizeof (u35);
-  if (min_align > __alignof__ (u35))
-     min_align = __alignof__ (u35);
-  if (min_size > sizeof (s36))
-     min_size = sizeof (s36);
-  if (min_align > __alignof__ (s36))
-     min_align = __alignof__ (s36);
-  if (min_size > sizeof (u36))
-     min_size = sizeof (u36);
-  if (min_align > __alignof__ (u36))
-     min_align = __alignof__ (u36);
-  if (min_size > sizeof (s37))
-     min_size = sizeof (s37);
-  if (min_align > __alignof__ (s37))
-     min_align = __alignof__ (s37);
-  if (min_size > sizeof (u37))
-     min_size = sizeof (u37);
-  if (min_align > __alignof__ (u37))
-     min_align = __alignof__ (u37);
-  if (min_size > sizeof (s38))
-     min_size = sizeof (s38);
-  if (min_align > __alignof__ (s38))
-     min_align = __alignof__ (s38);
-  if (min_size > sizeof (u38))
-     min_size = sizeof (u38);
-  if (min_align > __alignof__ (u38))
-     min_align = __alignof__ (u38);
-  if (min_size > sizeof (s39))
-     min_size = sizeof (s39);
-  if (min_align > __alignof__ (s39))
-     min_align = __alignof__ (s39);
-  if (min_size > sizeof (u39))
-     min_size = sizeof (u39);
-  if (min_align > __alignof__ (u39))
-     min_align = __alignof__ (u39);
-  if (min_size > sizeof (s40))
-     min_size = sizeof (s40);
-  if (min_align > __alignof__ (s40))
-     min_align = __alignof__ (s40);
-  if (min_size > sizeof (u40))
-     min_size = sizeof (u40);
-  if (min_align > __alignof__ (u40))
-     min_align = __alignof__ (u40);
-  if (min_size > sizeof (s41))
-     min_size = sizeof (s41);
-  if (min_align > __alignof__ (s41))
-     min_align = __alignof__ (s41);
-  if (min_size > sizeof (u41))
-     min_size = sizeof (u41);
-  if (min_align > __alignof__ (u41))
-     min_align = __alignof__ (u41);
-  if (min_size > sizeof (s42))
-     min_size = sizeof (s42);
-  if (min_align > __alignof__ (s42))
-     min_align = __alignof__ (s42);
-  if (min_size > sizeof (u42))
-     min_size = sizeof (u42);
-  if (min_align > __alignof__ (u42))
-     min_align = __alignof__ (u42);
-  if (min_size > sizeof (s43))
-     min_size = sizeof (s43);
-  if (min_align > __alignof__ (s43))
-     min_align = __alignof__ (s43);
-  if (min_size > sizeof (u43))
-     min_size = sizeof (u43);
-  if (min_align > __alignof__ (u43))
-     min_align = __alignof__ (u43);
-  if (min_size > sizeof (s44))
-     min_size = sizeof (s44);
-  if (min_align > __alignof__ (s44))
-     min_align = __alignof__ (s44);
-  if (min_size > sizeof (u44))
-     min_size = sizeof (u44);
-  if (min_align > __alignof__ (u44))
-     min_align = __alignof__ (u44);
-  if (min_size > sizeof (s45))
-     min_size = sizeof (s45);
-  if (min_align > __alignof__ (s45))
-     min_align = __alignof__ (s45);
-  if (min_size > sizeof (u45))
-     min_size = sizeof (u45);
-  if (min_align > __alignof__ (u45))
-     min_align = __alignof__ (u45);
-  if (min_size > sizeof (s46))
-     min_size = sizeof (s46);
-  if (min_align > __alignof__ (s46))
-     min_align = __alignof__ (s46);
-  if (min_size > sizeof (u46))
-     min_size = sizeof (u46);
-  if (min_align > __alignof__ (u46))
-     min_align = __alignof__ (u46);
-  if (min_size > sizeof (s47))
-     min_size = sizeof (s47);
-  if (min_align > __alignof__ (s47))
-     min_align = __alignof__ (s47);
-  if (min_size > sizeof (u47))
-     min_size = sizeof (u47);
-  if (min_align > __alignof__ (u47))
-     min_align = __alignof__ (u47);
-  if (min_size > sizeof (s48))
-     min_size = sizeof (s48);
-  if (min_align > __alignof__ (s48))
-     min_align = __alignof__ (s48);
-  if (min_size > sizeof (u48))
-     min_size = sizeof (u48);
-  if (min_align > __alignof__ (u48))
-     min_align = __alignof__ (u48);
-  if (min_size > sizeof (s49))
-     min_size = sizeof (s49);
-  if (min_align > __alignof__ (s49))
-     min_align = __alignof__ (s49);
-  if (min_size > sizeof (u49))
-     min_size = sizeof (u49);
-  if (min_align > __alignof__ (u49))
-     min_align = __alignof__ (u49);
-  if (min_size > sizeof (s50))
-     min_size = sizeof (s50);
-  if (min_align > __alignof__ (s50))
-     min_align = __alignof__ (s50);
-  if (min_size > sizeof (u50))
-     min_size = sizeof (u50);
-  if (min_align > __alignof__ (u50))
-     min_align = __alignof__ (u50);
-  if (min_size > sizeof (s51))
-     min_size = sizeof (s51);
-  if (min_align > __alignof__ (s51))
-     min_align = __alignof__ (s51);
-  if (min_size > sizeof (u51))
-     min_size = sizeof (u51);
-  if (min_align > __alignof__ (u51))
-     min_align = __alignof__ (u51);
-  if (min_size > sizeof (s52))
-     min_size = sizeof (s52);
-  if (min_align > __alignof__ (s52))
-     min_align = __alignof__ (s52);
-  if (min_size > sizeof (u52))
-     min_size = sizeof (u52);
-  if (min_align > __alignof__ (u52))
-     min_align = __alignof__ (u52);
-  if (min_size > sizeof (s53))
-     min_size = sizeof (s53);
-  if (min_align > __alignof__ (s53))
-     min_align = __alignof__ (s53);
-  if (min_size > sizeof (u53))
-     min_size = sizeof (u53);
-  if (min_align > __alignof__ (u53))
-     min_align = __alignof__ (u53);
-  printf ("min struct/union size =%d\n", min_size);
-  printf ("min struct/union align=%d\n", min_align);
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-char.c
deleted file mode 100644
index 886e134170d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-char=%d,\nalign-char=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-double.c
deleted file mode 100644
index 6338e4abaae..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-double=%d,\nalign-char=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-float.c
deleted file mode 100644
index cdd7e8364ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-float=%d,\nalign-char=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-int.c
deleted file mode 100644
index cebc12422b8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-int=%d,\nalign-char=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-long.c
deleted file mode 100644
index fb9f9fa984f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-long=%d,\nalign-char=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-longdouble.c
deleted file mode 100644
index 432ad94ea1a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-longdouble=%d,\nalign-char=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-longlong.c
deleted file mode 100644
index bd35aa75dfe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-longlong=%d,\nalign-char=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-pointer.c
deleted file mode 100644
index 44d1d89a712..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-pointer=%d,\nalign-char=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-char-a-short.c
deleted file mode 100644
index 44d72831e1b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with char:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-arrayof-short=%d,\nalign-char=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-char.c b/gcc/testsuite/consistency.vlad/layout/s-char-char.c
deleted file mode 100644
index f4474846629..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-char:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-char=%d,\nalign-char=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-double.c b/gcc/testsuite/consistency.vlad/layout/s-char-double.c
deleted file mode 100644
index abaafcea2ef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-double:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-double=%d,\nalign-char=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-float.c b/gcc/testsuite/consistency.vlad/layout/s-char-float.c
deleted file mode 100644
index 3eba9e01119..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-float:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-float=%d,\nalign-char=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-int.c b/gcc/testsuite/consistency.vlad/layout/s-char-int.c
deleted file mode 100644
index 902569927cb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-int:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-int=%d,\nalign-char=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-long.c b/gcc/testsuite/consistency.vlad/layout/s-char-long.c
deleted file mode 100644
index 870ea57bae0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-long:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-long=%d,\nalign-char=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-char-longdouble.c
deleted file mode 100644
index e47592d0fae..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-longdouble:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-longdouble=%d,\nalign-char=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-char-longlong.c
deleted file mode 100644
index 6f54929697d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-longlong:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-longlong=%d,\nalign-char=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-char-pointer.c
deleted file mode 100644
index 7fddf579a99..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-pointer:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-pointer=%d,\nalign-char=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-char-ptrdiff_t.c
deleted file mode 100644
index cbe070496b1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  char f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-ptrdiff_t=%d,\nalign-char=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-char.c
deleted file mode 100644
index df6072ac889..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-char=%d,\nalign-char=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-double.c
deleted file mode 100644
index 05e91de5e4d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-double=%d,\nalign-char=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-float.c
deleted file mode 100644
index 85f88e8fc1b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-float=%d,\nalign-char=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-int.c
deleted file mode 100644
index c858a8a8c2e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-int=%d,\nalign-char=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-long.c
deleted file mode 100644
index 996167d919a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-long=%d,\nalign-char=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-longdouble.c
deleted file mode 100644
index 3f02e3b241b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-longdouble=%d,\nalign-char=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-longlong.c
deleted file mode 100644
index 66bf67ffbd6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-longlong=%d,\nalign-char=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-pointer.c
deleted file mode 100644
index f0c5aa49dbf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-pointer=%d,\nalign-char=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-char-s-short.c
deleted file mode 100644
index 2612d708137..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-sss-short=%d,\nalign-char=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-short.c b/gcc/testsuite/consistency.vlad/layout/s-char-short.c
deleted file mode 100644
index e03bfe18db0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-short:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-short=%d,\nalign-char=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-char-size_t.c
deleted file mode 100644
index 69ada736db8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  char f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-size_t:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-size_t=%d,\nalign-char=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-char-wchar_t.c
deleted file mode 100644
index 01a8a4526bc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  char f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-char=%d,offset-wchar_t=%d,\nalign-char=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-char-zf-char.c
deleted file mode 100644
index 51f64679e47..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-last=%d,\nalign-char=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-char-zf-int.c
deleted file mode 100644
index 51b9aa8de56..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-last=%d,\nalign-char=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-char-zf-long.c
deleted file mode 100644
index e79fe8d63b2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-last=%d,\nalign-char=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-char-zf-longlong.c
deleted file mode 100644
index b80609b559b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-last=%d,\nalign-char=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-char-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-char-zf-short.c
deleted file mode 100644
index d11a3a99fba..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-char-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with char:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-char=%d,offset-last=%d,\nalign-char=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-char.c
deleted file mode 100644
index 868a42384a6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-char=%d,\nalign-double=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-double.c
deleted file mode 100644
index 0b221293a68..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-double=%d,\nalign-double=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-float.c
deleted file mode 100644
index dec9f2ad23c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-float=%d,\nalign-double=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-int.c
deleted file mode 100644
index 2b19b49266a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-int=%d,\nalign-double=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-long.c
deleted file mode 100644
index 01f1e227e4c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-long=%d,\nalign-double=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-longdouble.c
deleted file mode 100644
index ff1468ffae9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-longdouble=%d,\nalign-double=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-longlong.c
deleted file mode 100644
index 281289782d2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-longlong=%d,\nalign-double=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-pointer.c
deleted file mode 100644
index bdd5f1f9030..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-pointer=%d,\nalign-double=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-double-a-short.c
deleted file mode 100644
index 089dd9635af..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with double:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-arrayof-short=%d,\nalign-double=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-char.c b/gcc/testsuite/consistency.vlad/layout/s-double-char.c
deleted file mode 100644
index 7c7f184a81c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-char:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-char=%d,\nalign-double=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-double.c b/gcc/testsuite/consistency.vlad/layout/s-double-double.c
deleted file mode 100644
index 0c27309bfca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-double:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-double=%d,\nalign-double=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-float.c b/gcc/testsuite/consistency.vlad/layout/s-double-float.c
deleted file mode 100644
index 0dbbfef41cb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-float:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-float=%d,\nalign-double=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-int.c b/gcc/testsuite/consistency.vlad/layout/s-double-int.c
deleted file mode 100644
index ac9eec086db..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-int:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-int=%d,\nalign-double=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-long.c b/gcc/testsuite/consistency.vlad/layout/s-double-long.c
deleted file mode 100644
index 581c50f4fb6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-long:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-long=%d,\nalign-double=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-double-longdouble.c
deleted file mode 100644
index bf3312ec8ae..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-longdouble:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-longdouble=%d,\nalign-double=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-double-longlong.c
deleted file mode 100644
index 7d668b2ca22..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-longlong:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-longlong=%d,\nalign-double=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-double-pointer.c
deleted file mode 100644
index 61a183607f8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-pointer:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-pointer=%d,\nalign-double=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-double-ptrdiff_t.c
deleted file mode 100644
index c620e5dc112..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  double f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-ptrdiff_t=%d,\nalign-double=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-char.c
deleted file mode 100644
index edebed58a29..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-char=%d,\nalign-double=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-double.c
deleted file mode 100644
index a887c1f965b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-double=%d,\nalign-double=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-float.c
deleted file mode 100644
index c850fd6acc4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-float=%d,\nalign-double=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-int.c
deleted file mode 100644
index 963d82d9d16..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-int=%d,\nalign-double=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-long.c
deleted file mode 100644
index a0d80f76efe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-long=%d,\nalign-double=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-longdouble.c
deleted file mode 100644
index 8831bd405ef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-longdouble=%d,\nalign-double=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-longlong.c
deleted file mode 100644
index 4a3aa38916c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-longlong=%d,\nalign-double=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-pointer.c
deleted file mode 100644
index b1fbe7fd3c8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-pointer=%d,\nalign-double=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-double-s-short.c
deleted file mode 100644
index 3ea69cb366e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-sss-short=%d,\nalign-double=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-short.c b/gcc/testsuite/consistency.vlad/layout/s-double-short.c
deleted file mode 100644
index 2af075070b3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-short:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-short=%d,\nalign-double=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-double-size_t.c
deleted file mode 100644
index fd06b4277b0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  double f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-size_t:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-size_t=%d,\nalign-double=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-double-wchar_t.c
deleted file mode 100644
index cee104f1d59..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  double f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-double=%d,offset-wchar_t=%d,\nalign-double=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-double-zf-char.c
deleted file mode 100644
index 4f22db1fd90..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-last=%d,\nalign-double=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-double-zf-int.c
deleted file mode 100644
index cefb8efd970..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-last=%d,\nalign-double=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-double-zf-long.c
deleted file mode 100644
index 2a6dfa59e54..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-last=%d,\nalign-double=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-double-zf-longlong.c
deleted file mode 100644
index 544920245a6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-last=%d,\nalign-double=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-double-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-double-zf-short.c
deleted file mode 100644
index afb56ea8614..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-double-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  double f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with double:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-double=%d,offset-last=%d,\nalign-double=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-char.c
deleted file mode 100644
index 5aaf10792a9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-char=%d,\nalign-float=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-double.c
deleted file mode 100644
index df52dc60f2d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-double=%d,\nalign-float=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-float.c
deleted file mode 100644
index 66280b2da9d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-float=%d,\nalign-float=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-int.c
deleted file mode 100644
index db4346d1c8c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-int=%d,\nalign-float=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-long.c
deleted file mode 100644
index 4d4f0808ae6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-long=%d,\nalign-float=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-longdouble.c
deleted file mode 100644
index c70224ee65d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-longdouble=%d,\nalign-float=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-longlong.c
deleted file mode 100644
index efad28e7a52..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-longlong=%d,\nalign-float=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-pointer.c
deleted file mode 100644
index 6858593fabe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-pointer=%d,\nalign-float=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-float-a-short.c
deleted file mode 100644
index a9f95b8b026..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with float:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-arrayof-short=%d,\nalign-float=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-char.c b/gcc/testsuite/consistency.vlad/layout/s-float-char.c
deleted file mode 100644
index 8a553905f8d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-char:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-char=%d,\nalign-float=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-double.c b/gcc/testsuite/consistency.vlad/layout/s-float-double.c
deleted file mode 100644
index f671eda00b3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-double:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-double=%d,\nalign-float=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-float.c b/gcc/testsuite/consistency.vlad/layout/s-float-float.c
deleted file mode 100644
index 7b2b5b02e92..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-float:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-float=%d,\nalign-float=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-int.c b/gcc/testsuite/consistency.vlad/layout/s-float-int.c
deleted file mode 100644
index 9cfe30cfaae..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-int:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-int=%d,\nalign-float=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-long.c b/gcc/testsuite/consistency.vlad/layout/s-float-long.c
deleted file mode 100644
index 954aac8360d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-long:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-long=%d,\nalign-float=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-float-longdouble.c
deleted file mode 100644
index 79ea514b342..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-longdouble:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-longdouble=%d,\nalign-float=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-float-longlong.c
deleted file mode 100644
index 8b2c32ae6d9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-longlong:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-longlong=%d,\nalign-float=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-float-pointer.c
deleted file mode 100644
index db76fe6e691..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-pointer:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-pointer=%d,\nalign-float=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-float-ptrdiff_t.c
deleted file mode 100644
index ea1147cce5e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  float f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-ptrdiff_t=%d,\nalign-float=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-char.c
deleted file mode 100644
index 61ffa5518e1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-char=%d,\nalign-float=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-double.c
deleted file mode 100644
index d04f7692a5c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-double=%d,\nalign-float=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-float.c
deleted file mode 100644
index 6d8a681839f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-float=%d,\nalign-float=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-int.c
deleted file mode 100644
index 2df50798be2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-int=%d,\nalign-float=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-long.c
deleted file mode 100644
index 3a467857941..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-long=%d,\nalign-float=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-longdouble.c
deleted file mode 100644
index d69dcbbb785..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-longdouble=%d,\nalign-float=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-longlong.c
deleted file mode 100644
index 74eea3401e5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-longlong=%d,\nalign-float=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-pointer.c
deleted file mode 100644
index ea9a656cb3d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-pointer=%d,\nalign-float=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-float-s-short.c
deleted file mode 100644
index 8731e88e65f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-sss-short=%d,\nalign-float=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-short.c b/gcc/testsuite/consistency.vlad/layout/s-float-short.c
deleted file mode 100644
index 3c4db811b2a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-short:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-short=%d,\nalign-float=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-float-size_t.c
deleted file mode 100644
index 60370881344..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  float f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-size_t:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-size_t=%d,\nalign-float=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-float-wchar_t.c
deleted file mode 100644
index 1af58d5896c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  float f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-float=%d,offset-wchar_t=%d,\nalign-float=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-float-zf-char.c
deleted file mode 100644
index a9f3462b422..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-last=%d,\nalign-float=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-float-zf-int.c
deleted file mode 100644
index 3f7cc5b2921..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-last=%d,\nalign-float=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-float-zf-long.c
deleted file mode 100644
index 073eeb8c4cf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-last=%d,\nalign-float=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-float-zf-longlong.c
deleted file mode 100644
index 20b62f168f3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-last=%d,\nalign-float=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-float-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-float-zf-short.c
deleted file mode 100644
index 986fcb9ee8d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-float-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  float f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with float:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-float=%d,offset-last=%d,\nalign-float=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-char.c
deleted file mode 100644
index 8d9cd29e046..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-char=%d,\nalign-int=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-double.c
deleted file mode 100644
index 33ab1691533..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-double=%d,\nalign-int=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-float.c
deleted file mode 100644
index 90fcd0c2dec..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-float=%d,\nalign-int=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-int.c
deleted file mode 100644
index 37ebbef33c6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-int=%d,\nalign-int=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-long.c
deleted file mode 100644
index 9828aaaa527..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-long=%d,\nalign-int=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-longdouble.c
deleted file mode 100644
index 3dc534e3226..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-longdouble=%d,\nalign-int=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-longlong.c
deleted file mode 100644
index 129a61e35fc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-longlong=%d,\nalign-int=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-pointer.c
deleted file mode 100644
index cfa3a3ec82c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-pointer=%d,\nalign-int=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-int-a-short.c
deleted file mode 100644
index 676f580833d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with int:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-arrayof-short=%d,\nalign-int=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-char.c b/gcc/testsuite/consistency.vlad/layout/s-int-char.c
deleted file mode 100644
index d184ad67121..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-char:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-char=%d,\nalign-int=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-double.c b/gcc/testsuite/consistency.vlad/layout/s-int-double.c
deleted file mode 100644
index cbfcedadc73..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-double:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-double=%d,\nalign-int=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-float.c b/gcc/testsuite/consistency.vlad/layout/s-int-float.c
deleted file mode 100644
index 5eb39235621..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-float:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-float=%d,\nalign-int=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-int.c b/gcc/testsuite/consistency.vlad/layout/s-int-int.c
deleted file mode 100644
index 05d9608dd06..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-int:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-int=%d,\nalign-int=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-long.c b/gcc/testsuite/consistency.vlad/layout/s-int-long.c
deleted file mode 100644
index 6ddb280e302..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-long:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-long=%d,\nalign-int=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-int-longdouble.c
deleted file mode 100644
index 5a01a66fc24..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-longdouble:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-longdouble=%d,\nalign-int=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-int-longlong.c
deleted file mode 100644
index 08dff220858..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-longlong:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-longlong=%d,\nalign-int=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-int-pointer.c
deleted file mode 100644
index ea94656a0e0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-pointer:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-pointer=%d,\nalign-int=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-int-ptrdiff_t.c
deleted file mode 100644
index c1f5aa66534..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  int f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-ptrdiff_t=%d,\nalign-int=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-char.c
deleted file mode 100644
index f989bf302ed..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-char=%d,\nalign-int=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-double.c
deleted file mode 100644
index 79243759144..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-double=%d,\nalign-int=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-float.c
deleted file mode 100644
index cdf1713647c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-float=%d,\nalign-int=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-int.c
deleted file mode 100644
index a9ae740169f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-int=%d,\nalign-int=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-long.c
deleted file mode 100644
index b082bb55bd3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-long=%d,\nalign-int=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-longdouble.c
deleted file mode 100644
index e73c9429a44..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-longdouble=%d,\nalign-int=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-longlong.c
deleted file mode 100644
index b79d9aaee31..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-longlong=%d,\nalign-int=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-pointer.c
deleted file mode 100644
index a12b1989418..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-pointer=%d,\nalign-int=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-int-s-short.c
deleted file mode 100644
index 8d2a99d7313..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-sss-short=%d,\nalign-int=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-short.c b/gcc/testsuite/consistency.vlad/layout/s-int-short.c
deleted file mode 100644
index 72cf8a5fb1f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-short:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-short=%d,\nalign-int=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-int-size_t.c
deleted file mode 100644
index 7e89d01b644..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  int f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-size_t:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-size_t=%d,\nalign-int=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-int-wchar_t.c
deleted file mode 100644
index 2eb98b894d1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  int f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-int=%d,offset-wchar_t=%d,\nalign-int=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-int-zf-char.c
deleted file mode 100644
index e8a5c71ae60..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-last=%d,\nalign-int=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-int-zf-int.c
deleted file mode 100644
index 1a5e8b98267..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-last=%d,\nalign-int=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-int-zf-long.c
deleted file mode 100644
index 5b239a3fba9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-last=%d,\nalign-int=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-int-zf-longlong.c
deleted file mode 100644
index 7d80a90daf4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-last=%d,\nalign-int=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-int-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-int-zf-short.c
deleted file mode 100644
index a3b9982fe86..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-int-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  int f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with int:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-int=%d,offset-last=%d,\nalign-int=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-char.c
deleted file mode 100644
index f5ff437753c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-char=%d,\nalign-long=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-double.c
deleted file mode 100644
index ad9be40d718..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-double=%d,\nalign-long=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-float.c
deleted file mode 100644
index 4cc1efc9eeb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-float=%d,\nalign-long=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-int.c
deleted file mode 100644
index 5a6567ed5f3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-int=%d,\nalign-long=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-long.c
deleted file mode 100644
index 3e001532f6c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-long=%d,\nalign-long=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-longdouble.c
deleted file mode 100644
index 738799e5896..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-longdouble=%d,\nalign-long=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-longlong.c
deleted file mode 100644
index a041ef8e884..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-longlong=%d,\nalign-long=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-pointer.c
deleted file mode 100644
index 5081f3017a7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-pointer=%d,\nalign-long=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-long-a-short.c
deleted file mode 100644
index 4f619e6656a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with long:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-arrayof-short=%d,\nalign-long=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-char.c b/gcc/testsuite/consistency.vlad/layout/s-long-char.c
deleted file mode 100644
index 3efda3c2a89..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-char:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-char=%d,\nalign-long=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-double.c b/gcc/testsuite/consistency.vlad/layout/s-long-double.c
deleted file mode 100644
index 58c7904599e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-double:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-double=%d,\nalign-long=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-float.c b/gcc/testsuite/consistency.vlad/layout/s-long-float.c
deleted file mode 100644
index 5e1f6a9e391..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-float:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-float=%d,\nalign-long=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-int.c b/gcc/testsuite/consistency.vlad/layout/s-long-int.c
deleted file mode 100644
index 1df95e3964d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-int:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-int=%d,\nalign-long=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-long.c b/gcc/testsuite/consistency.vlad/layout/s-long-long.c
deleted file mode 100644
index 4f0098201e7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-long:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-long=%d,\nalign-long=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-long-longdouble.c
deleted file mode 100644
index 43785b2ff88..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-longdouble:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-longdouble=%d,\nalign-long=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-long-longlong.c
deleted file mode 100644
index 33b131fd4cc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-longlong:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-longlong=%d,\nalign-long=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-long-pointer.c
deleted file mode 100644
index 370f6297923..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-pointer:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-pointer=%d,\nalign-long=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-long-ptrdiff_t.c
deleted file mode 100644
index 0531daaa8f1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-ptrdiff_t=%d,\nalign-long=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-char.c
deleted file mode 100644
index 2a3b6aae135..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-char=%d,\nalign-long=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-double.c
deleted file mode 100644
index 6be3abe2959..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-double=%d,\nalign-long=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-float.c
deleted file mode 100644
index f2412ee9f4a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-float=%d,\nalign-long=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-int.c
deleted file mode 100644
index 1d930a4e293..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-int=%d,\nalign-long=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-long.c
deleted file mode 100644
index d3706070f03..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-long=%d,\nalign-long=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-longdouble.c
deleted file mode 100644
index a823e652c9d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-longdouble=%d,\nalign-long=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-longlong.c
deleted file mode 100644
index f7f82680e88..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-longlong=%d,\nalign-long=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-pointer.c
deleted file mode 100644
index 47211158c6f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-pointer=%d,\nalign-long=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-long-s-short.c
deleted file mode 100644
index 385466d1bd2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-sss-short=%d,\nalign-long=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-short.c b/gcc/testsuite/consistency.vlad/layout/s-long-short.c
deleted file mode 100644
index 375516fcddd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-short:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-short=%d,\nalign-long=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-long-size_t.c
deleted file mode 100644
index 8863817c172..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-size_t:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-size_t=%d,\nalign-long=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-long-wchar_t.c
deleted file mode 100644
index b803371787f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-long=%d,offset-wchar_t=%d,\nalign-long=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-long-zf-char.c
deleted file mode 100644
index 135c6127159..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-last=%d,\nalign-long=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-long-zf-int.c
deleted file mode 100644
index 3c930a57866..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-last=%d,\nalign-long=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-long-zf-long.c
deleted file mode 100644
index ce8e230009e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-last=%d,\nalign-long=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-long-zf-longlong.c
deleted file mode 100644
index 4015d4d812b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-last=%d,\nalign-long=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-long-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-long-zf-short.c
deleted file mode 100644
index 7280a50b06e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-long-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with long:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-long=%d,offset-last=%d,\nalign-long=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-char.c
deleted file mode 100644
index 0dfff4b74e9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-char=%d,\nalign-longdouble=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-double.c
deleted file mode 100644
index d745ea9ed72..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-double=%d,\nalign-longdouble=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-float.c
deleted file mode 100644
index 66722106160..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-float=%d,\nalign-longdouble=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-int.c
deleted file mode 100644
index 4fc26c35f90..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-int=%d,\nalign-longdouble=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-long.c
deleted file mode 100644
index ee8095833fd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-long=%d,\nalign-longdouble=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-longdouble.c
deleted file mode 100644
index f0e647b3458..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-longdouble=%d,\nalign-longdouble=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-longlong.c
deleted file mode 100644
index c414538fae2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-longlong=%d,\nalign-longdouble=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-pointer.c
deleted file mode 100644
index 811aefd5625..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-pointer=%d,\nalign-longdouble=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-short.c
deleted file mode 100644
index 802ce2a12ea..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-arrayof-short=%d,\nalign-longdouble=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-char.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-char.c
deleted file mode 100644
index 682cea963cd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-char:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-char=%d,\nalign-longdouble=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-double.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-double.c
deleted file mode 100644
index 34f45f58b48..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-double:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-double=%d,\nalign-longdouble=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-float.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-float.c
deleted file mode 100644
index e0cf6753825..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-float:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-float=%d,\nalign-longdouble=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-int.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-int.c
deleted file mode 100644
index 1d6aa02c091..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-int:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-int=%d,\nalign-longdouble=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-long.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-long.c
deleted file mode 100644
index 42f9ec09573..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-long:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-long=%d,\nalign-longdouble=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-longdouble.c
deleted file mode 100644
index 0bc549d32d0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-longdouble:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-longdouble=%d,\nalign-longdouble=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-longlong.c
deleted file mode 100644
index ac0d973ca76..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-longlong:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-longlong=%d,\nalign-longdouble=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-pointer.c
deleted file mode 100644
index 124d7a7ae60..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-pointer:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-pointer=%d,\nalign-longdouble=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-ptrdiff_t.c
deleted file mode 100644
index 8a4cd1ebb6f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long double f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-ptrdiff_t=%d,\nalign-longdouble=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-char.c
deleted file mode 100644
index 724574607c8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-char=%d,\nalign-longdouble=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-double.c
deleted file mode 100644
index ebe163618ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-double=%d,\nalign-longdouble=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-float.c
deleted file mode 100644
index 5c691f764a6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-float=%d,\nalign-longdouble=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-int.c
deleted file mode 100644
index 6d877286d9b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-int=%d,\nalign-longdouble=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-long.c
deleted file mode 100644
index 4780f8ff54c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-long=%d,\nalign-longdouble=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-longdouble.c
deleted file mode 100644
index aaecec944fb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-longdouble=%d,\nalign-longdouble=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-longlong.c
deleted file mode 100644
index d71aaff59e5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-longlong=%d,\nalign-longdouble=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-pointer.c
deleted file mode 100644
index 2e90ac23d4f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-pointer=%d,\nalign-longdouble=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-short.c
deleted file mode 100644
index 11266fb9945..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-sss-short=%d,\nalign-longdouble=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-short.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-short.c
deleted file mode 100644
index 9e527ff80fb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-short:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-short=%d,\nalign-longdouble=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-size_t.c
deleted file mode 100644
index 1acc4e886fd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long double f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-size_t:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-size_t=%d,\nalign-longdouble=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-wchar_t.c
deleted file mode 100644
index b1ac899f2eb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long double f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-longdouble=%d,offset-wchar_t=%d,\nalign-longdouble=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-char.c
deleted file mode 100644
index 9abea23535b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-last=%d,\nalign-longdouble=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-int.c
deleted file mode 100644
index 9ad26626173..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-last=%d,\nalign-longdouble=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-long.c
deleted file mode 100644
index 9ce5c6f4ac3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-last=%d,\nalign-longdouble=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-longlong.c
deleted file mode 100644
index 16070cb6ea0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-last=%d,\nalign-longdouble=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-short.c
deleted file mode 100644
index e5868ed129e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longdouble-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long double f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with longdouble:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longdouble=%d,offset-last=%d,\nalign-longdouble=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-char.c
deleted file mode 100644
index 6aae6750afc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-char=%d,\nalign-longlong=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-double.c
deleted file mode 100644
index 39e8ceb1e0b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-double=%d,\nalign-longlong=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-float.c
deleted file mode 100644
index 0ea70e51006..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-float=%d,\nalign-longlong=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-int.c
deleted file mode 100644
index 34fb575b8e4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-int=%d,\nalign-longlong=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-long.c
deleted file mode 100644
index bfb773b492c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-long=%d,\nalign-longlong=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-longdouble.c
deleted file mode 100644
index 20a8b4512c9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-longdouble=%d,\nalign-longlong=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-longlong.c
deleted file mode 100644
index a4ce539ff7c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-longlong=%d,\nalign-longlong=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-pointer.c
deleted file mode 100644
index 7c27a99b3e0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-pointer=%d,\nalign-longlong=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-a-short.c
deleted file mode 100644
index e97fb1809f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-arrayof-short=%d,\nalign-longlong=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-char.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-char.c
deleted file mode 100644
index 1d564b00399..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-char:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-char=%d,\nalign-longlong=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-double.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-double.c
deleted file mode 100644
index 59c4d1ebae6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-double:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-double=%d,\nalign-longlong=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-float.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-float.c
deleted file mode 100644
index 7ee56b1e59c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-float:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-float=%d,\nalign-longlong=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-int.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-int.c
deleted file mode 100644
index 01544898c33..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-int:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-int=%d,\nalign-longlong=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-long.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-long.c
deleted file mode 100644
index 9356e13c9a9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-long:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-long=%d,\nalign-longlong=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-longdouble.c
deleted file mode 100644
index 008ae3085a9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-longdouble:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-longdouble=%d,\nalign-longlong=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-longlong.c
deleted file mode 100644
index d0c530cd76d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-longlong:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-longlong=%d,\nalign-longlong=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-pointer.c
deleted file mode 100644
index edc274b4139..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-pointer:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-pointer=%d,\nalign-longlong=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-ptrdiff_t.c
deleted file mode 100644
index 529658ad1b7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long long f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-ptrdiff_t=%d,\nalign-longlong=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-char.c
deleted file mode 100644
index 13d7d1f0cf0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-char=%d,\nalign-longlong=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-double.c
deleted file mode 100644
index a008ddeff2c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-double=%d,\nalign-longlong=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-float.c
deleted file mode 100644
index 2e236f852db..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-float=%d,\nalign-longlong=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-int.c
deleted file mode 100644
index 3ea93c745b4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-int=%d,\nalign-longlong=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-long.c
deleted file mode 100644
index 3b2c3bd8822..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-long=%d,\nalign-longlong=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-longdouble.c
deleted file mode 100644
index 3c41c7f380c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-longdouble=%d,\nalign-longlong=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-longlong.c
deleted file mode 100644
index dc18d630e62..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-longlong=%d,\nalign-longlong=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-pointer.c
deleted file mode 100644
index e88b4246242..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-pointer=%d,\nalign-longlong=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-s-short.c
deleted file mode 100644
index 5a538b00f52..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-sss-short=%d,\nalign-longlong=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-short.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-short.c
deleted file mode 100644
index d56daea86ae..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-short:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-short=%d,\nalign-longlong=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-size_t.c
deleted file mode 100644
index fb5c1ea1c11..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long long f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-size_t:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-size_t=%d,\nalign-longlong=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-wchar_t.c
deleted file mode 100644
index 120b42eb10c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  long long f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-longlong=%d,offset-wchar_t=%d,\nalign-longlong=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-char.c
deleted file mode 100644
index c85af261ed4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-last=%d,\nalign-longlong=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-int.c
deleted file mode 100644
index caea6331574..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-last=%d,\nalign-longlong=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-long.c
deleted file mode 100644
index 959ca707794..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-last=%d,\nalign-longlong=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-longlong.c
deleted file mode 100644
index c66ac7de71d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-last=%d,\nalign-longlong=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-short.c
deleted file mode 100644
index 086301f27f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-longlong-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  long long f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with longlong:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-longlong=%d,offset-last=%d,\nalign-longlong=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-char.c
deleted file mode 100644
index f1b7e720f3a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-char=%d,\nalign-pointer=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-double.c
deleted file mode 100644
index 3de02172b5f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-double=%d,\nalign-pointer=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-float.c
deleted file mode 100644
index 068902c0146..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-float=%d,\nalign-pointer=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-int.c
deleted file mode 100644
index f77e378e82b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-int=%d,\nalign-pointer=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-long.c
deleted file mode 100644
index 8c1a737a4c3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-long=%d,\nalign-pointer=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-longdouble.c
deleted file mode 100644
index 9064415fada..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-longdouble=%d,\nalign-pointer=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-longlong.c
deleted file mode 100644
index 27846cc752d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-longlong=%d,\nalign-pointer=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-pointer.c
deleted file mode 100644
index 1448222ca74..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-pointer=%d,\nalign-pointer=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-a-short.c
deleted file mode 100644
index 56333a2b9b5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-arrayof-short=%d,\nalign-pointer=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-char.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-char.c
deleted file mode 100644
index 8bd7517a808..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-char:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-char=%d,\nalign-pointer=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-double.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-double.c
deleted file mode 100644
index c9b426100e6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-double:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-double=%d,\nalign-pointer=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-float.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-float.c
deleted file mode 100644
index 8fd56d5cb53..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-float:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-float=%d,\nalign-pointer=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-int.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-int.c
deleted file mode 100644
index 2333a11f704..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-int:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-int=%d,\nalign-pointer=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-long.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-long.c
deleted file mode 100644
index af2204cce78..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-long:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-long=%d,\nalign-pointer=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-longdouble.c
deleted file mode 100644
index 06a44231bd3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-longdouble:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-longdouble=%d,\nalign-pointer=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-longlong.c
deleted file mode 100644
index da0c874d1bf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-longlong:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-longlong=%d,\nalign-pointer=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-pointer.c
deleted file mode 100644
index e2e1878361e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-pointer:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-pointer=%d,\nalign-pointer=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-ptrdiff_t.c
deleted file mode 100644
index c4adfd16b0f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  char * f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-ptrdiff_t=%d,\nalign-pointer=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-char.c
deleted file mode 100644
index f0e7d1f6e03..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-char=%d,\nalign-pointer=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-double.c
deleted file mode 100644
index d4c4578af9b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-double=%d,\nalign-pointer=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-float.c
deleted file mode 100644
index fee84bea587..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-float=%d,\nalign-pointer=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-int.c
deleted file mode 100644
index 846e63d447e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-int=%d,\nalign-pointer=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-long.c
deleted file mode 100644
index 50bc64720fe..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-long=%d,\nalign-pointer=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-longdouble.c
deleted file mode 100644
index 837871302a6..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-longdouble=%d,\nalign-pointer=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-longlong.c
deleted file mode 100644
index db23d7887b0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-longlong=%d,\nalign-pointer=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-pointer.c
deleted file mode 100644
index 90da933bfc1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-pointer=%d,\nalign-pointer=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-s-short.c
deleted file mode 100644
index 48e72b64808..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-sss-short=%d,\nalign-pointer=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-short.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-short.c
deleted file mode 100644
index 4be02192ecf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-short:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-short=%d,\nalign-pointer=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-size_t.c
deleted file mode 100644
index 202add1a544..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  char * f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-size_t:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-size_t=%d,\nalign-pointer=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-wchar_t.c
deleted file mode 100644
index 3c46361c6cd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  char * f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-pointer=%d,offset-wchar_t=%d,\nalign-pointer=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-char.c
deleted file mode 100644
index 5ee49f5dbb8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-last=%d,\nalign-pointer=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-int.c
deleted file mode 100644
index fcc2d790418..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-last=%d,\nalign-pointer=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-long.c
deleted file mode 100644
index 1ab4e063206..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-last=%d,\nalign-pointer=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-longlong.c
deleted file mode 100644
index 3669c60efa3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-last=%d,\nalign-pointer=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-short.c
deleted file mode 100644
index 5b8134b254c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-pointer-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  char * f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with pointer:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-pointer=%d,offset-last=%d,\nalign-pointer=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-char.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-char.c
deleted file mode 100644
index 91b526914cb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-char:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-char=%d,\nalign-ptrdiff_t=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-double.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-double.c
deleted file mode 100644
index 40e4b963695..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-double.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-double:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-double=%d,\nalign-ptrdiff_t=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-float.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-float.c
deleted file mode 100644
index 1209c9bae4f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-float.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-float:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-float=%d,\nalign-ptrdiff_t=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-int.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-int.c
deleted file mode 100644
index 34e78ffbae7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-int:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-int=%d,\nalign-ptrdiff_t=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-long.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-long.c
deleted file mode 100644
index 9f9e6defc64..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-long:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-long=%d,\nalign-ptrdiff_t=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-longdouble.c
deleted file mode 100644
index 96a8bb4362f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-longdouble.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-longdouble:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-longdouble=%d,\nalign-ptrdiff_t=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-longlong.c
deleted file mode 100644
index d913745da55..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-longlong:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-longlong=%d,\nalign-ptrdiff_t=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-pointer.c
deleted file mode 100644
index 16f497e8f54..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-pointer.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-pointer:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-pointer=%d,\nalign-ptrdiff_t=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-ptrdiff_t.c
deleted file mode 100644
index da50a4c462c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-ptrdiff_t=%d,\nalign-ptrdiff_t=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-short.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-short.c
deleted file mode 100644
index 27c85050565..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-short:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-short=%d,\nalign-ptrdiff_t=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-size_t.c
deleted file mode 100644
index 30fe61cd349..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-size_t:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-size_t=%d,\nalign-ptrdiff_t=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-wchar_t.c
deleted file mode 100644
index 922d8a6a57b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-ptrdiff_t-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  ptrdiff_t f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct ptrdiff_t-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-ptrdiff_t=%d,offset-wchar_t=%d,\nalign-ptrdiff_t=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-char.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-char.c
deleted file mode 100644
index 6e97dad19cf..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-char.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  char a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of char in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-char=%d,\nalign-short=%d,align-arrayof-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-char-a[5]=%d,align-char-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-double.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-double.c
deleted file mode 100644
index da0a6705705..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-double.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of double in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-double=%d,\nalign-short=%d,align-arrayof-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-double-a[5]=%d,align-double-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-float.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-float.c
deleted file mode 100644
index d27cbf2b6ce..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-float.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  float a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of float in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-float=%d,\nalign-short=%d,align-arrayof-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-float-a[5]=%d,align-float-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-int.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-int.c
deleted file mode 100644
index 2b199d0b9c0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-int.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  int a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of int in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-int=%d,\nalign-short=%d,align-arrayof-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-int-a[5]=%d,align-int-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-long.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-long.c
deleted file mode 100644
index b0bc13a4ae0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-long.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of long in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-long=%d,\nalign-short=%d,align-arrayof-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-long-a[5]=%d,align-long-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-longdouble.c
deleted file mode 100644
index 1354cd2b05f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-longdouble.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  long double a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longdouble in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-longdouble=%d,\nalign-short=%d,align-arrayof-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longdouble-a[5]=%d,align-longdouble-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-longlong.c
deleted file mode 100644
index 6bc6b70702e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-longlong.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  long long a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of longlong in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-longlong=%d,\nalign-short=%d,align-arrayof-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-longlong-a[5]=%d,align-longlong-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-pointer.c
deleted file mode 100644
index 8654787ac46..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-pointer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  char * a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of pointer in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-pointer=%d,\nalign-short=%d,align-arrayof-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-pointer-a[5]=%d,align-pointer-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-a-short.c b/gcc/testsuite/consistency.vlad/layout/s-short-a-short.c
deleted file mode 100644
index f5bc1fae7c5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-a-short.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  short a[10];
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("++++Array of short in struct starting with short:\n");
-  printf ("size=%d,align=%d\n",
-          sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-arrayof-short=%d,\nalign-short=%d,align-arrayof-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, a),
-          __alignof__ (sss.f), __alignof__ (sss.a));
-  printf ("offset-short-a[5]=%d,align-short-a[5]=%d\n",
-          _offsetof (struct sss, a[5]),
-          __alignof__ (sss.a[5]));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-char.c b/gcc/testsuite/consistency.vlad/layout/s-short-char.c
deleted file mode 100644
index 141f65ab1f5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-char:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-char=%d,\nalign-short=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-double.c b/gcc/testsuite/consistency.vlad/layout/s-short-double.c
deleted file mode 100644
index 061a4550013..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-double:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-double=%d,\nalign-short=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-float.c b/gcc/testsuite/consistency.vlad/layout/s-short-float.c
deleted file mode 100644
index 2b6760e380a..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-float:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-float=%d,\nalign-short=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-int.c b/gcc/testsuite/consistency.vlad/layout/s-short-int.c
deleted file mode 100644
index 1958e124d36..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-int:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-int=%d,\nalign-short=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-long.c b/gcc/testsuite/consistency.vlad/layout/s-short-long.c
deleted file mode 100644
index 063e19dda94..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-long:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-long=%d,\nalign-short=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-short-longdouble.c
deleted file mode 100644
index d7da07683b4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-longdouble:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-longdouble=%d,\nalign-short=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-short-longlong.c
deleted file mode 100644
index f9be1789400..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-longlong:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-longlong=%d,\nalign-short=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-short-pointer.c
deleted file mode 100644
index 0ec842335c7..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-pointer:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-pointer=%d,\nalign-short=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-short-ptrdiff_t.c
deleted file mode 100644
index 54e28c161e5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  short f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-ptrdiff_t=%d,\nalign-short=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-char.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-char.c
deleted file mode 100644
index 2312c705c7d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-char.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {char m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct char inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-char=%d,\nalign-short=%d,align-sss-char=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-double.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-double.c
deleted file mode 100644
index adbda511dfc..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-double.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct double inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-double=%d,\nalign-short=%d,align-sss-double=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-float.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-float.c
deleted file mode 100644
index e0d68cf3e61..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-float.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {float m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct float inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-float=%d,\nalign-short=%d,align-sss-float=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-int.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-int.c
deleted file mode 100644
index 980ee46b2dd..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-int.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {int m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct int inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-int=%d,\nalign-short=%d,align-sss-int=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-long.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-long.c
deleted file mode 100644
index 687e8aacf69..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-long.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct long inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-long=%d,\nalign-short=%d,align-sss-long=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-longdouble.c
deleted file mode 100644
index 1590563ce81..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-longdouble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {long double m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longdouble inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-longdouble=%d,\nalign-short=%d,align-sss-longdouble=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-longlong.c
deleted file mode 100644
index 730c74aec97..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-longlong.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {long long m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct longlong inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-longlong=%d,\nalign-short=%d,align-sss-longlong=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-pointer.c
deleted file mode 100644
index 441cb4e9a9b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-pointer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {char * m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct pointer inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-pointer=%d,\nalign-short=%d,align-sss-pointer=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-s-short.c b/gcc/testsuite/consistency.vlad/layout/s-short-s-short.c
deleted file mode 100644
index d07a7cf9c49..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-s-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  struct {short m;} snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-sss-short=%d,\nalign-short=%d,align-sss-short=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-short.c b/gcc/testsuite/consistency.vlad/layout/s-short-short.c
deleted file mode 100644
index 580da697e4b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-short.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-short:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-short=%d,\nalign-short=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-short-size_t.c
deleted file mode 100644
index c8f0255842e..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  short f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-size_t:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-size_t=%d,\nalign-short=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-short-wchar_t.c
deleted file mode 100644
index 01d165a8848..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  short f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct short-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-short=%d,offset-wchar_t=%d,\nalign-short=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-zf-char.c b/gcc/testsuite/consistency.vlad/layout/s-short-zf-char.c
deleted file mode 100644
index 9c499e4323c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-zf-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  char :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++char zerofield inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-last=%d,\nalign-short=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-zf-int.c b/gcc/testsuite/consistency.vlad/layout/s-short-zf-int.c
deleted file mode 100644
index 2613e7939b9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-zf-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  int :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++int zerofield inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-last=%d,\nalign-short=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-zf-long.c b/gcc/testsuite/consistency.vlad/layout/s-short-zf-long.c
deleted file mode 100644
index 4e3b8f4dd84..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-zf-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++long zerofield inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-last=%d,\nalign-short=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-zf-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-short-zf-longlong.c
deleted file mode 100644
index 9f617162a4d..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-zf-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  long long :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++longlong zerofield inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-last=%d,\nalign-short=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-short-zf-short.c b/gcc/testsuite/consistency.vlad/layout/s-short-zf-short.c
deleted file mode 100644
index 28058a03cf1..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-short-zf-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-static struct sss{
-  short f;
-  short :0;
-  int i;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++short zerofield inside struct starting with short:\n");
-  printf ("size=%d,align=%d\n", sizeof (sss), __alignof__ (sss));
-  printf ("offset-short=%d,offset-last=%d,\nalign-short=%d,align-last=%d\n",
-          _offsetof (struct sss, f), _offsetof (struct sss, i),
-          __alignof__ (sss.f), __alignof__ (sss.i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-char.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-char.c
deleted file mode 100644
index c1fcbbc4e16..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-char:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-char=%d,\nalign-size_t=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-double.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-double.c
deleted file mode 100644
index f92ba5224bb..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-double.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-double:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-double=%d,\nalign-size_t=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-float.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-float.c
deleted file mode 100644
index 18cb5f61dae..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-float.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-float:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-float=%d,\nalign-size_t=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-int.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-int.c
deleted file mode 100644
index 70c1a4cb1ef..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-int:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-int=%d,\nalign-size_t=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-long.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-long.c
deleted file mode 100644
index 962ff90db75..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-long:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-long=%d,\nalign-size_t=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-longdouble.c
deleted file mode 100644
index 71d755527e5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-longdouble.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-longdouble:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-longdouble=%d,\nalign-size_t=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-longlong.c
deleted file mode 100644
index 363f7f3d9a3..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-longlong:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-longlong=%d,\nalign-size_t=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-pointer.c
deleted file mode 100644
index 22826aa3070..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-pointer.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-pointer:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-pointer=%d,\nalign-size_t=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-ptrdiff_t.c
deleted file mode 100644
index 28150c7f54f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-ptrdiff_t=%d,\nalign-size_t=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-short.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-short.c
deleted file mode 100644
index bafd3ef2a3c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-short:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-short=%d,\nalign-size_t=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-size_t.c
deleted file mode 100644
index d5eba694975..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-size_t:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-size_t=%d,\nalign-size_t=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-size_t-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-size_t-wchar_t.c
deleted file mode 100644
index cc9f741e86c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-size_t-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  size_t f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct size_t-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-size_t=%d,offset-wchar_t=%d,\nalign-size_t=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-char.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-char.c
deleted file mode 100644
index bcbdfd0342f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-char.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  char snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-char:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-char=%d,\nalign-wchar_t=%d,align-char=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-double.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-double.c
deleted file mode 100644
index fed2df4df39..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-double.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-double:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-double=%d,\nalign-wchar_t=%d,align-double=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-float.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-float.c
deleted file mode 100644
index 1c761a4be69..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-float.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  float snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-float:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-float=%d,\nalign-wchar_t=%d,align-float=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-int.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-int.c
deleted file mode 100644
index 9e950ccb65b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-int.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  int snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-int:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-int=%d,\nalign-wchar_t=%d,align-int=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-long.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-long.c
deleted file mode 100644
index b3416ec03f4..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-long.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-long:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-long=%d,\nalign-wchar_t=%d,align-long=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-longdouble.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-longdouble.c
deleted file mode 100644
index 8607ca2b14b..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-longdouble.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  long double snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-longdouble:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-longdouble=%d,\nalign-wchar_t=%d,align-longdouble=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-longlong.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-longlong.c
deleted file mode 100644
index 48160cd3308..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-longlong.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  long long snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-longlong:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-longlong=%d,\nalign-wchar_t=%d,align-longlong=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-pointer.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-pointer.c
deleted file mode 100644
index fb21775a605..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-pointer.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  char * snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-pointer:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-pointer=%d,\nalign-wchar_t=%d,align-pointer=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-ptrdiff_t.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-ptrdiff_t.c
deleted file mode 100644
index c5b750dc63c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-ptrdiff_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  ptrdiff_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-ptrdiff_t:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-ptrdiff_t=%d,\nalign-wchar_t=%d,align-ptrdiff_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-short.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-short.c
deleted file mode 100644
index f24a447b936..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-short.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  short snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-short:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-short=%d,\nalign-wchar_t=%d,align-short=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-size_t.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-size_t.c
deleted file mode 100644
index f4c46bd2c93..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-size_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  size_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-size_t:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-size_t=%d,\nalign-wchar_t=%d,align-size_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-wchar_t.c b/gcc/testsuite/consistency.vlad/layout/s-wchar_t-wchar_t.c
deleted file mode 100644
index a03c14b349c..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/s-wchar_t-wchar_t.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static struct sss{
-  wchar_t f;
-  wchar_t snd;
-} sss;
-
-#define _offsetof(st,f) ((char *)&((st *) 16)->f - (char *) 16)
-
-int main (void) {
-  printf ("+++Struct wchar_t-wchar_t:\n");
-  printf ("size=%d,align=%d,offset-wchar_t=%d,offset-wchar_t=%d,\nalign-wchar_t=%d,align-wchar_t=%d\n",
-          sizeof (sss), __alignof__ (sss),
-          _offsetof (struct sss, f), _offsetof (struct sss, snd),
-          __alignof__ (sss.f), __alignof__ (sss.snd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-bool.cpp b/gcc/testsuite/consistency.vlad/layout/size-bool.cpp
deleted file mode 100644
index 9d2d55c4ea0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-bool.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static bool bbb;
-
-int main(void)
-{
-  printf ("+++Bool size:\n");
-  printf ("%d\n", sizeof (bbb));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-char.c b/gcc/testsuite/consistency.vlad/layout/size-char.c
deleted file mode 100644
index 144e31eaeb2..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-char.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static char ccc;
-
-int main(void)
-{
-  printf ("+++Char size:\n");
-  printf ("%d\n", sizeof (ccc));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-double.c b/gcc/testsuite/consistency.vlad/layout/size-double.c
deleted file mode 100644
index 635d75b86e9..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-double.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static double d;
-
-int main(void)
-{
-  printf ("+++Double size:\n");
-  printf ("%d\n", sizeof (d));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-float.c b/gcc/testsuite/consistency.vlad/layout/size-float.c
deleted file mode 100644
index 49c12ddcfb5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-float.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static float f;
-
-int main(void)
-{
-  printf ("+++Float size:\n");
-  printf ("%d\n", sizeof (f));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-int.c b/gcc/testsuite/consistency.vlad/layout/size-int.c
deleted file mode 100644
index 558f2204a79..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-int.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static int i;
-
-int main(void)
-{
-  printf ("+++Int size:\n");
-  printf ("%d\n", sizeof (i));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-long.c b/gcc/testsuite/consistency.vlad/layout/size-long.c
deleted file mode 100644
index 87095fde0c0..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-long.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static long lll;
-
-int main(void)
-{
-  printf ("+++Long size:\n");
-  printf ("%d\n", sizeof (lll));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-longdouble.c b/gcc/testsuite/consistency.vlad/layout/size-longdouble.c
deleted file mode 100644
index ba394826aa5..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-longdouble.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static long double ld;
-
-int main(void)
-{
-  printf ("+++Long Double size:\n");
-  printf ("%d\n", sizeof (ld));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-longlong.c b/gcc/testsuite/consistency.vlad/layout/size-longlong.c
deleted file mode 100644
index 780fa1b7ec8..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-longlong.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static long long ll;
-
-int main(void)
-{
-  printf ("+++Long long size:\n");
-  printf ("%d\n", sizeof (ll));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-pointer.c b/gcc/testsuite/consistency.vlad/layout/size-pointer.c
deleted file mode 100644
index 989c0f9a689..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-pointer.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static char *p;
-
-int main(void)
-{
-  printf ("+++Pointer size:\n");
-  printf ("%d\n", sizeof (p));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-ptrdiff.c b/gcc/testsuite/consistency.vlad/layout/size-ptrdiff.c
deleted file mode 100644
index bce301f0e9f..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-ptrdiff.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static ptrdiff_t pd;
-
-int main(void)
-{
-  printf ("+++ptrdiff_t size:\n");
-  printf ("%d\n", sizeof (pd));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-short.c b/gcc/testsuite/consistency.vlad/layout/size-short.c
deleted file mode 100644
index ebe832b0176..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-short.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-static short sss;
-
-int main(void)
-{
-  printf ("+++Short size:\n");
-  printf ("%d\n", sizeof (sss));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-size.c b/gcc/testsuite/consistency.vlad/layout/size-size.c
deleted file mode 100644
index 543fa7ecb70..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-size.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static size_t sss;
-
-int main(void)
-{
-  printf ("+++size_t size:\n");
-  printf ("%d\n", sizeof (sss));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/layout/size-wchar.c b/gcc/testsuite/consistency.vlad/layout/size-wchar.c
deleted file mode 100644
index 06e835a74ca..00000000000
--- a/gcc/testsuite/consistency.vlad/layout/size-wchar.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-#include <stddef.h>
-
-static wchar_t w;
-
-int main(void)
-{
-  printf ("+++wchar_t size:\n");
-  printf ("%d\n", sizeof (w));
-  return 0;
-}
diff --git a/gcc/testsuite/consistency.vlad/vlad.exp b/gcc/testsuite/consistency.vlad/vlad.exp
deleted file mode 100644
index ce49fe41713..00000000000
--- a/gcc/testsuite/consistency.vlad/vlad.exp
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright (C) 1998,1999 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gcc@prep.ai.mit.edu
-
-# This file was created for by Vladimir Makarov (vmakarov@cygnus.com)
-# on the base c-torture.exp.
-
-# The script requires setting up BASE_COMPILER (e.g. in RUNTESTFLAGS).
-# The default options can be overridden by
-# CONSISTENCY_OPTIONS="option ... " (e.g. in RUNTESTFLAGS).
-
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if ![info exists BASE_COMPILER] {
-    fail "BASE_COMPILER is not set"  
-    return
-}
-
-if ![info exists CONSISTENCY_OPTIONS] {
-    set CONSISTENCY_OPTIONS "-O2"
-}
-
-if ![info exists NO_LONG_DOUBLE] {
-    set NO_LONG_DOUBLE 0
-}
-
-if ![info exists NO_LIBGLOSS_LIBRARY_OPTIONS] {
-    set NO_LIBGLOSS_LIBRARY_OPTIONS 0
-}
-
-puts $CONSISTENCY_OPTIONS
-
-regsub -- -.* $target_triplet "" target_chip
-
-#
-# c-consistency-execute -- utility to compile and execute a testcase
-#
-# SRC is the full pathname of the testcase.
-#
-# If the testcase has an associated .cexp file, we source that to run the
-# test instead.  We use .cexp instead of .exp so that the testcase is still
-# controlled by the main .exp driver (this is useful when one wants to only
-# run the compile.exp tests for example - one need only pass compile.exp to
-# dejagnu, and not compile.exp, foo1.exp, foo2.exp, etc.).
-#
-proc c-consistency-execute { src cpp_flag out_suffix} {
-    global tmpdir tool srcdir output
-    global exec_output target_chip BASE_COMPILER target_triplet
-    global CONSISTENCY_OPTIONS NO_LONG_DOUBLE
-
-    set consistency_options $CONSISTENCY_OPTIONS
-
-    set rootname [file rootname $src]
-    set dirname [file dirname $src]
-    set basename [file tail $rootname]
-    # Check for alternate driver.
-    if [file exists $rootname.cexp] {
-	verbose "Using alternate driver $basename.cexp" 2
-	set done_p 0
-	catch "set done_p \[source $rootname.cexp\]"
-	if { $done_p } {
-	    return
-	}
-    }
-   
-    set executable $tmpdir/$basename.x
-
-    regsub "^$srcdir/?" $src "" testcase
-    # If we couldn't rip $srcdir out of `src' then just do the best we can.
-    # The point is to reduce the unnecessary noise in the logs.  Don't strip
-    # out too much because different testcases with the same name can confuse
-    # `test-tool'.
-    if [string match "/*" $testcase] {
-	set testcase "[file tail $dirname]/[file tail $src]"
-    }
-
-    # consistency_{compile,execute}_xfail are set by the .cexp script
-    # (if present)
-    if [info exists consistency_compile_xfail] {
-        setup_xfail $consistency_compile_xfail
-    }
-    remote_file build delete $executable
-    verbose "Testing $testcase, $consistency_options" 1
-    
-    set options ""
-    lappend options "additional_flags=-w $consistency_options"
-
-    set wrap_file ""
-    if {[file exists "$dirname/WRAP_FILE"] \
-         && [file readable "$dirname/WRAP_FILE"]} {
-      set fd [open "$dirname/WRAP_FILE"]
-      set wrap_file "$dirname/[read -nonewline $fd]"
-      close $fd
-    }
-
-    set comp_output [gcc_target_compile "$cpp_flag $src -x none $wrap_file" "$executable" executable $options];
-    
-    # Set a few common compiler messages.
-    set fatal_signal "*cc: Internal compiler error: program*got fatal signal"
-    
-    if [string match "$fatal_signal 6" $comp_output] then {
-        fail $testcase "Got Signal 6, $cpp_flag $consistency_options"
-        remote_file build delete $executable
-        return
-    }
-    
-    if [string match "$fatal_signal 11" $comp_output] then {
-        fail $testcase "Got Signal 11, $cpp_flag $consistency_options"
-        remote_file build delete $executable
-        return
-    }
-    
-    # We shouldn't get these because of -w, but just in case.
-    if [string match "*cc:*warning:*" $comp_output] then {
-        warning "$testcase: (with warnings) $cpp_flag $consistency_options"
-        send_log "$comp_output\n"
-        unresolved "$testcase, $cpp_flag $consistency_options"
-        remote_file build delete $executable
-        return
-    }
-    
-    set comp_output [prune_warnings $comp_output]
-    
-    if { ![file exists $executable] } {
-        if ![is3way] {
-   	    	fail "$testcase compilation, $cpp_flag $consistency_options"
-    		untested "$testcase execution, $cpp_flag $consistency_options"
-    		return
-        } else {
-    		# FIXME: since we can't test for the existance of a remote
-    		# file without short of doing an remote file list, we assume
-    		# that since we got no output, it must have compiled.
-    		pass "$testcase compilation, $cpp_flag $consistency_options"
-        }
-    } else {
-        pass "$testcase compilation, $cpp_flag $consistency_options"
-    }
-    
-    # Check for compilation only.
-    if [file exists $rootname.conly] {
-      remote_file build delete $executable
-      return;
-    }
-
-    # See if this source file uses "long long" types, if it does, and
-    # no_long_long is set, skip execution of the test.
-    if [target_info exists no_long_long] then {
-      if [expr [search_for $src "long long"]] then {
-	untested "$testcase execution, $options"
-	continue
-      }
-    }
-
-    if [info exists consistency_execute_xfail] {
-        setup_xfail $consistency_execute_xfail
-    }
-    
-    set exec_output ""
-    set result [consistency_load "$executable" "" ""]
-    set status [lindex $result 0];
-    set exec_output [lindex $result 1];
-
-    # Strip random whitespace junk from the output.  the
-    # whitejunk is an artifact of the way we get output
-    # from boards.
-    regsub "^\[ \t\r]+" $exec_output "" clean_output
-    regsub -all "\r" $clean_output "" clean_output
-    regsub -all "\[ \t]*\n\[ \t]*" $clean_output "\n" clean_output
-    regsub -all "\n+" $clean_output "\n" clean_output
-    regsub -all "^\n+$" $clean_output "" clean_output
-
-    if { $status == "pass" } {
-        remote_file build delete $executable
-    }
-    $status "$testcase execution, $cpp_flag $consistency_options"
-
-    if { $status != "pass" } {
-      return
-    }
-
-    # Now save the output of the test programs
-    set outfile_name "$tmpdir/$basename.$out_suffix"
-    set outf [open $outfile_name "w"]
-    if { $clean_output != "" } {
-      puts -nonewline $outf $clean_output
-    }
-    close $outf
-
-    set base_outfile_name "$dirname/${BASE_COMPILER}-results/$basename.$out_suffix"
-
-    # Check that the output for another processor has been saved
-    if { ![file exists $base_outfile_name] } {
-      untested "$testcase consistency - $base_outfile_name doesn't exist"
-      return
-    } elseif { ![file readable $base_outfile_name] } {
-      untested "$testcase consistency - $base_outfile_name is not readable"
-      return
-    }
-
-    # See if this source file uses "long double" types, if it does, and
-    # NO_LONG_DOUBLE is TRUE, skip comparison of the test.
-    if {$NO_LONG_DOUBLE} then {
-        if [expr [search_for $src "long double"]] then {
-	      setup_xfail "$target_triplet"
-        }
-    }
-
-    # Compare the outputs
-    if {![catch "exec diff -b $outfile_name $base_outfile_name" message]} {
-      pass "$testcase consistency, $cpp_flag $consistency_options"
-    } else {
-      regsub "\n\[^>\n]\[^\n]*\$" $message "\n" difference
-      fail "$testcase consistency, $cpp_flag $consistency_options\n$difference"
-    }
-}
-
-#
-# search_for -- looks for a string match in a file
-#
-proc search_for { file pattern } {
-    set fd [open $file r]
-    while { [gets $fd cur_line]>=0 } {
-	if [string match "*$pattern*" $cur_line] then {
-	    close $fd
-	    return 1
-	}
-    }
-    close $fd
-    return 0
-}
-
-if {$NO_LIBGLOSS_LIBRARY_OPTIONS} {
-    # Remove standard libgloss library paths
-    set board_info(powerpc-sim,ldflags) "-msim"
-}
-
-#
-# main test loop
-#
-
-foreach dir [lsort [glob -nocomplain $srcdir/$subdir/\[a-z\]*]] {
-     if [file isdirectory $dir] {
-          set all_sources [concat [glob -nocomplain $dir/*.c] [glob -nocomplain $dir/*.cpp]]
-          foreach src [lsort $all_sources] {
-             # If we're only testing specific files and this isn't one of
-             # them, skip it.
-             if ![runtest_file_p $runtests $src] then {
-	       continue
-             }
-               regsub "^.*\\." $src "" suffix            
-             if {$suffix != "cpp"} {
-               c-consistency-execute $src "" "out"
-             }
-             c-consistency-execute $src "-x c++" "out++"
-          }
-     }
-}
diff --git a/gcc/testsuite/g++.dg/abi/bitfield3.C b/gcc/testsuite/g++.dg/abi/bitfield3.C
index da7b92fad7f..b12422a3e2c 100644
--- a/gcc/testsuite/g++.dg/abi/bitfield3.C
+++ b/gcc/testsuite/g++.dg/abi/bitfield3.C
@@ -1,6 +1,7 @@
 // Test for oversized bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
 // { dg-options "-O2" }
+// { dg-require-effective-target ilp32 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/abi/bitfield8.C b/gcc/testsuite/g++.dg/abi/bitfield8.C
index 8195fda631d..58e74be08fb 100644
--- a/gcc/testsuite/g++.dg/abi/bitfield8.C
+++ b/gcc/testsuite/g++.dg/abi/bitfield8.C
@@ -1,5 +1,7 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
 // { dg-options "-fabi-version=0" }
+// { dg-require-effective-target ilp32 }
+
 
 struct A { 
   virtual void f() {}
diff --git a/gcc/testsuite/g++.dg/abi/bitfield9.C b/gcc/testsuite/g++.dg/abi/bitfield9.C
index 0d744c7318f..0d3a8bf8985 100644
--- a/gcc/testsuite/g++.dg/abi/bitfield9.C
+++ b/gcc/testsuite/g++.dg/abi/bitfield9.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options -w }
 
 struct X {
diff --git a/gcc/testsuite/g++.dg/abi/dtor1.C b/gcc/testsuite/g++.dg/abi/dtor1.C
index 48b0a557127..f9425e013df 100644
--- a/gcc/testsuite/g++.dg/abi/dtor1.C
+++ b/gcc/testsuite/g++.dg/abi/dtor1.C
@@ -1,4 +1,5 @@
-// { dg-do compile { target i?86-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0" }
 
 struct A {
diff --git a/gcc/testsuite/g++.dg/abi/empty10.C b/gcc/testsuite/g++.dg/abi/empty10.C
index 970afbaf512..ae992944dee 100644
--- a/gcc/testsuite/g++.dg/abi/empty10.C
+++ b/gcc/testsuite/g++.dg/abi/empty10.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0 -w" }
 
 struct E {};
diff --git a/gcc/testsuite/g++.dg/abi/empty7.C b/gcc/testsuite/g++.dg/abi/empty7.C
index 4b1ac3b2c2c..0a665a84531 100644
--- a/gcc/testsuite/g++.dg/abi/empty7.C
+++ b/gcc/testsuite/g++.dg/abi/empty7.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0" }
 
 struct S1 {};
diff --git a/gcc/testsuite/g++.dg/abi/empty9.C b/gcc/testsuite/g++.dg/abi/empty9.C
index 757bf6c8690..06e616adb30 100644
--- a/gcc/testsuite/g++.dg/abi/empty9.C
+++ b/gcc/testsuite/g++.dg/abi/empty9.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-w -fabi-version=0" }
 
 struct E1 {};
diff --git a/gcc/testsuite/g++.dg/abi/layout3.C b/gcc/testsuite/g++.dg/abi/layout3.C
index 6ab6d6b4dc3..a30a85219fd 100644
--- a/gcc/testsuite/g++.dg/abi/layout3.C
+++ b/gcc/testsuite/g++.dg/abi/layout3.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0 -w" }
 
 struct S {
diff --git a/gcc/testsuite/g++.dg/abi/layout4.C b/gcc/testsuite/g++.dg/abi/layout4.C
index a1d27ee7f43..da3c2f5d8c7 100644
--- a/gcc/testsuite/g++.dg/abi/layout4.C
+++ b/gcc/testsuite/g++.dg/abi/layout4.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=1" }
 
 struct C4
diff --git a/gcc/testsuite/g++.dg/abi/thunk1.C b/gcc/testsuite/g++.dg/abi/thunk1.C
index c9ad5b478f9..343a2aa6e27 100644
--- a/gcc/testsuite/g++.dg/abi/thunk1.C
+++ b/gcc/testsuite/g++.dg/abi/thunk1.C
@@ -1,4 +1,6 @@
-// { dg-do compile { target i?86-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
+
 
 struct A {
   virtual void f ();
diff --git a/gcc/testsuite/g++.dg/abi/thunk2.C b/gcc/testsuite/g++.dg/abi/thunk2.C
index b1c9788e6d0..e6b2924cfdb 100644
--- a/gcc/testsuite/g++.dg/abi/thunk2.C
+++ b/gcc/testsuite/g++.dg/abi/thunk2.C
@@ -1,4 +1,5 @@
-// { dg-do compile { target i?86-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options -w }
 
 struct A {
diff --git a/gcc/testsuite/g++.dg/abi/vbase11.C b/gcc/testsuite/g++.dg/abi/vbase11.C
index 375577365a3..8c854b9c13e 100644
--- a/gcc/testsuite/g++.dg/abi/vbase11.C
+++ b/gcc/testsuite/g++.dg/abi/vbase11.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0" }
 
 struct A { virtual void f(); char c1; };
diff --git a/gcc/testsuite/g++.dg/abi/vthunk2.C b/gcc/testsuite/g++.dg/abi/vthunk2.C
index 2499749d64c..9b6f14c50e2 100644
--- a/gcc/testsuite/g++.dg/abi/vthunk2.C
+++ b/gcc/testsuite/g++.dg/abi/vthunk2.C
@@ -1,4 +1,5 @@
-// { dg-do compile { target i?86-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-*} }
+// { dg-require-effective-target ilp32 }
 
 struct c0 {
   virtual void f ();
diff --git a/gcc/testsuite/g++.dg/abi/vthunk3.C b/gcc/testsuite/g++.dg/abi/vthunk3.C
index 3bd2fd40a18..59fbbdc4be3 100644
--- a/gcc/testsuite/g++.dg/abi/vthunk3.C
+++ b/gcc/testsuite/g++.dg/abi/vthunk3.C
@@ -1,4 +1,5 @@
-// { dg-do compile { target i?86-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0" }
 
 struct A {
diff --git a/gcc/testsuite/g++.dg/eh/simd-1.C b/gcc/testsuite/g++.dg/eh/simd-1.C
index a8b180b6f45..46301c949ec 100644
--- a/gcc/testsuite/g++.dg/eh/simd-1.C
+++ b/gcc/testsuite/g++.dg/eh/simd-1.C
@@ -1,7 +1,7 @@
 // Test EH when V2SI SIMD registers are involved.
 // Contributed by Aldy Hernandez (aldy@quesejoda.com).
 // { dg-options "-O" }
-// { dg-options "-O -w" { target i?86-*-* } }
+// { dg-options "-O -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
 // { dg-do run }
 // { dg-error "" "PR target/12916" { target sparc*-*-* } 0 }
 
diff --git a/gcc/testsuite/g++.dg/eh/simd-2.C b/gcc/testsuite/g++.dg/eh/simd-2.C
index 3b4b02d3841..367cae060ad 100644
--- a/gcc/testsuite/g++.dg/eh/simd-2.C
+++ b/gcc/testsuite/g++.dg/eh/simd-2.C
@@ -1,7 +1,7 @@
 // Test EH when V4SI SIMD registers are involved.
 // Contributed by Aldy Hernandez (aldy@quesejoda.com).
 // { dg-options "-O" }
-// { dg-options "-O -w" { target i?86-*-* } }
+// { dg-options "-O -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
 // { dg-options "-O -w -maltivec" { target powerpc64-*-linux* } }
 // { dg-do run { xfail "powerpc64-*-linux*"}  }
 // { dg-error "" "PR target/12916" { target sparc*-*-* } 0 }
diff --git a/gcc/testsuite/g++.dg/ext/attrib8.C b/gcc/testsuite/g++.dg/ext/attrib8.C
index 26021c56ca4..7d99132c175 100644
--- a/gcc/testsuite/g++.dg/ext/attrib8.C
+++ b/gcc/testsuite/g++.dg/ext/attrib8.C
@@ -1,5 +1,6 @@
 // PR 8656
-// { dg-do compile { target i?86-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 
 extern int * (__attribute__((stdcall)) *fooPtr)( void);
 int * __attribute__((stdcall)) myFn01( void) { return 0; }
diff --git a/gcc/testsuite/g++.dg/ext/ctor5.C b/gcc/testsuite/g++.dg/ext/ctor5.C
new file mode 100644
index 00000000000..18e55d179fa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/ctor5.C
@@ -0,0 +1,8 @@
+// PR c++/24278
+
+template<typename T> struct A
+{
+  A() : T(0) {} // { dg-error "base" }
+};
+
+A<int*> a; // { dg-error "instantiated" }
diff --git a/gcc/testsuite/g++.dg/ext/typeof10.C b/gcc/testsuite/g++.dg/ext/typeof10.C
new file mode 100644
index 00000000000..1b357ad9d7b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/typeof10.C
@@ -0,0 +1,11 @@
+// PR c++/20552
+// Origin: Ivan Godard <igodard@pacbell.net>
+
+template<int> struct A
+{
+  void foo()
+  {
+    typedef int T;                // { dg-error "previous" }
+    typedef __typeof__(*this) T;  // { dg-error "conflicting" }
+  }
+};
diff --git a/gcc/testsuite/g++.dg/opt/cse2.C b/gcc/testsuite/g++.dg/opt/cse2.C
index 5a04bf53ecb..325169dff34 100644
--- a/gcc/testsuite/g++.dg/opt/cse2.C
+++ b/gcc/testsuite/g++.dg/opt/cse2.C
@@ -1,6 +1,6 @@
 // This testcase caused ICE on IA-32 in simplify_unary_operation
 // CSE did not assume SUBREGs changing mode from integral to floating.
-// { dg-do run { target i?86-*-* sparc*-*-* } }
+// { dg-do run { target i?86-*-* sparc*-*-* x86_64-*-* } }
 // { dg-options "-O2" }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/opt/inline9.C b/gcc/testsuite/g++.dg/opt/inline9.C
index 10ccb47dc79..10bc54ccd95 100644
--- a/gcc/testsuite/g++.dg/opt/inline9.C
+++ b/gcc/testsuite/g++.dg/opt/inline9.C
@@ -3,7 +3,7 @@
 // Testcase by Alan Modra <amodra@bigpond.net.au>
 // { dg-do run }
 // { dg-options "-O" }
-// { dg-options "-O -mtune=i686" { target i?86-*-* } }
+// { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
 
 struct thread_info
 {
diff --git a/gcc/testsuite/g++.dg/opt/life1.C b/gcc/testsuite/g++.dg/opt/life1.C
index ac7a9f26d00..f029767b313 100644
--- a/gcc/testsuite/g++.dg/opt/life1.C
+++ b/gcc/testsuite/g++.dg/opt/life1.C
@@ -1,6 +1,8 @@
 // This testcase did not set up the pic register on IA-32 due
 // to bug in calculate_global_regs_live EH edge handling.
-// { dg-do compile { target i?86-*-linux* } }
+// { dg-do compile { target i?86-*-linux* x86_64-*-linux* } }
+// { dg-require-effective-target ilp32 }
+// { dg-require-effective-target fpic }
 // { dg-options "-O2 -fPIC" }
 
 struct A { };
diff --git a/gcc/testsuite/g++.dg/opt/longbranch2.C b/gcc/testsuite/g++.dg/opt/longbranch2.C
index b74ceddf085..f2a3a781788 100644
--- a/gcc/testsuite/g++.dg/opt/longbranch2.C
+++ b/gcc/testsuite/g++.dg/opt/longbranch2.C
@@ -2,7 +2,8 @@
 // Originator: thor@math.tu-berlin.de
 
 // { dg-do compile }
-// { dg-options "-O3 -funroll-loops -mtune=k6 -fomit-frame-pointer" { target i?86-*-*  } }
+// { dg-options "-O3 -funroll-loops -mtune=k6 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
+
 
 // This used to fail to assemble because of an out-of-range 'loop' instructions.
 
diff --git a/gcc/testsuite/g++.dg/opt/mmx1.C b/gcc/testsuite/g++.dg/opt/mmx1.C
index e433d554aea..93e3fe7f814 100644
--- a/gcc/testsuite/g++.dg/opt/mmx1.C
+++ b/gcc/testsuite/g++.dg/opt/mmx1.C
@@ -3,7 +3,7 @@
 // mmx -> mmx register moves.
 // { dg-do compile }
 // { dg-options "-O2" }
-// { dg-options "-fno-exceptions -O2 -mmmx -fPIC" { target i?86-*-*  } }
+// { dg-options "-fno-exceptions -O2 -mmmx -fPIC" { target { { i?86-*-* x86_64-*-* } && ilp32 }  } }
 
 struct A {
   unsigned a0;
diff --git a/gcc/testsuite/g++.dg/opt/reg-stack4.C b/gcc/testsuite/g++.dg/opt/reg-stack4.C
index 7b461d8a6f3..b1b7434163a 100644
--- a/gcc/testsuite/g++.dg/opt/reg-stack4.C
+++ b/gcc/testsuite/g++.dg/opt/reg-stack4.C
@@ -5,7 +5,7 @@
 // deleted a valid edge.
 
 // { dg-do compile }
-// { dg-options "-mtune=i586 -O2" { target i?86-*-* } }
+// { dg-options "-mtune=i586 -O2" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
 
 struct array {
   double data;
diff --git a/gcc/testsuite/g++.dg/other/big-struct.C b/gcc/testsuite/g++.dg/other/big-struct.C
index b00683135f3..dcf230dd69c 100644
--- a/gcc/testsuite/g++.dg/other/big-struct.C
+++ b/gcc/testsuite/g++.dg/other/big-struct.C
@@ -1,4 +1,5 @@
-// { dg-do compile { target i?86-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/other/default1.C b/gcc/testsuite/g++.dg/other/default1.C
new file mode 100644
index 00000000000..a6d96818563
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/default1.C
@@ -0,0 +1,22 @@
+// PR c++/24103
+// ICE in simple_cst_equal
+// Origin: Alexander Stepanov <astepanov@softminecorp.com>
+// { dg-do compile }
+// { dg-options "" }
+
+struct S
+{
+  int i;
+};
+
+struct A
+{
+  A(S = (S){0});
+};
+
+struct B
+{
+  B(S = (S){0});
+};
+
+B::B(S) {}
diff --git a/gcc/testsuite/g++.dg/other/default2.C b/gcc/testsuite/g++.dg/other/default2.C
new file mode 100644
index 00000000000..be0e5c32413
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/default2.C
@@ -0,0 +1,9 @@
+// PR c++/16829
+// { dg-do "compile" }
+
+template<typename T> void foo(T, int = 0, int) {}  // { dg-error "default" }
+
+void bar()
+{
+  foo(0);
+}
diff --git a/gcc/testsuite/g++.dg/other/default3.C b/gcc/testsuite/g++.dg/other/default3.C
new file mode 100644
index 00000000000..324ba7146fe
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/default3.C
@@ -0,0 +1,109 @@
+// PR c++/16829
+// { dg-do "compile" }
+
+void f1(int = 0, int);                       // { dg-error "default" }
+
+void f2(int = 0, int) {}                     // { dg-error "default" }
+
+void f3(int, int);
+void f3(int = 0, int);                       // { dg-error "default" }
+
+void f4(int, int);
+void f4(int = 0, int) {}                     // { dg-error "default" }
+
+void f5();
+void f5(int = 0, int);                       // { dg-error "default" }
+
+void f6();
+void f6(int = 0, int) {}                     // { dg-error "default" }
+
+template<typename> void g1(int = 0, int);    // { dg-error "default" }
+
+template<typename> void g2(int = 0, int) {}  // { dg-error "default" }
+
+template<typename> void g3(int, int);
+template<typename> void g3(int = 0, int);    // { dg-error "default" }
+
+template<typename> void g4(int, int);
+template<typename> void g4(int = 0, int) {}  // { dg-error "default" }
+
+template<typename> void g5();
+template<typename> void g5(int = 0, int);    // { dg-error "default" }
+
+template<typename> void g6();
+template<typename> void g6(int = 0, int) {}  // { dg-error "default" }
+
+template<typename T> void g7(T, T)   {}
+template<typename T> void g7(T* = 0, T*) {}  // { dg-error "default" }
+
+
+struct A
+{
+  void F1(int = 0, int);                       // { dg-error "default" }
+
+  void F2(int = 0, int) {}                     // { dg-error "default" }
+
+  void F3(int, int);
+
+  void F4();
+  void F4(int = 0, int);                       // { dg-error "default" }
+
+  void F5();
+  void F5(int = 0, int) {}                     // { dg-error "default" }
+
+  template<typename> void G1(int = 0, int);    // { dg-error "default" }
+
+  template<typename> void G2(int = 0, int) {}  // { dg-error "default" }
+
+  template<typename> void G3(int, int);
+
+  template<typename> void G4();
+  template<typename> void G4(int = 0, int);    // { dg-error "default" }
+
+  template<typename> void G5();
+  template<typename> void G5(int = 0, int) {}  // { dg-error "default" }
+
+  template<typename T> void G6(T, T)   {}
+  template<typename T> void G6(T* = 0, T*) {}  // { dg-error "default" }
+};
+
+void A::F3(int = 0, int) {}                     // { dg-error "default" }
+
+template<typename> void A::G3(int = 0, int) {}  // { dg-error "default" }
+
+
+template<typename> struct B
+{
+  void F1(int = 0, int);                       // { dg-error "default" }
+
+  void F2(int = 0, int) {}                     // { dg-error "default" }
+
+  void F3(int, int);
+
+  void F4();
+  void F4(int = 0, int);                       // { dg-error "default" }
+
+  void F5();
+  void F5(int = 0, int) {}                     // { dg-error "default" }
+
+  template<typename> void G1(int = 0, int);    // { dg-error "default" }
+
+  template<typename> void G2(int = 0, int) {}  // { dg-error "default" }
+
+  template<typename> void G3(int, int);
+
+  template<typename> void G4();
+  template<typename> void G4(int = 0, int);    // { dg-error "default" }
+
+  template<typename> void G5();
+  template<typename> void G5(int = 0, int) {}  // { dg-error "default" }
+
+  template<typename T> void G6(T, T)   {}
+  template<typename T> void G6(T* = 0, T*) {}  // { dg-error "default" }
+};
+
+template<typename T>
+void B<T>::F3(int = 0, int) {}  // { dg-error "default" }
+
+template<typename T> template<typename>
+void B<T>::G3(int = 0, int) {}  // { dg-error "default" }
diff --git a/gcc/testsuite/g++.dg/other/ellipsis1.C b/gcc/testsuite/g++.dg/other/ellipsis1.C
new file mode 100644
index 00000000000..d2501ca85e2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/ellipsis1.C
@@ -0,0 +1,12 @@
+// PR c++/26291
+// { dg-do compile }
+
+struct A
+{
+    A& operator= (A,...);  // { dg-error "variable number of arguments" }
+    A operator+ (...);     // { dg-error "variable number of arguments" }
+    operator int(...);     // { dg-error "variable number of arguments" }
+    int operator() (...);
+};
+
+A operator- (A,...);       // { dg-error "variable number of arguments" }
diff --git a/gcc/testsuite/g++.dg/other/virtual1.C b/gcc/testsuite/g++.dg/other/virtual1.C
new file mode 100644
index 00000000000..5f44fa78ab2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/virtual1.C
@@ -0,0 +1,7 @@
+// PR c++/26070
+// { dg-do compile }
+
+struct A
+{
+  virtual static int i;  // { dg-error "virtual" }
+};
diff --git a/gcc/testsuite/g++.dg/overload/koenig2.C b/gcc/testsuite/g++.dg/overload/koenig2.C
new file mode 100644
index 00000000000..f35aa1a31b6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/overload/koenig2.C
@@ -0,0 +1,15 @@
+// Copyright (C) 2005 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 18 Oct 2005 <nathan@codesourcery.com>
+
+// PR 21383
+// Origin: Matthew Hall <mahall@ncsa.uiuc.edu>
+
+template <class T>
+void dummy(T& t);
+
+void anyfunc(int x);
+
+void Foo ()
+{
+  anyfunc (&dummy<>); // { dg-error "cannot resolve overload" "" }
+}
diff --git a/gcc/testsuite/g++.dg/parse/access8.C b/gcc/testsuite/g++.dg/parse/access8.C
new file mode 100644
index 00000000000..badea1c98b7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/access8.C
@@ -0,0 +1,12 @@
+// PR c++/22618
+
+class foo
+{
+  typedef int memfun;  // { dg-error "private" }
+};
+
+template<foo::memfun> // { dg-error "context" } 
+struct fm_obj { };
+
+template <typename T = foo::memfun> // { dg-error "context" }
+struct S {};
diff --git a/gcc/testsuite/g++.dg/parse/operator4.C b/gcc/testsuite/g++.dg/parse/operator4.C
index 9395ccdd1b2..054ddc8354f 100644
--- a/gcc/testsuite/g++.dg/parse/operator4.C
+++ b/gcc/testsuite/g++.dg/parse/operator4.C
@@ -1 +1 @@
-int operator *(int, ...); // { dg-error "class" }
+int operator *(int, ...); // { dg-error "class|variable number of arguments" }
diff --git a/gcc/testsuite/g++.dg/rtti/tinfo1.C b/gcc/testsuite/g++.dg/rtti/tinfo1.C
index f359d16253d..c82922a2d27 100644
--- a/gcc/testsuite/g++.dg/rtti/tinfo1.C
+++ b/gcc/testsuite/g++.dg/rtti/tinfo1.C
@@ -1,8 +1,8 @@
 // Test if a local definition is in a linkonce/comdat section.
 // { dg-do compile }
-// { dg-final { scan-assembler "_ZTIP9CTemplateIhE:" } }
-// { dg-final { scan-assembler-not ".globl\[ 	\]+_ZTIP9CTemplateIhE" } }
-// { dg-final { scan-assembler-not ".section\[^\n\r\]*_ZTIP9CTemplateIhE\[^\n\r\]*" } }
+// { dg-final { scan-assembler "_ZTIP9CTemplateIhE\[: \t\n\]" } }
+// { dg-final { scan-assembler-not "(.globl|.global)\[ 	\]+_ZTIP9CTemplateIhE" } }
+// { dg-final { scan-assembler-not ".section\[^\n\r\]*_ZTIP9CTemplateIhE\[^\n\r\]*" { xfail *-*-* } } };
 
 
 namespace std
diff --git a/gcc/testsuite/g++.dg/template/crash38.C b/gcc/testsuite/g++.dg/template/crash38.C
new file mode 100644
index 00000000000..c652cc86f6e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash38.C
@@ -0,0 +1,8 @@
+// PR c++/23307
+
+class A
+{
+  template<class R>
+  static void f(X&); // { dg-error "" }
+  inline void A::f<void>(X&); // { dg-error "f|expected" }
+};
diff --git a/gcc/testsuite/g++.dg/template/crash41.C b/gcc/testsuite/g++.dg/template/crash41.C
new file mode 100644
index 00000000000..2b8028e4310
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash41.C
@@ -0,0 +1,15 @@
+// PR c++/22464
+
+template<typename T>
+void do_something(const T* A) { // { dg-error "declared" }
+  struct helper_t { 
+    helper_t() {  
+      A[0]; // { dg-error "use" }
+    }
+  } helper;
+}
+
+void sub1() {
+  double A[7];
+  do_something (A);
+}
diff --git a/gcc/testsuite/g++.dg/template/dtor3.C b/gcc/testsuite/g++.dg/template/dtor3.C
index 7f4099861fb..98c2ef6c18a 100644
--- a/gcc/testsuite/g++.dg/template/dtor3.C
+++ b/gcc/testsuite/g++.dg/template/dtor3.C
@@ -1,4 +1,4 @@
 // PR c++/19762
 
 template<int> struct A { ~A(){} }; // { dg-error "" }
-template A<>::~A(); // { dg-error "" }
+template A<>::~A(); // { dg-error "template|declaration" }
diff --git a/gcc/testsuite/g++.dg/template/friend38.C b/gcc/testsuite/g++.dg/template/friend38.C
new file mode 100644
index 00000000000..41faf79110c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/friend38.C
@@ -0,0 +1,12 @@
+// PR c++/22352
+
+template <class A>
+class s
+{
+  typedef int d;
+  template <class s, typename s::d>
+  friend class t;
+};
+
+s<int> t1;
+
diff --git a/gcc/testsuite/g++.dg/template/overload8.C b/gcc/testsuite/g++.dg/template/overload8.C
new file mode 100644
index 00000000000..cc6a05b7041
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/overload8.C
@@ -0,0 +1,7 @@
+// PR c++/24915
+
+struct A
+{
+  template<int> void foo() {}
+  template<int> int foo() {}
+};
diff --git a/gcc/testsuite/g++.dg/template/ptrmem16.C b/gcc/testsuite/g++.dg/template/ptrmem16.C
new file mode 100644
index 00000000000..caf5dd0f227
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ptrmem16.C
@@ -0,0 +1,22 @@
+// PR c++/25369
+// { dg-do link }
+
+template <typename> struct A 
+{
+  void foo() {}
+};
+
+void bar(void (A<int>::*)()) {}
+
+template <int> void baz()
+{
+  bar(&A<int>::foo);
+}
+
+int main()
+{
+  baz<0>();
+  return 0;
+}
+
+
diff --git a/gcc/testsuite/g++.dg/template/spec28.C b/gcc/testsuite/g++.dg/template/spec28.C
new file mode 100644
index 00000000000..f0bb22caeb4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/spec28.C
@@ -0,0 +1,6 @@
+// PR c++/25854
+// Bad diagnostic
+// { dg-do compile }
+
+template<typename> struct A {};  // { dg-error "provided" }
+template<> struct A<> {};        // { dg-error "wrong number" }
diff --git a/gcc/testsuite/g++.dg/template/typedef3.C b/gcc/testsuite/g++.dg/template/typedef3.C
new file mode 100644
index 00000000000..481f451d84e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/typedef3.C
@@ -0,0 +1,7 @@
+// PR c++/19397
+// { dg-do compile }
+
+template<typename> struct A
+{
+    typedef int ::template; // { dg-error "template" }
+};
diff --git a/gcc/testsuite/g++.old-deja/g++.abi/aggregates.C b/gcc/testsuite/g++.old-deja/g++.abi/aggregates.C
index 187c30b54d6..24f430bd64e 100644
--- a/gcc/testsuite/g++.old-deja/g++.abi/aggregates.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/aggregates.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-linux* i?86-*-freebsd* } }
+// { dg-do run { target i?86-*-linux* x86_64-*-linux* i?86-*-freebsd* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-malign-double" }
 // Origin: Alex Samuel <samuel@codesourcery.com>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.abi/align.C b/gcc/testsuite/g++.old-deja/g++.abi/align.C
index 28d3ba9ce86..3f691e2909e 100644
--- a/gcc/testsuite/g++.old-deja/g++.abi/align.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/align.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-linux* i?86-*-freebsd* } }
+// { dg-do run { target i?86-*-linux* x86_64-*-linux* i?86-*-freebsd* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-malign-double" }
 // Origin: Alex Samuel <samuel@codesourcery.com>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.abi/bitfields.C b/gcc/testsuite/g++.old-deja/g++.abi/bitfields.C
index 15f4ada3887..d5c3192095d 100644
--- a/gcc/testsuite/g++.old-deja/g++.abi/bitfields.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/bitfields.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-linux* i?86-*-freebsd* } }
+// { dg-do run { target i?86-*-linux* x86_64-*-linux* i?86-*-freebsd* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-malign-double" }
 // Origin: Alex Samuel <samuel@codesourcery.com>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/redecl1.C b/gcc/testsuite/g++.old-deja/g++.brendan/redecl1.C
index 46f82df30d7..0e01f2b4789 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/redecl1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/redecl1.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 // GROUPS passed redeclaration
 inline int min(int x, int y) {return x < y ? x : y;}	/* 235 */// { dg-error "" } .*
 int min(int a, int b);
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/badalloc1.C b/gcc/testsuite/g++.old-deja/g++.eh/badalloc1.C
index 907474e13fa..b4a24504585 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/badalloc1.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/badalloc1.C
@@ -14,11 +14,10 @@ extern "C" void *memcpy(void *, const void *, size_t);
 #ifdef STACK_SIZE
 const int arena_size = 256;
 #else
-#ifdef __FreeBSD__
-// FreeBSD with threads requires even more space at initialization time.
-#include "bits/c++config.h"
-#include "bits/gthr.h"
-const int arena_size = 131072;
+#if defined(__FreeBSD__) || defined(__sun__)
+// FreeBSD with threads and Solaris with threads require even more
+// space at initialization time.  FreeBSD 5 now requires over 131072 bytes.
+const int arena_size = 262144;
 #else
 const int arena_size = 32768;
 #endif
@@ -105,16 +104,15 @@ void fn_catchthrow() throw(int)
 
 int main()
 {
-#ifdef __FreeBSD__
-// FreeBSD with threads fails the test unless each thread primes itself.
-  if (__gthread_active_p())
-    {
-      try{fn_throw();}
-      catch(int a){}
-    }
-// This was added to test with well-known idiom to detect regressions here
-// rather than always failing with -pthread.
-#endif
+  /* On some systems (including FreeBSD and Solaris 2.10),
+     __cxa_get_globals will try to call "malloc" when threads are in
+     use.  Therefore, we throw one exception up front so that
+     __cxa_get_globals is all set up.  Ideally, this would not be
+     necessary, but it is a well-known idiom, and using this technique
+     means that we can still validate the fact that exceptions can be
+     thrown when malloc fails.  */
+  try{fn_throw();}
+  catch(int a){}
 
   fail = 1;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/inline1.C b/gcc/testsuite/g++.old-deja/g++.eh/inline1.C
index cb2d3fff61c..e3597675747 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/inline1.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/inline1.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 // { dg-options "-ansi -pedantic-errors -O2" }
 // Copyright (C) 1999 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 29 Nov 1999 <nathan@acm.org>
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/tmpl2.C b/gcc/testsuite/g++.old-deja/g++.eh/tmpl2.C
index 9bd5aeb64d8..dd2801d26b3 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/tmpl2.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/tmpl2.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail i*86-*-linux* } }
+// { dg-do assemble }
 // { dg-options "-O" }
 
 // Posted by H. J. Lu <hjl@lucon.org>
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C b/gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C
index 146f3ac7348..97d4b8e6bfc 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { target i?86-*-* } }
+// { dg-do assemble { target i?86-*-* x86_64-*-* } }
 // Origin: Anthony Green  <green@cygnus.com>
 
 void foo ()
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C
index 3947e904f5f..e879791665d 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C
@@ -1,4 +1,5 @@
-// { dg-do assemble { target i?86-*-* } }
+// { dg-do assemble { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // Test for using prefix attributes in a parameter decl.
 // Contributed by Jason Merrill <jason@cygnus.com>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C
index 0979e168abb..09b2bf2e67d 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // Test that stdcall doesn't prevent us from using op delete.
 // Contributed by Jason Merrill <jason@cygnus.com>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C
index aff745e527c..7d9c70e3b75 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // Test for proper handling of attributes in template instantiation.
 // Contributed by Jason Merrill <jason@cygnus.com>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/weak.C b/gcc/testsuite/g++.old-deja/g++.law/weak.C
index a40350a78b3..ea07afe4c42 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/weak.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/weak.C
@@ -1,4 +1,4 @@
-// { dg-do link { target i?86-*-linux* } }
+// { dg-do link { target i?86-*-linux* x86_64-*-linux* } }
 // { dg-options "-static" }
 // Bug: g++ fails to instantiate operator<<.
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p10769a.C b/gcc/testsuite/g++.old-deja/g++.mike/p10769a.C
deleted file mode 100644
index 89cc31d0fff..00000000000
--- a/gcc/testsuite/g++.old-deja/g++.mike/p10769a.C
+++ /dev/null
@@ -1,46 +0,0 @@
-// { dg-do run  }
-// { dg-options "-Wno-pmf-conversions" }
-// prms-id: 10769
-
-#define PMF2PF(PMF) ((void (*)())(PMF))
-
-int ok = 0;
-
-class A {
-public:
-  void f1a() { ok += 3; }
-  void f1b() { ok += 5; }
-  void f2a() { ok += 7; }
-  void f2b() { }
-  static void (*table[2][2])();
-  void main();
-} a;
-
-void (*A::table[2][2])()
-  = { { PMF2PF(&A::f1a), PMF2PF(&A::f1b) },
-      { PMF2PF(&A::f2a), PMF2PF(&A::f1b) },
-  };
-
-void
-dispatch (A *obj, int i, int j)
-{
-  (*(void (*)(A *))A::table[i][j])(obj);
-}
-
-void A::main() {
-  dispatch (&a, 0, 0);
-  void (A::*mPtr)() = &A::f1a;
-
-  (*(void (*)(A*))PMF2PF(mPtr))(&a);
-  (*(void (*)(A*))PMF2PF(f2a))(&a); // { dg-bogus "" "" { xfail *-*-* } }  
-}
-
-int main() {
-  a.A::main();
-  dispatch (&a, 0, 1);
-  void (A::*mPtr)() = &A::f1b;
-
-  (*(void (*)(A*))PMF2PF(a.*mPtr))(&a);
-  (*(void (*)(A*))PMF2PF(a.f2a))(&a); // { dg-bogus "" "" { xfail *-*-* } }  
-  return ok != 3+3+5+5+7+7;
-}
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/crash2.C b/gcc/testsuite/g++.old-deja/g++.ns/crash2.C
index 07316460b7e..72714299b38 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/crash2.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/crash2.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // Submitted by bjornw@fairplay.no
 
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/template7.C b/gcc/testsuite/g++.old-deja/g++.ns/template7.C
index 97e3ee567d8..876096b7490 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/template7.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/template7.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 
 // Based on bug report by Eric NICOLAS <nicolas@bnp-eng.remcomp.com>
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
index fe04a3dbc20..1100414830e 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/ns3.C b/gcc/testsuite/g++.old-deja/g++.oliva/ns3.C
index 0a650709fb2..4ddbb32892a 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/ns3.C
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/ns3.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // Copyright (C) 1999 Free Software Foundation
 
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/stkalign.C b/gcc/testsuite/g++.old-deja/g++.oliva/stkalign.C
index 045285fea89..2b24f489e1e 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/stkalign.C
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/stkalign.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail i*86-*-* } }
+// { dg-do assemble }
 
 // Copyright (C) 2000 Free Software Foundation
 
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/typeof1.C b/gcc/testsuite/g++.old-deja/g++.oliva/typeof1.C
index d427c550bf0..197abe6a5ed 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/typeof1.C
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/typeof1.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // Copyright (C) 1999 Free Software Foundation
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash16.C b/gcc/testsuite/g++.old-deja/g++.other/crash16.C
index 91184bd34dd..22583260aeb 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash16.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash16.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 // { dg-options "-O2" }
 // Origin: scott snyder <snyder@fnal.gov>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash34.C b/gcc/testsuite/g++.old-deja/g++.other/crash34.C
index c320ccbd6e4..4e3c30a9ac4 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash34.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash34.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 // Origin: Jakub Jelinek <jakub@redhat.com>
 
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/enum5.C b/gcc/testsuite/g++.old-deja/g++.other/enum5.C
index bee7b985b5a..f254dca1bf5 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/enum5.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/enum5.C
@@ -1,4 +1,4 @@
-// { dg-do run }
+// { dg-do compile }
 // Copyright (C) 2001, 2003 Free Software Foundation, Inc.
 // Contributed by Ben Elliston <bje@redhat.com>
 
@@ -8,7 +8,7 @@ extern "C" void abort();
 
 enum numbers { one, two, three } __attribute__ ((packed)) nums; // { dg-bogus "" "" { xfail *-*-* } } 
 enum colours { red = 1000, green, blue } __attribute__ ((packed)) cols; // { dg-bogus "" "" { xfail *-*-* } } 
-enum __attribute__ ((packed)) conditions { fine, rain, cloudy } forecast; // { dg-bogus "" "" { xfail *-*-* } } 
+enum conditions { fine, rain, cloudy } __attribute__ ((packed)) forecast; // { dg-bogus "" "" { xfail *-*-* } } 
 
 int
 main()
@@ -19,7 +19,7 @@ main()
   if (sizeof (cols) != 2)
     abort ();
 
-  if (sizeof (forecast) != 1) // { dg-bogus "" "" { xfail *-*-* } }
+  if (sizeof (forecast) != 1)
     abort ();
 
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.other/lookup5.C b/gcc/testsuite/g++.old-deja/g++.other/lookup5.C
index 48dd004d826..65c6402f10f 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/lookup5.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/lookup5.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 // Simplified from bug report by Paris Smaragdis <paris@media.mit.edu>
 
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/regstack.C b/gcc/testsuite/g++.old-deja/g++.other/regstack.C
index 5be2fcd9974..5b833473332 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/regstack.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/regstack.C
@@ -1,4 +1,4 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
 // { dg-options "-O2" }
 
 inline double foo (double x)
diff --git a/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C b/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C
index 5a376669bd3..c4c0d8b84ef 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-mtune=i686 -O2 -fpic" }
 class G {};
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C b/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C
index 430a2c6c1f6..99e0943b3b6 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C
@@ -1,4 +1,5 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-*} }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-mtune=i686 -O2" }
 class G {};
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/asm1.C b/gcc/testsuite/g++.old-deja/g++.pt/asm1.C
index 62787de9be1..8de6b767932 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/asm1.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/asm1.C
@@ -1,6 +1,6 @@
 // { dg-do assemble { target i?86-*-linux* x86_64-*-linux* } }
 // We'd use ebx with -fpic/-fPIC, so skip.
-// { dg-skip-if "" { i?86-*-* } { "-fpic" "-fPIC" } { "" } }
+// { dg-skip-if "" { ilp32 } { "-fpic" "-fPIC" } { "" } }
 // Origin: "Weidmann, Nicholas" <nicholas.weidmann@swx.ch>
 
 template<int i> int foo(int v)
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/asm2.C b/gcc/testsuite/g++.old-deja/g++.pt/asm2.C
index 3fe5e2a213e..90e494bf55c 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/asm2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/asm2.C
@@ -1,6 +1,7 @@
-// { dg-do assemble { target i?86-*-linux* } }
+// { dg-do assemble { target i?86-*-linux* x86_64-*-linux* } }
+// { dg-require-effective-target ilp32 }
 // We'd use ebx with -fpic/-fPIC, so skip.
-// { dg-skip-if "" { i?86-*-* } { "-fpic" "-fPIC" } { "" } }
+// { dg-skip-if "" { *-*-* } { "-fpic" "-fPIC" } { "" } }
 // Origin: "Weidmann, Nicholas" <nicholas.weidmann@swx.ch>
 
 typedef void (function_ptr)(int);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash65.C b/gcc/testsuite/g++.old-deja/g++.pt/crash65.C
index 4d5696c2d10..98fbec61299 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash65.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash65.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // Copyright (C) 2000, 2002 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 11 Jan 2001 <nathan@codesourcery.com>
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/decl2.C b/gcc/testsuite/g++.old-deja/g++.pt/decl2.C
index 962af511974..b671213ad59 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/decl2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/decl2.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // Simplified from testcase by Christophe Boyanique <boyan@imac.u-paris2.fr>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/explicit76.C b/gcc/testsuite/g++.old-deja/g++.pt/explicit76.C
index 03bd9123305..15f680c803a 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/explicit76.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/explicit76.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // Based on bug report by Simon A. Crase <s.crase@ieee.org>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/friend44.C b/gcc/testsuite/g++.old-deja/g++.pt/friend44.C
index 1f791729061..4ef4c634bb9 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/friend44.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/friend44.C
@@ -1,4 +1,4 @@
-// { dg-do run }
+// { dg-do compile }
 // Test that template friends referring to class template members are
 // respected.
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp85.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp85.C
index de3f4e57448..03e3d467522 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp85.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp85.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // by Paul Burchard <burchard@pobox.com>, Level Set Systems, Inc.
 // Copyright (C) 1999 Free Software Foundation
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp86.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp86.C
index ea47bc2aa55..382590683da 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp86.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp86.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // by Paul Burchard <burchard@pobox.com>, Level Set Systems, Inc.
 // Copyright (C) 1999 Free Software Foundation
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C
index 9c1aa4cd966..99b4cd384fb 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // by Paul Burchard <burchard@pobox.com>, Level Set Systems, Inc.
 // Copyright (C) 1999, 2002 Free Software Foundation
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp88.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp88.C
index 3968977f223..98de9aa4de3 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp88.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp88.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 
 // by Paul Burchard <burchard@pobox.com>, Level Set Systems, Inc.
 // Copyright (C) 1999 Free Software Foundation
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp91.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp91.C
index 802d31de94e..18b52a433b1 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp91.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp91.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 // regression test -
 
 // simplified from bug report by Leon Bottou <leonb@research.att.com>
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/spec14.C b/gcc/testsuite/g++.old-deja/g++.pt/spec14.C
index b4920ef533c..045865f45a5 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/spec14.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/spec14.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 class X
 {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/static10.C b/gcc/testsuite/g++.old-deja/g++.pt/static10.C
index 52a88ad39a9..59131219078 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/static10.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/static10.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { xfail *-*-* } }
+// { dg-do assemble }
 // regression test -
 
 // by Paul Burchard <burchard@pobox.com>, Level Set Systems, Inc.
diff --git a/gcc/testsuite/g77.dg/20010216-1.f b/gcc/testsuite/g77.dg/20010216-1.f
index 150dc9f016a..4e718cac8e7 100644
--- a/gcc/testsuite/g77.dg/20010216-1.f
+++ b/gcc/testsuite/g77.dg/20010216-1.f
@@ -1,7 +1,7 @@
 C Test for bug in reg-stack handling conditional moves.
 C Reported by Tim Prince <tprince@computer.org>
 C
-C { dg-do run { target "i[6789]86-*-*" } }
+C { dg-do run { target { { i[6789]86-*-* x86_64-*-* } && ilp32 } } }
 C { dg-options "-ffast-math -march=pentiumpro" }
 
       double precision function foo(x, y)
diff --git a/gcc/testsuite/gcc.c-torture/compile/20000804-1.c b/gcc/testsuite/gcc.c-torture/compile/20000804-1.c
index 6942ae7c9ec..1825cba14da 100644
--- a/gcc/testsuite/gcc.c-torture/compile/20000804-1.c
+++ b/gcc/testsuite/gcc.c-torture/compile/20000804-1.c
@@ -1,7 +1,7 @@
 /* This does not work on m68hc11 or h8300 due to the use of an asm
    statement to force a 'long long' (64-bits) to go in a register.  */
 /* { dg-do assemble { xfail m6811-*-* m6812-*-* h8300-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-fpic" "-fPIC" } { "" } } */
+/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && ilp32 } { "-fpic" "-fPIC" } { "" } } */
 
 /* Copyright (C) 2000, 2003 Free Software Foundation */
 __complex__ long long f ()
diff --git a/gcc/testsuite/gcc.c-torture/execute/990413-2.x b/gcc/testsuite/gcc.c-torture/execute/990413-2.x
index 039cecea4aa..58be1c0e097 100644
--- a/gcc/testsuite/gcc.c-torture/execute/990413-2.x
+++ b/gcc/testsuite/gcc.c-torture/execute/990413-2.x
@@ -1,3 +1,3 @@
 # This test is x86 specific.
-if { ! [istarget "i?86-*-*"] } { return 1 }
-return 0
+if { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } { return 0 }
+return 1
diff --git a/gcc/testsuite/gcc.c-torture/execute/stdio-opt-1.c b/gcc/testsuite/gcc.c-torture/execute/stdio-opt-1.c
index 8cfb4ebe08e..9029147f0d0 100644
--- a/gcc/testsuite/gcc.c-torture/execute/stdio-opt-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/stdio-opt-1.c
@@ -52,6 +52,10 @@ int main()
      prototypes are set correctly too.  */
   __builtin_fputc ('\n', *s_ptr);
   __builtin_fwrite ("hello\n", 1, 6, *s_ptr);
+  /* Check the unlocked style, these evaluate to nothing to avoid
+     problems on systems without the unlocked functions.  */
+  fputs_unlocked ("", *s_ptr);
+  __builtin_fputs_unlocked ("", *s_ptr);
 
   /* Check side-effects in conditional expression.  */
   s_ptr = s_array;
@@ -75,4 +79,16 @@ fputs(const char *string, FILE *stream)
 {
   abort();
 }
+
+#endif
+
+/* Locking stdio doesn't matter for the purposes of this test.  */
+static int __attribute__ ((__noinline__))
+fputs_unlocked(const char *string, FILE *stream)
+{
+#ifdef __OPTIMIZE__
+  abort();
+#else
+  return fputs (string, stream);
 #endif
+}
diff --git a/gcc/testsuite/gcc.c-torture/execute/stdio-opt-2.c b/gcc/testsuite/gcc.c-torture/execute/stdio-opt-2.c
index 833017ee547..fe9d9c12c8e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/stdio-opt-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/stdio-opt-2.c
@@ -5,7 +5,10 @@
 
    Written by Kaveh R. Ghazi, 12/4/2000.  */
 
+#include <stdio.h>
+#include <stdarg.h>
 extern int printf (const char *, ...);
+extern int printf_unlocked (const char *, ...);
 extern void abort(void);
 
 int main()
@@ -27,6 +30,7 @@ int main()
   if (s3 != s2+1 || *s3 != 0)
     abort();
   
+  printf ("");
   printf ("\n");
   printf ("hello world\n");
   
@@ -37,6 +41,10 @@ int main()
      prototypes are set correctly too.  */
   __builtin_putchar ('\n');
   __builtin_puts ("hello");
+  /* Check the unlocked style, these evaluate to nothing to avoid
+     problems on systems without the unlocked functions.  */
+  printf_unlocked ("");
+  __builtin_printf_unlocked ("");
 
   return 0;
 }
@@ -52,3 +60,19 @@ printf (const char *string, ...)
   abort();
 }
 #endif
+
+/* Locking stdio doesn't matter for the purposes of this test.  */
+static int __attribute__ ((__noinline__))
+printf_unlocked (const char *string, ...)
+{
+#ifdef __OPTIMIZE__
+  abort();
+#else
+  va_list ap;
+  int r;
+  va_start (ap, string);
+  r = vprintf (string, ap);
+  va_end (ap);
+  return r;
+#endif
+}
diff --git a/gcc/testsuite/gcc.c-torture/execute/stdio-opt-3.c b/gcc/testsuite/gcc.c-torture/execute/stdio-opt-3.c
index afc76a21716..9fe00178df8 100644
--- a/gcc/testsuite/gcc.c-torture/execute/stdio-opt-3.c
+++ b/gcc/testsuite/gcc.c-torture/execute/stdio-opt-3.c
@@ -6,6 +6,8 @@
    Written by Kaveh R. Ghazi, 1/7/2001.  */
 
 #include <stdio.h>
+#include <stdarg.h>
+extern int fprintf_unlocked (FILE *, const char *, ...);
 extern int fprintf (FILE *, const char *, ...);
 extern void abort(void);
 
@@ -15,6 +17,8 @@ int main()
   const char *const s1 = "hello world";
   const char *const s2[] = { s1, 0 }, *const*s3;
   
+  fprintf (*s_ptr, "");
+  fprintf (*s_ptr, "%s", "");
   fprintf (*s_ptr, "%s", "hello");
   fprintf (*s_ptr, "%s", "\n");
   fprintf (*s_ptr, "%s", *s2);
@@ -49,6 +53,12 @@ int main()
   /* Test at least one instance of the __builtin_ style.  We do this
      to ensure that it works and that the prototype is correct.  */
   __builtin_fprintf (*s_ptr, "%s", "hello world\n");
+  /* Check the unlocked style, these evaluate to nothing to avoid
+     problems on systems without the unlocked functions.  */
+  fprintf_unlocked (*s_ptr, "");
+  __builtin_fprintf_unlocked (*s_ptr, "");
+  fprintf_unlocked (*s_ptr, "%s", "");
+  __builtin_fprintf_unlocked (*s_ptr, "%s", "");
 
   return 0;
 }
@@ -64,3 +74,19 @@ fprintf (FILE *stream, const char *string, ...)
   abort();
 }
 #endif
+
+/* Locking stdio doesn't matter for the purposes of this test.  */
+static int __attribute__ ((__noinline__))
+fprintf_unlocked (FILE *stream, const char *string, ...)
+{
+#ifdef __OPTIMIZE__
+  abort();
+#else
+  va_list ap;
+  int r;
+  va_start (ap, string);
+  r = vfprintf (stream, string, ap);
+  va_end (ap);
+  return r;
+#endif
+}
diff --git a/gcc/testsuite/gcc.dg/20000609-1.c b/gcc/testsuite/gcc.dg/20000609-1.c
index 568ca5c1596..5d452ac9d82 100644
--- a/gcc/testsuite/gcc.dg/20000609-1.c
+++ b/gcc/testsuite/gcc.dg/20000609-1.c
@@ -1,6 +1,8 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -ffast-math -march=i686" } */
 
+
 /* Sanity check for fp_jcc_* with TARGET_CMOVE.  */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20000614-1.c b/gcc/testsuite/gcc.dg/20000614-1.c
index abc8ca2f714..507596787a6 100644
--- a/gcc/testsuite/gcc.dg/20000614-1.c
+++ b/gcc/testsuite/gcc.dg/20000614-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 void bar(char *p)
diff --git a/gcc/testsuite/gcc.dg/20000720-1.c b/gcc/testsuite/gcc.dg/20000720-1.c
index 92b52fb1d3b..65bf68544b4 100644
--- a/gcc/testsuite/gcc.dg/20000720-1.c
+++ b/gcc/testsuite/gcc.dg/20000720-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mpreferred-stack-boundary=2 -march=i586 -O2 -fomit-frame-pointer" } */
 
 extern void *foo(void *a, const void *b, unsigned c);
diff --git a/gcc/testsuite/gcc.dg/20000724-1.c b/gcc/testsuite/gcc.dg/20000724-1.c
index 3c4f2c39409..0516ae46116 100644
--- a/gcc/testsuite/gcc.dg/20000724-1.c
+++ b/gcc/testsuite/gcc.dg/20000724-1.c
@@ -1,5 +1,6 @@
-/* { dg-do run { target i?86-*-linux* } } */
+/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
+/* { dg-require-effective-target ilp32 } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/20000807-1.c b/gcc/testsuite/gcc.dg/20000807-1.c
index f6547649483..360e3245989 100644
--- a/gcc/testsuite/gcc.dg/20000807-1.c
+++ b/gcc/testsuite/gcc.dg/20000807-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-Os -fpic" } */
 
 #include <string.h>
diff --git a/gcc/testsuite/gcc.dg/20000904-1.c b/gcc/testsuite/gcc.dg/20000904-1.c
index c6238e35099..31f937cab71 100644
--- a/gcc/testsuite/gcc.dg/20000904-1.c
+++ b/gcc/testsuite/gcc.dg/20000904-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O0 -fpic" } */
 
 static struct {
diff --git a/gcc/testsuite/gcc.dg/20001127-1.c b/gcc/testsuite/gcc.dg/20001127-1.c
index 6ac76e29e92..f63d1149322 100644
--- a/gcc/testsuite/gcc.dg/20001127-1.c
+++ b/gcc/testsuite/gcc.dg/20001127-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 extern inline float bar (float x)
diff --git a/gcc/testsuite/gcc.dg/20010202-1.c b/gcc/testsuite/gcc.dg/20010202-1.c
index e4eaae0b246..eb2d2bfd1de 100644
--- a/gcc/testsuite/gcc.dg/20010202-1.c
+++ b/gcc/testsuite/gcc.dg/20010202-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* sparc*-*-* } } */
+/* { dg-do compile { target i?86-*-* sparc*-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 typedef enum { false, true } __attribute__ ((packed)) boolean;
diff --git a/gcc/testsuite/gcc.dg/20010520-1.c b/gcc/testsuite/gcc.dg/20010520-1.c
index c96dbc4eee5..97ee32b0b82 100644
--- a/gcc/testsuite/gcc.dg/20010520-1.c
+++ b/gcc/testsuite/gcc.dg/20010520-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-w" } */
 
 void f ()
diff --git a/gcc/testsuite/gcc.dg/20011009-1.c b/gcc/testsuite/gcc.dg/20011009-1.c
index dbf32e63fba..b78d99e997b 100644
--- a/gcc/testsuite/gcc.dg/20011009-1.c
+++ b/gcc/testsuite/gcc.dg/20011009-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20011029-2.c b/gcc/testsuite/gcc.dg/20011029-2.c
index 6fdc6216678..07ef1a806fe 100644
--- a/gcc/testsuite/gcc.dg/20011029-2.c
+++ b/gcc/testsuite/gcc.dg/20011029-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 int foo (int s)
diff --git a/gcc/testsuite/gcc.dg/20011107-1.c b/gcc/testsuite/gcc.dg/20011107-1.c
index 395de3dae34..0d09427a0b4 100644
--- a/gcc/testsuite/gcc.dg/20011107-1.c
+++ b/gcc/testsuite/gcc.dg/20011107-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mtune=k6" } */
 
 void
diff --git a/gcc/testsuite/gcc.dg/20011119-1.c b/gcc/testsuite/gcc.dg/20011119-1.c
index 28672eddde4..e297dc5f2a8 100644
--- a/gcc/testsuite/gcc.dg/20011119-1.c
+++ b/gcc/testsuite/gcc.dg/20011119-1.c
@@ -1,6 +1,7 @@
 /* Test for reload failing to eliminate from argp to sp.  */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" "-fpic" "-fPIC" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-skip-if "" { "*-*-*" } { "-fpic" "-fPIC" } { "" } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 
 static int ustrsize (const char *s);
diff --git a/gcc/testsuite/gcc.dg/20020103-1.c b/gcc/testsuite/gcc.dg/20020103-1.c
index 3082247fb0d..54ad83c21e5 100644
--- a/gcc/testsuite/gcc.dg/20020103-1.c
+++ b/gcc/testsuite/gcc.dg/20020103-1.c
@@ -2,7 +2,7 @@
    spilled to the stack, or regenerated, but not dropped to memory.  */
 /* { dg-do compile { target i?86-*-* powerpc-*-* rs6000-*-* alpha*-*-* x86_64-*-*} } */
 /* { dg-options "-O2 -fpic -fno-omit-frame-pointer -fno-asynchronous-unwind-tables" } */
-/* { dg-final { scan-assembler-not "LC" } } */
+/* { dg-final { scan-assembler-not "LC\[0-9\]" } } */
 
 /* Clobber all call-saved registers that can hold a pointer value.  */
 #if defined(__i386__)
diff --git a/gcc/testsuite/gcc.dg/20020108-1.c b/gcc/testsuite/gcc.dg/20020108-1.c
index 08baa076ec1..d61944c590e 100644
--- a/gcc/testsuite/gcc.dg/20020108-1.c
+++ b/gcc/testsuite/gcc.dg/20020108-1.c
@@ -5,7 +5,8 @@
    is not valid general_operand in HImode.  */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
+/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+
 
 void
 foo (unsigned short *cp)
diff --git a/gcc/testsuite/gcc.dg/20020122-2.c b/gcc/testsuite/gcc.dg/20020122-2.c
index 2115a22ad6a..275dceed724 100644
--- a/gcc/testsuite/gcc.dg/20020122-2.c
+++ b/gcc/testsuite/gcc.dg/20020122-2.c
@@ -3,7 +3,7 @@
   
 /* { dg-do compile } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
-/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target i?86-*-* } } */
+/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern int access( char* );
 extern int a();
diff --git a/gcc/testsuite/gcc.dg/20020122-3.c b/gcc/testsuite/gcc.dg/20020122-3.c
index 3b2a371282e..28f68719ed1 100644
--- a/gcc/testsuite/gcc.dg/20020122-3.c
+++ b/gcc/testsuite/gcc.dg/20020122-3.c
@@ -4,7 +4,7 @@
 
 /* { dg-do compile } */
 /* { dg-options "-Os -fprefetch-loop-arrays -w" } */
-/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target i?86-*-* } } */
+/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 int foo (int *p, int n)
 {
diff --git a/gcc/testsuite/gcc.dg/20020201-3.c b/gcc/testsuite/gcc.dg/20020201-3.c
index 67e9a8a76e4..e95c44fbdfb 100644
--- a/gcc/testsuite/gcc.dg/20020201-3.c
+++ b/gcc/testsuite/gcc.dg/20020201-3.c
@@ -1,6 +1,7 @@
 /* This testcase ICEd because a SFmode variable was given a MMX register
    for which there is no movsf exists.  */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686 -mmmx -fno-strict-aliasing" } */
 
 struct A { unsigned int a, b; };
diff --git a/gcc/testsuite/gcc.dg/20020206-1.c b/gcc/testsuite/gcc.dg/20020206-1.c
index 724c03ab24b..837718b6c4c 100644
--- a/gcc/testsuite/gcc.dg/20020206-1.c
+++ b/gcc/testsuite/gcc.dg/20020206-1.c
@@ -4,7 +4,8 @@
 
 /* { dg-do run } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
-/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target i?86-*-* } } */
+/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+
 
 struct reload
 {
diff --git a/gcc/testsuite/gcc.dg/20020218-1.c b/gcc/testsuite/gcc.dg/20020218-1.c
index 2887328d5fb..bef4d66fc13 100644
--- a/gcc/testsuite/gcc.dg/20020218-1.c
+++ b/gcc/testsuite/gcc.dg/20020218-1.c
@@ -1,5 +1,6 @@
 /* Verify that X86-64 only SSE registers aren't restored on IA-32.  */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -msse" } */
 /* { dg-final { scan-assembler-not "xmm8" } } */
 
diff --git a/gcc/testsuite/gcc.dg/20020224-1.c b/gcc/testsuite/gcc.dg/20020224-1.c
index a286b6b0599..c37de2e21b7 100644
--- a/gcc/testsuite/gcc.dg/20020224-1.c
+++ b/gcc/testsuite/gcc.dg/20020224-1.c
@@ -3,7 +3,7 @@
    expected the callee to pop up the hidden return structure pointer,
    while callee was actually not poping it up (as the hidden argument
    was passed in register).  */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20020310-1.c b/gcc/testsuite/gcc.dg/20020310-1.c
index 39fbdb0c96b..bdd29672bd8 100644
--- a/gcc/testsuite/gcc.dg/20020310-1.c
+++ b/gcc/testsuite/gcc.dg/20020310-1.c
@@ -2,7 +2,7 @@
    This testcase was miscompiled because of an rtx sharing bug.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i586" { target i?86-*-* } } */
+/* { dg-options "-O2 -mtune=i586" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 struct A
 {
diff --git a/gcc/testsuite/gcc.dg/20020411-1.c b/gcc/testsuite/gcc.dg/20020411-1.c
index a1834b8a1a5..47a8fed5095 100644
--- a/gcc/testsuite/gcc.dg/20020411-1.c
+++ b/gcc/testsuite/gcc.dg/20020411-1.c
@@ -3,7 +3,7 @@
    for its mode.  */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -march=i686" { target i?86-*-* } } */
+/* { dg-options "-O2 -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #if __INT_MAX__ > 32767
 
diff --git a/gcc/testsuite/gcc.dg/20020418-1.c b/gcc/testsuite/gcc.dg/20020418-1.c
index 308bfa3a266..7314ec000ef 100644
--- a/gcc/testsuite/gcc.dg/20020418-1.c
+++ b/gcc/testsuite/gcc.dg/20020418-1.c
@@ -1,7 +1,7 @@
 /* PR optimization/5887 */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -msse -ffast-math" { target i?86-*-* } } */
+/* { dg-options "-O2 -msse -ffast-math" { target i?86-*-* x86_64-*-* } } */
 
 void bar (float *a, float *b);
 
diff --git a/gcc/testsuite/gcc.dg/20020418-2.c b/gcc/testsuite/gcc.dg/20020418-2.c
index fbc38da03da..93688d27030 100644
--- a/gcc/testsuite/gcc.dg/20020418-2.c
+++ b/gcc/testsuite/gcc.dg/20020418-2.c
@@ -1,7 +1,7 @@
 /* PR optimization/6010 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -funroll-all-loops" } */
-/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target i?86-*-* } } */
+/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 void bar (float);
 
diff --git a/gcc/testsuite/gcc.dg/20020426-1.c b/gcc/testsuite/gcc.dg/20020426-1.c
index 94523e7298a..31be74712c0 100644
--- a/gcc/testsuite/gcc.dg/20020426-1.c
+++ b/gcc/testsuite/gcc.dg/20020426-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-msoft-float -mfp-ret-in-387" } */
 
 void f() {
diff --git a/gcc/testsuite/gcc.dg/20020426-2.c b/gcc/testsuite/gcc.dg/20020426-2.c
index 18a172767a1..c3fabbbc91e 100644
--- a/gcc/testsuite/gcc.dg/20020426-2.c
+++ b/gcc/testsuite/gcc.dg/20020426-2.c
@@ -2,7 +2,7 @@
    Distilled from zlib sources.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target i?86-*-* } } */
+/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 typedef struct
 {
diff --git a/gcc/testsuite/gcc.dg/20020517-1.c b/gcc/testsuite/gcc.dg/20020517-1.c
index 40de8663d80..032ccd23b51 100644
--- a/gcc/testsuite/gcc.dg/20020517-1.c
+++ b/gcc/testsuite/gcc.dg/20020517-1.c
@@ -2,7 +2,7 @@
    was not sign-extended for QImode.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
+/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #include <limits.h>
 
diff --git a/gcc/testsuite/gcc.dg/20020523-1.c b/gcc/testsuite/gcc.dg/20020523-1.c
index 5ae3da5473a..3338612efdc 100644
--- a/gcc/testsuite/gcc.dg/20020523-1.c
+++ b/gcc/testsuite/gcc.dg/20020523-1.c
@@ -1,7 +1,9 @@
 /* PR target/6753
    This testcase was miscompiled because sse_mov?fcc_const0*
    patterns were missing earlyclobber.  */
-/* { dg-do run { target i386-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-skip-if "" { ilp32 } { "-fpic" "-fPIC" } { "" } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-march=pentium3 -msse -ffast-math -O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20020523-2.c b/gcc/testsuite/gcc.dg/20020523-2.c
index 1bb5a1a6567..ebe8bb8f5cd 100644
--- a/gcc/testsuite/gcc.dg/20020523-2.c
+++ b/gcc/testsuite/gcc.dg/20020523-2.c
@@ -1,7 +1,8 @@
 /* PR target/6753
    This testcase was miscompiled because sse_mov?fcc_const0*
    patterns were missing earlyclobber.  */
-/* { dg-do run { target i386-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-march=pentium3 -msse -ffast-math -O2" } */
 
 #include "i386-cpuid.h"
diff --git a/gcc/testsuite/gcc.dg/20020531-1.c b/gcc/testsuite/gcc.dg/20020531-1.c
index c18033f3d08..8821ac235d8 100644
--- a/gcc/testsuite/gcc.dg/20020531-1.c
+++ b/gcc/testsuite/gcc.dg/20020531-1.c
@@ -1,7 +1,7 @@
 /* PR optimization/6842
    This testcase caused ICE when trying to optimize V8QI subreg of VOIDmode
    CONST_DOUBLE.  */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -mmmx" } */
 
 typedef int __v8qi __attribute__ ((__mode__ (__V8QI__)));
diff --git a/gcc/testsuite/gcc.dg/20020616-1.c b/gcc/testsuite/gcc.dg/20020616-1.c
index 4630664d957..6db78425596 100644
--- a/gcc/testsuite/gcc.dg/20020616-1.c
+++ b/gcc/testsuite/gcc.dg/20020616-1.c
@@ -1,5 +1,5 @@
 /* PR opt/6722 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 register int k asm("%ebx");
diff --git a/gcc/testsuite/gcc.dg/20020729-1.c b/gcc/testsuite/gcc.dg/20020729-1.c
index da1ed1b7153..eeab6985422 100644
--- a/gcc/testsuite/gcc.dg/20020729-1.c
+++ b/gcc/testsuite/gcc.dg/20020729-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=k6" } */
 
 static inline void *
diff --git a/gcc/testsuite/gcc.dg/20030204-1.c b/gcc/testsuite/gcc.dg/20030204-1.c
index e236e3a3a39..b78b3a73ae8 100644
--- a/gcc/testsuite/gcc.dg/20030204-1.c
+++ b/gcc/testsuite/gcc.dg/20030204-1.c
@@ -1,7 +1,7 @@
 /* PR optimization/8555 */
 /* { dg-do compile } */
 /* { dg-options "-O -ffast-math -funroll-loops" } */
-/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target i?86-*-* } } */
+/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 float foo (float *a, int i)
 {
diff --git a/gcc/testsuite/gcc.dg/20030826-2.c b/gcc/testsuite/gcc.dg/20030826-2.c
index f25887d47d2..32db0919527 100644
--- a/gcc/testsuite/gcc.dg/20030826-2.c
+++ b/gcc/testsuite/gcc.dg/20030826-2.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
-/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target i?86-*-* } } */
+/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/20030926-1.c b/gcc/testsuite/gcc.dg/20030926-1.c
index 39833a65171..8f81f31361c 100644
--- a/gcc/testsuite/gcc.dg/20030926-1.c
+++ b/gcc/testsuite/gcc.dg/20030926-1.c
@@ -1,7 +1,10 @@
 /* PR optimization/11741  */
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -minline-all-stringops" } */
-/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target i?86-*-* } } */
+/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+
+extern void *memcpy (void *, const void *, __SIZE_TYPE__);
+extern __SIZE_TYPE__ strlen (const char *);
 
 void
 foo (char *p)
diff --git a/gcc/testsuite/gcc.dg/20031102-1.c b/gcc/testsuite/gcc.dg/20031102-1.c
index 4da4e6a8cc0..5a02a704a26 100644
--- a/gcc/testsuite/gcc.dg/20031102-1.c
+++ b/gcc/testsuite/gcc.dg/20031102-1.c
@@ -3,7 +3,7 @@
 
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -march=i686" { target i686-*-* } } */
+/* { dg-options "-O2 -march=i686" { target { { i686-*-* x86_64-*-* } && ilp32 } } } */
 
 /* Verify that reload_cse_move2add doesn't add unexpected CLOBBERs. */
 
diff --git a/gcc/testsuite/gcc.dg/20031202-1.c b/gcc/testsuite/gcc.dg/20031202-1.c
index 424e01b5dd4..c7fbfe52404 100644
--- a/gcc/testsuite/gcc.dg/20031202-1.c
+++ b/gcc/testsuite/gcc.dg/20031202-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
+/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/980226-1.c b/gcc/testsuite/gcc.dg/980226-1.c
index f66e9e2a9f7..d3a5dd94cb9 100644
--- a/gcc/testsuite/gcc.dg/980226-1.c
+++ b/gcc/testsuite/gcc.dg/980226-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O2 } */
 
 extern double bar (double);
diff --git a/gcc/testsuite/gcc.dg/980312-1.c b/gcc/testsuite/gcc.dg/980312-1.c
index 8f72c31d341..edf3cf5d79d 100644
--- a/gcc/testsuite/gcc.dg/980312-1.c
+++ b/gcc/testsuite/gcc.dg/980312-1.c
@@ -1,4 +1,5 @@
-/* { dg-do link { target i?86-*-* } } */
+/* { dg-do link { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double
diff --git a/gcc/testsuite/gcc.dg/980313-1.c b/gcc/testsuite/gcc.dg/980313-1.c
index 1036339b076..889654fc792 100644
--- a/gcc/testsuite/gcc.dg/980313-1.c
+++ b/gcc/testsuite/gcc.dg/980313-1.c
@@ -1,4 +1,5 @@
-/* { dg-do link { target i?86-*-* } } */
+/* { dg-do link { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double
diff --git a/gcc/testsuite/gcc.dg/980414-1.c b/gcc/testsuite/gcc.dg/980414-1.c
index 59382ef2c49..e179c8137c0 100644
--- a/gcc/testsuite/gcc.dg/980414-1.c
+++ b/gcc/testsuite/gcc.dg/980414-1.c
@@ -1,6 +1,6 @@
 /* Test double on x86. */
 
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O2 } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/980520-1.c b/gcc/testsuite/gcc.dg/980520-1.c
index e1401824f54..b11f0d3a893 100644
--- a/gcc/testsuite/gcc.dg/980520-1.c
+++ b/gcc/testsuite/gcc.dg/980520-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O2 } */
 
 int bug(void)
diff --git a/gcc/testsuite/gcc.dg/980709-1.c b/gcc/testsuite/gcc.dg/980709-1.c
index a4359300587..01b6bfe358e 100644
--- a/gcc/testsuite/gcc.dg/980709-1.c
+++ b/gcc/testsuite/gcc.dg/980709-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O2 } */
 
 extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
diff --git a/gcc/testsuite/gcc.dg/990117-1.c b/gcc/testsuite/gcc.dg/990117-1.c
index 606ba440ca8..24c56f2febf 100644
--- a/gcc/testsuite/gcc.dg/990117-1.c
+++ b/gcc/testsuite/gcc.dg/990117-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double
diff --git a/gcc/testsuite/gcc.dg/990130-1.c b/gcc/testsuite/gcc.dg/990130-1.c
index 3e711c2febb..57e046b22a6 100644
--- a/gcc/testsuite/gcc.dg/990130-1.c
+++ b/gcc/testsuite/gcc.dg/990130-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O0 } */
 
 typedef 	 int SItype	__attribute__ ((mode (SI)));
diff --git a/gcc/testsuite/gcc.dg/990213-2.c b/gcc/testsuite/gcc.dg/990213-2.c
index a0a13b560f9..d095e3723f9 100644
--- a/gcc/testsuite/gcc.dg/990213-2.c
+++ b/gcc/testsuite/gcc.dg/990213-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-fPIC" } */
 
 struct normal_encoding {};
diff --git a/gcc/testsuite/gcc.dg/990214-1.c b/gcc/testsuite/gcc.dg/990214-1.c
index 7ad81b6b90b..b3cb519a471 100644
--- a/gcc/testsuite/gcc.dg/990214-1.c
+++ b/gcc/testsuite/gcc.dg/990214-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-fPIC" } */
 
 typedef int int64_t __attribute__ ((__mode__ (  __DI__ ))) ;
diff --git a/gcc/testsuite/gcc.dg/990424-1.c b/gcc/testsuite/gcc.dg/990424-1.c
index 00b476427f3..5b5af818076 100644
--- a/gcc/testsuite/gcc.dg/990424-1.c
+++ b/gcc/testsuite/gcc.dg/990424-1.c
@@ -1,7 +1,8 @@
 /* Test that stack alignment is preserved with pending_stack_adjust
    with stdcall functions.  */
 
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options -mpreferred-stack-boundary=4 } */
 
 void __attribute__((stdcall)) foo(int a, int b, int c);
diff --git a/gcc/testsuite/gcc.dg/990524-1.c b/gcc/testsuite/gcc.dg/990524-1.c
index 8b101724503..ee4ebd62671 100644
--- a/gcc/testsuite/gcc.dg/990524-1.c
+++ b/gcc/testsuite/gcc.dg/990524-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 typedef struct t_anim_info {
diff --git a/gcc/testsuite/gcc.dg/991129-1.c b/gcc/testsuite/gcc.dg/991129-1.c
index 24faefddaff..489b7f987fa 100644
--- a/gcc/testsuite/gcc.dg/991129-1.c
+++ b/gcc/testsuite/gcc.dg/991129-1.c
@@ -1,6 +1,6 @@
 /* Test against a problem in push_reload.  */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-options "-O2" } */
 
 unsigned long foo (unsigned long long x, unsigned long y)
diff --git a/gcc/testsuite/gcc.dg/991209-1.c b/gcc/testsuite/gcc.dg/991209-1.c
index b3a47285158..6b5c492c299 100644
--- a/gcc/testsuite/gcc.dg/991209-1.c
+++ b/gcc/testsuite/gcc.dg/991209-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 int foo ()
 {
diff --git a/gcc/testsuite/gcc.dg/991214-1.c b/gcc/testsuite/gcc.dg/991214-1.c
index 68b6b927916..cfe3a9a4121 100644
--- a/gcc/testsuite/gcc.dg/991214-1.c
+++ b/gcc/testsuite/gcc.dg/991214-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-options "-O2" } */
 
 /* Test against a problem with the combiner substituting explicit hard reg
diff --git a/gcc/testsuite/gcc.dg/991230-1.c b/gcc/testsuite/gcc.dg/991230-1.c
index 76b1b8e9884..b87d0e2e3cb 100644
--- a/gcc/testsuite/gcc.dg/991230-1.c
+++ b/gcc/testsuite/gcc.dg/991230-1.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mtune=i486" } */
 
 /* Test that floating point greater-than tests are compiled correctly with
diff --git a/gcc/testsuite/gcc.dg/asm-1.c b/gcc/testsuite/gcc.dg/asm-1.c
index 1f509422e97..3bf5c29c4cd 100644
--- a/gcc/testsuite/gcc.dg/asm-1.c
+++ b/gcc/testsuite/gcc.dg/asm-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile } */
 
 struct x {
   int selector;
diff --git a/gcc/testsuite/gcc.dg/clobbers.c b/gcc/testsuite/gcc.dg/clobbers.c
index 5e312bcb95c..be48ed7e277 100644
--- a/gcc/testsuite/gcc.dg/clobbers.c
+++ b/gcc/testsuite/gcc.dg/clobbers.c
@@ -1,7 +1,7 @@
 /* Test asm clobbers on x86. */
 
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-fpic" "-fPIC" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-skip-if "" { ilp32 } { "-fpic" "-fPIC" } { "" } } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.dg/i386-387-1.c b/gcc/testsuite/gcc.dg/i386-387-1.c
index 74a76b63807..6b8c25bec51 100644
--- a/gcc/testsuite/gcc.dg/i386-387-1.c
+++ b/gcc/testsuite/gcc.dg/i386-387-1.c
@@ -1,5 +1,6 @@
 /* Verify that -mno-fancy-math-387 works.  */
-/* { dg-do compile { target "i?86-*-*" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -mno-fancy-math-387 -march=i386" } */
 /* { dg-final { scan-assembler "call\t_?sin" } } */
 /* { dg-final { scan-assembler "call\t_?cos" } } */
diff --git a/gcc/testsuite/gcc.dg/i386-387-2.c b/gcc/testsuite/gcc.dg/i386-387-2.c
index bfda85bc171..8a896e2f532 100644
--- a/gcc/testsuite/gcc.dg/i386-387-2.c
+++ b/gcc/testsuite/gcc.dg/i386-387-2.c
@@ -1,5 +1,6 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
-/* { dg-do compile { target "i?86-*-*" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fsin" } } */
 /* { dg-final { scan-assembler "fcos" } } */
diff --git a/gcc/testsuite/gcc.dg/i386-387-3.c b/gcc/testsuite/gcc.dg/i386-387-3.c
index f61cd6100e2..ed80f78187d 100644
--- a/gcc/testsuite/gcc.dg/i386-387-3.c
+++ b/gcc/testsuite/gcc.dg/i386-387-3.c
@@ -1,5 +1,6 @@
 /* Verify that 387 mathematical constants are recognized.  */
-/* { dg-do compile { target "i?86-*-*" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686" } */
 /* { dg-final { scan-assembler "fldpi" } } */
 
diff --git a/gcc/testsuite/gcc.dg/i386-387-4.c b/gcc/testsuite/gcc.dg/i386-387-4.c
index 809ab823660..55398275570 100644
--- a/gcc/testsuite/gcc.dg/i386-387-4.c
+++ b/gcc/testsuite/gcc.dg/i386-387-4.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target "i?86-*-*" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686" } */
 /* { dg-final { scan-assembler "fldpi" } } */
 
diff --git a/gcc/testsuite/gcc.dg/i386-387-5.c b/gcc/testsuite/gcc.dg/i386-387-5.c
index 2c86dd0869a..2bcd6dec588 100644
--- a/gcc/testsuite/gcc.dg/i386-387-5.c
+++ b/gcc/testsuite/gcc.dg/i386-387-5.c
@@ -1,7 +1,7 @@
 /* Verify that -mno-fancy-math-387 works.  */
-/* { dg-do compile { target "i?86-*-*" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -mno-fancy-math-387 -march=i386" } */
 /* { dg-final { scan-assembler "call\t_?atan" } } */
 
 double f1(double x) { return __builtin_atan(x); }
-
diff --git a/gcc/testsuite/gcc.dg/i386-387-6.c b/gcc/testsuite/gcc.dg/i386-387-6.c
index 8eb29a11320..940d1d1dd15 100644
--- a/gcc/testsuite/gcc.dg/i386-387-6.c
+++ b/gcc/testsuite/gcc.dg/i386-387-6.c
@@ -1,5 +1,6 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
-/* { dg-do compile { target "i?86-*-*" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fpatan" } } */
 
diff --git a/gcc/testsuite/gcc.dg/i386-asm-1.c b/gcc/testsuite/gcc.dg/i386-asm-1.c
index bf7aa1d0c4b..e871dd9343f 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-1.c
+++ b/gcc/testsuite/gcc.dg/i386-asm-1.c
@@ -1,7 +1,9 @@
 /* PR inline-asm/11676 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
+extern void abort (void);
 static int bar(int x) __asm__("bar") __attribute__((regparm(1)));
 static int __attribute__((regparm(1), noinline, used))
 bar(int x)
diff --git a/gcc/testsuite/gcc.dg/i386-asm-2.c b/gcc/testsuite/gcc.dg/i386-asm-2.c
index e143ea36978..7e9ecb7797d 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-2.c
+++ b/gcc/testsuite/gcc.dg/i386-asm-2.c
@@ -1,5 +1,6 @@
 /* PR opt/13862 */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O" } */
 
 typedef struct _fame_syntax_t_ {
diff --git a/gcc/testsuite/gcc.dg/i386-bitfield1.c b/gcc/testsuite/gcc.dg/i386-bitfield1.c
index 26154f57d11..e285ba0526a 100644
--- a/gcc/testsuite/gcc.dg/i386-bitfield1.c
+++ b/gcc/testsuite/gcc.dg/i386-bitfield1.c
@@ -1,7 +1,8 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-O2" }
-// { dg-options "-mno-align-double -mno-ms-bitfields" { target *-*-interix* } }
+// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw*} }
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/i386-bitfield2.c b/gcc/testsuite/gcc.dg/i386-bitfield2.c
index 2ea798207dc..54f5c8dbfd3 100644
--- a/gcc/testsuite/gcc.dg/i386-bitfield2.c
+++ b/gcc/testsuite/gcc.dg/i386-bitfield2.c
@@ -1,7 +1,8 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-O2" }
-// { dg-options "-mno-align-double -mno-ms-bitfields" { target *-*-interix* } }
+// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw* } }
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/i386-bitfield3.c b/gcc/testsuite/gcc.dg/i386-bitfield3.c
index 781c2f7ba4e..111f5f28c42 100644
--- a/gcc/testsuite/gcc.dg/i386-bitfield3.c
+++ b/gcc/testsuite/gcc.dg/i386-bitfield3.c
@@ -1,5 +1,5 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target *-*-interix* } }
 
diff --git a/gcc/testsuite/gcc.dg/i386-call-1.c b/gcc/testsuite/gcc.dg/i386-call-1.c
index 9cd49da3b2f..3c3d642babd 100644
--- a/gcc/testsuite/gcc.dg/i386-call-1.c
+++ b/gcc/testsuite/gcc.dg/i386-call-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/11304 */
 /* Originator: <manuel.serrano@sophia.inria.fr> */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O -fomit-frame-pointer" } */
 
 /* Verify that %eax is always restored after a call.  */
diff --git a/gcc/testsuite/gcc.dg/i386-local.c b/gcc/testsuite/gcc.dg/i386-local.c
index 45d6aba53db..2fda2a2fc99 100644
--- a/gcc/testsuite/gcc.dg/i386-local.c
+++ b/gcc/testsuite/gcc.dg/i386-local.c
@@ -1,7 +1,7 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -funit-at-a-time" } */
-/* { dg-final { scan-assembler "magic\[^\\n\]*eax" { target i?86-*-* } } } */
-/* { dg-final { scan-assembler "magic\[^\\n\]*edi" { target x86_64-*-* } } } */
+/* { dg-final { scan-assembler "magic\[^\\n\]*eax" { target ilp32 } } } */
+/* { dg-final { scan-assembler "magic\[^\\n\]*edi" { target lp64 } } } */
 
 /* Verify that local calling convention is used.  */
 static t(int) __attribute__ ((noinline));
diff --git a/gcc/testsuite/gcc.dg/i386-local2.c b/gcc/testsuite/gcc.dg/i386-local2.c
index 2225aeea0d9..28c89d9ce91 100644
--- a/gcc/testsuite/gcc.dg/i386-local2.c
+++ b/gcc/testsuite/gcc.dg/i386-local2.c
@@ -1,5 +1,6 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -funit-at-a-time -fomit-frame-pointer" } */
+/* { dg-skip-if "PR 25214" { ilp32 } { "-fpic" "-fPIC" } { "" } } */
 /* { dg-final { scan-assembler-not "sub\[^\\n\]*sp" } } */
 
 static __attribute__ ((noinline)) q ();
diff --git a/gcc/testsuite/gcc.dg/i386-loop-1.c b/gcc/testsuite/gcc.dg/i386-loop-1.c
index 635f012a477..479c80a2d7a 100644
--- a/gcc/testsuite/gcc.dg/i386-loop-1.c
+++ b/gcc/testsuite/gcc.dg/i386-loop-1.c
@@ -1,5 +1,6 @@
 /* PR optimization/9888 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O3" } */
 
 /* Verify that GCC doesn't emit out of range 'loop' instructions.  */
diff --git a/gcc/testsuite/gcc.dg/i386-loop-2.c b/gcc/testsuite/gcc.dg/i386-loop-2.c
index 3a3e69e98b4..8994eada46e 100644
--- a/gcc/testsuite/gcc.dg/i386-loop-2.c
+++ b/gcc/testsuite/gcc.dg/i386-loop-2.c
@@ -1,6 +1,7 @@
 /* PR optimization/9888 */
 /* Originator: Jim Bray <jb@as220.org> */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -Os" } */
 
 enum reload_type
diff --git a/gcc/testsuite/gcc.dg/i386-loop-3.c b/gcc/testsuite/gcc.dg/i386-loop-3.c
index c1b4bcea5be..4e046b28acb 100644
--- a/gcc/testsuite/gcc.dg/i386-loop-3.c
+++ b/gcc/testsuite/gcc.dg/i386-loop-3.c
@@ -1,9 +1,13 @@
 /* PR target/11044 */
 /* Originator: Tim McGrath <misty-@charter.net> */
 /* Testcase contributed by Eric Botcazou <ebotcazou@libertysurf.fr> */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O3 -ffast-math -funroll-loops" } */
 
+extern void *memset (void *, int, __SIZE_TYPE__);
+extern void abort (void);
+
 typedef struct
 {
         unsigned char colormod;
diff --git a/gcc/testsuite/gcc.dg/i386-memset-1.c b/gcc/testsuite/gcc.dg/i386-memset-1.c
index f450dd7287e..b7ee8575f93 100644
--- a/gcc/testsuite/gcc.dg/i386-memset-1.c
+++ b/gcc/testsuite/gcc.dg/i386-memset-1.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002  Free Software Foundation.
+/* Copyright (C) 2002, 2005  Free Software Foundation.
 
    Test -minline-all-stringops memset with various combinations of pointer
    alignments and lengths to make sure builtin optimizations are correct.
@@ -7,7 +7,7 @@
    Written by Michael Meissner, March 9, 2002.
    Target by Roger Sayle, April 25, 2002.  */
 
-/* { dg-do run { target "i?86-*-*" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -minline-all-stringops" } */
 
 #ifndef MAX_OFFSET
diff --git a/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c b/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
index 8d4a083e5d8..2ae7512cb48 100644
--- a/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
+++ b/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O2 -march=pentium4" { target i?86-*-* } } */
-/* { dg-options "-O2 -march=pentium4 -m32" { target x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-O2 -march=pentium4" } */
 /* { dg-final { scan-assembler-not "imull" } } */
 
 /* Should be done not using imull.  */
diff --git a/gcc/testsuite/gcc.dg/i386-pic-1.c b/gcc/testsuite/gcc.dg/i386-pic-1.c
index 4c548bf1cd6..7762230c2f6 100644
--- a/gcc/testsuite/gcc.dg/i386-pic-1.c
+++ b/gcc/testsuite/gcc.dg/i386-pic-1.c
@@ -1,5 +1,6 @@
 /* PR target/8340 */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-fPIC" } */
 
 int foo ()
diff --git a/gcc/testsuite/gcc.dg/i386-regparm.c b/gcc/testsuite/gcc.dg/i386-regparm.c
index 18206ea7fc3..e3cd8b090ff 100644
--- a/gcc/testsuite/gcc.dg/i386-regparm.c
+++ b/gcc/testsuite/gcc.dg/i386-regparm.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-W -Wall" } */
 
 /* Verify that GCC correctly detects non-matching regparm attributes.  */
diff --git a/gcc/testsuite/gcc.dg/i386-signbit-1.c b/gcc/testsuite/gcc.dg/i386-signbit-1.c
index 8b8866e92aa..adb351a2772 100644
--- a/gcc/testsuite/gcc.dg/i386-signbit-1.c
+++ b/gcc/testsuite/gcc.dg/i386-signbit-1.c
@@ -1,5 +1,6 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/i386-signbit-2.c b/gcc/testsuite/gcc.dg/i386-signbit-2.c
index 5687d857a07..8ca63965062 100644
--- a/gcc/testsuite/gcc.dg/i386-signbit-2.c
+++ b/gcc/testsuite/gcc.dg/i386-signbit-2.c
@@ -1,5 +1,6 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/i386-signbit-3.c b/gcc/testsuite/gcc.dg/i386-signbit-3.c
index ae97f215603..a08ca498142 100644
--- a/gcc/testsuite/gcc.dg/i386-signbit-3.c
+++ b/gcc/testsuite/gcc.dg/i386-signbit-3.c
@@ -1,5 +1,6 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/i386-sse-5.c b/gcc/testsuite/gcc.dg/i386-sse-5.c
index ff41a8e5238..8fa2247411f 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-5.c
+++ b/gcc/testsuite/gcc.dg/i386-sse-5.c
@@ -1,5 +1,7 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-Winline -O2 -march=i386" } */
+
 typedef float v2df __attribute__ ((mode(V2DF)));
 v2df p;
 q(v2df t)
diff --git a/gcc/testsuite/gcc.dg/i386-sse-8.c b/gcc/testsuite/gcc.dg/i386-sse-8.c
index 881b36fce0b..23bf8d76cda 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-8.c
+++ b/gcc/testsuite/gcc.dg/i386-sse-8.c
@@ -1,8 +1,9 @@
-/* PR target/14313 */
+/* PR target/14343 */
 /* Origin: <Pawe Sikora <pluto@ds14.agh.edu.pl> */
 
 /* { dg-do compile } */
-/* { dg-options "-march=pentium3" { target i?86-*-* } } */
+/* { dg-options "" } */
+/* { dg-options "-march=pentium3" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 int main() 
 { 
diff --git a/gcc/testsuite/gcc.dg/i386-ssetype-3.c b/gcc/testsuite/gcc.dg/i386-ssetype-3.c
index 3b2461be32c..cae79e55202 100644
--- a/gcc/testsuite/gcc.dg/i386-ssetype-3.c
+++ b/gcc/testsuite/gcc.dg/i386-ssetype-3.c
@@ -11,7 +11,7 @@
 
 #include <xmmintrin.h>
 
-__m128 magic_a, magic_b;
+static __m128 magic_a, magic_b;
 __m128
 t1(void)
 {
diff --git a/gcc/testsuite/gcc.dg/i386-ssetype-5.c b/gcc/testsuite/gcc.dg/i386-ssetype-5.c
index 866c4d3d577..b03c83bab84 100644
--- a/gcc/testsuite/gcc.dg/i386-ssetype-5.c
+++ b/gcc/testsuite/gcc.dg/i386-ssetype-5.c
@@ -10,7 +10,7 @@
 /* Verify that we generate proper instruction with memory operand.  */
 
 #include <xmmintrin.h>
-__m128i magic_a, magic_b;
+static __m128i magic_a, magic_b;
 __m128i
 t1(void)
 {
diff --git a/gcc/testsuite/gcc.dg/i386-unroll-1.c b/gcc/testsuite/gcc.dg/i386-unroll-1.c
index a424b95eba2..e681474725a 100644
--- a/gcc/testsuite/gcc.dg/i386-unroll-1.c
+++ b/gcc/testsuite/gcc.dg/i386-unroll-1.c
@@ -1,5 +1,6 @@
 /* PR optimization/8599 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O2 -funroll-loops" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/i386-volatile-1.c b/gcc/testsuite/gcc.dg/i386-volatile-1.c
index 633ea5022ec..8a37df48b20 100644
--- a/gcc/testsuite/gcc.dg/i386-volatile-1.c
+++ b/gcc/testsuite/gcc.dg/i386-volatile-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/11381 */
 /* Originator: <tobias@ringstrom.mine.nu> */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O" } */
 
 /* Verify that the comparison is not optimized away. */
diff --git a/gcc/testsuite/gcc.dg/loop-3.c b/gcc/testsuite/gcc.dg/loop-3.c
index ba6fe556315..06428d92feb 100644
--- a/gcc/testsuite/gcc.dg/loop-3.c
+++ b/gcc/testsuite/gcc.dg/loop-3.c
@@ -3,7 +3,7 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3" } */
-/* { dg-options "-O3 -mtune=i386" { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-O3 -mtune=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #if defined(STACK_SIZE) && (STACK_SIZE < 65536)
 # define BYTEMEM_SIZE 10000L
diff --git a/gcc/testsuite/gcc.dg/ppc-eabi.c b/gcc/testsuite/gcc.dg/ppc-eabi.c
index 667463bc8ee..47ba1a73390 100644
--- a/gcc/testsuite/gcc.dg/ppc-eabi.c
+++ b/gcc/testsuite/gcc.dg/ppc-eabi.c
@@ -1,4 +1,4 @@
 /* PR target/16952 */
-/* { dg-do compile { target powerpc*-*-linux* } } */
-/* { dg-options "-m32 -meabi -mrelocatable" } */
+/* { dg-do compile { target { powerpc*-*-linux* && ilp32 } } } */
+/* { dg-options "-meabi -mrelocatable" } */
 char *s = "boo";
diff --git a/gcc/testsuite/gcc.dg/ppc64-abi-1.c b/gcc/testsuite/gcc.dg/ppc64-abi-1.c
index fa196595f38..c2c08a8605c 100644
--- a/gcc/testsuite/gcc.dg/ppc64-abi-1.c
+++ b/gcc/testsuite/gcc.dg/ppc64-abi-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc64-*-* } } */
+/* { dg-do run { target { powerpc*-*-* && lp64 } } } */
 /* { dg-options "-O2" } */
 #include <stdarg.h>
 #include <signal.h>
diff --git a/gcc/testsuite/gcc.dg/ppc64-abi-2.c b/gcc/testsuite/gcc.dg/ppc64-abi-2.c
index ab0e1a14710..312d4c6cc99 100644
--- a/gcc/testsuite/gcc.dg/ppc64-abi-2.c
+++ b/gcc/testsuite/gcc.dg/ppc64-abi-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc64-*-linux* } } */
+/* { dg-do run { target { powerpc*-*-linux* && lp64 } } } */
 /* { dg-options "-O2 -fprofile -mprofile-kernel -maltivec -mabi=altivec" } */
 #include <stdarg.h>
 #include <signal.h>
diff --git a/gcc/testsuite/gcc.dg/ppc64-abi-3.c b/gcc/testsuite/gcc.dg/ppc64-abi-3.c
index 58f161dae6c..8d2a5952ded 100644
--- a/gcc/testsuite/gcc.dg/ppc64-abi-3.c
+++ b/gcc/testsuite/gcc.dg/ppc64-abi-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc64-*-linux* } } */
+/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
 /* { dg-options "-Wall" } */
 /* Testcase to check for ABI compliance of parameter passing
    for the PowerPC64 ABI.  */
diff --git a/gcc/testsuite/gcc.dg/pr12092-1.c b/gcc/testsuite/gcc.dg/pr12092-1.c
index 8f38a4a7f46..80c7546d9fb 100644
--- a/gcc/testsuite/gcc.dg/pr12092-1.c
+++ b/gcc/testsuite/gcc.dg/pr12092-1.c
@@ -1,6 +1,7 @@
 /* PR rtl-optimization/12092  */
 /* Test case reduced by Andrew Pinski <pinskia@physics.uc.edu> */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mtune=i486 -march=pentium4 -fprefetch-loop-arrays" } */
 
 void DecodeAC(int index,int *matrix)
diff --git a/gcc/testsuite/gcc.dg/pr14289-1.c b/gcc/testsuite/gcc.dg/pr14289-1.c
index 652916325c2..71317d542c7 100644
--- a/gcc/testsuite/gcc.dg/pr14289-1.c
+++ b/gcc/testsuite/gcc.dg/pr14289-1.c
@@ -1,5 +1,5 @@
 /* PR middle-end/14289 */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O0" } */
 
 register int a[2] asm("ebx");
diff --git a/gcc/testsuite/gcc.dg/pr14289-2.c b/gcc/testsuite/gcc.dg/pr14289-2.c
index 7530b468cac..6cc33e733c4 100644
--- a/gcc/testsuite/gcc.dg/pr14289-2.c
+++ b/gcc/testsuite/gcc.dg/pr14289-2.c
@@ -1,5 +1,5 @@
 /* PR middle-end/14289 */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O0" } */
 
 static register int a[2] asm("ebx");  /* { dg-error "multiple storage" } */
diff --git a/gcc/testsuite/gcc.dg/pr14289-3.c b/gcc/testsuite/gcc.dg/pr14289-3.c
index 7cfbf78ce05..a96e48c5fda 100644
--- a/gcc/testsuite/gcc.dg/pr14289-3.c
+++ b/gcc/testsuite/gcc.dg/pr14289-3.c
@@ -1,5 +1,5 @@
 /* PR middle-end/14289 */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O0" } */
 
 extern register int a[2] asm("ebx");  /* { dg-error "multiple storage" } */
diff --git a/gcc/testsuite/gcc.dg/pr23098.c b/gcc/testsuite/gcc.dg/pr23098.c
new file mode 100644
index 00000000000..d1750b735f9
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr23098.c
@@ -0,0 +1,25 @@
+/* PR rtl-optimization/23098 */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-O2 -fPIC" } */
+/* { dg-final { scan-assembler-not "\.LC\[0-9\]" } } */
+/* { dg-require-effective-target ilp32 } */
+
+double foo (float);
+
+double
+f1 (void)
+{
+  return foo (1.0);
+}
+
+double
+f2 (void)
+{
+  return foo (0.0);
+}
+
+void
+f3 (float *x, float t)
+{
+  *x = 0.0 + t;
+}
diff --git a/gcc/testsuite/gcc.dg/pr9771-1.c b/gcc/testsuite/gcc.dg/pr9771-1.c
index 1e3bc036aee..30e42de60b1 100644
--- a/gcc/testsuite/gcc.dg/pr9771-1.c
+++ b/gcc/testsuite/gcc.dg/pr9771-1.c
@@ -1,5 +1,6 @@
 /* PR rtl-optimization/9771 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -fomit-frame-pointer -ffixed-ebp" } */
 
 extern void abort(void);
diff --git a/gcc/testsuite/gcc.dg/setjmp-2.c b/gcc/testsuite/gcc.dg/setjmp-2.c
index 6c89f8e9697..8ad874d522c 100644
--- a/gcc/testsuite/gcc.dg/setjmp-2.c
+++ b/gcc/testsuite/gcc.dg/setjmp-2.c
@@ -1,8 +1,8 @@
 /* PR middle-end/17813 */
 /* Origin: Tom Hughes <tom@compton.nu> */
 /* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */
-/* { dg-options "-O -fomit-frame-pointer -march=i386" { target i?86-*-linux* } } */
-/* { dg-options "-O -fomit-frame-pointer -m32 -march=i386" { target x86_64-*-linux* } } */
+/* { dg-options "-O -fomit-frame-pointer" } */
+/* { dg-options "-O -fomit-frame-pointer -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #include <setjmp.h>
 #include <signal.h>
diff --git a/gcc/testsuite/gcc.dg/short-compare-1.c b/gcc/testsuite/gcc.dg/short-compare-1.c
index 6a4e388d179..4c470529bc7 100644
--- a/gcc/testsuite/gcc.dg/short-compare-1.c
+++ b/gcc/testsuite/gcc.dg/short-compare-1.c
@@ -3,8 +3,7 @@
 
 /* { dg-do run } */
 /* { dg-options "-O" } */
-/* { dg-options "-O -mtune=i686" { target i?86-*-* } } */
-/* { dg-options "-O -m32 -mtune=i686" { target x86_64-*-* } } */
+/* { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort(void);
 
diff --git a/gcc/testsuite/gcc.dg/short-compare-2.c b/gcc/testsuite/gcc.dg/short-compare-2.c
index 1c5963c5a2f..0026a88c1ff 100644
--- a/gcc/testsuite/gcc.dg/short-compare-2.c
+++ b/gcc/testsuite/gcc.dg/short-compare-2.c
@@ -4,8 +4,7 @@
 
 /* { dg-do run } */
 /* { dg-options "-O" } */
-/* { dg-options "-O -mtune=i686" { target i?86-*-* } } */
-/* { dg-options "-O -m32 -mtune=i686" { target x86_64-*-* } } */
+/* { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort();
 
diff --git a/gcc/testsuite/gcc.dg/sibcall-5.c b/gcc/testsuite/gcc.dg/sibcall-5.c
index 424908dba5a..f4ab7dd384c 100644
--- a/gcc/testsuite/gcc.dg/sibcall-5.c
+++ b/gcc/testsuite/gcc.dg/sibcall-5.c
@@ -1,5 +1,6 @@
 /* Check that indirect sibcalls understand regparm.  */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
 int (*f)(int, int) __attribute__((regparm(2)));
diff --git a/gcc/testsuite/gcc.dg/sibcall-6.c b/gcc/testsuite/gcc.dg/sibcall-6.c
index 771a14e8b56..0ff37e936db 100644
--- a/gcc/testsuite/gcc.dg/sibcall-6.c
+++ b/gcc/testsuite/gcc.dg/sibcall-6.c
@@ -7,6 +7,7 @@
    Contributed by Andreas Bauer <baueran@in.tum.de>  */
 
 /* { dg-do run { target i?86-*-* x86_64-*-*} } */
+/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && ilp32 } { "-fpic" "-fPIC" } { "" } } */
 /* { dg-options "-O2 -foptimize-sibling-calls" } */
 
 int foo (int);
diff --git a/gcc/testsuite/gcc.dg/tls/opt-1.c b/gcc/testsuite/gcc.dg/tls/opt-1.c
index 8523c762a2e..111caa8bd36 100644
--- a/gcc/testsuite/gcc.dg/tls/opt-1.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-1.c
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fPIC" } */
-/* { dg-options "-O2 -fPIC -mtune=i686" { target i?86-*-* } } */
+/* { dg-options "-O2 -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-require-effective-target fpic } */
 
 extern __thread int thr;
 
diff --git a/gcc/testsuite/gcc.dg/tls/opt-2.c b/gcc/testsuite/gcc.dg/tls/opt-2.c
index 713fb7f360c..b422eec60ab 100644
--- a/gcc/testsuite/gcc.dg/tls/opt-2.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-2.c
@@ -4,7 +4,7 @@
    on IA-32.  */
 /* { dg-do link } */
 /* { dg-options "-O2 -ftls-model=initial-exec" } */
-/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target i?86-*-* } } */
+/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 __thread int thr;
 
diff --git a/gcc/testsuite/gcc.dg/tls/opt-3.c b/gcc/testsuite/gcc.dg/tls/opt-3.c
index 8e476f657e8..1d187822980 100644
--- a/gcc/testsuite/gcc.dg/tls/opt-3.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-3.c
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fpic" } */
-/* { dg-options "-O2 -fpic -mregparm=3" { target i?86-*-* } } */
+/* { dg-options "-O2 -fpic -mregparm=3" { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target fpic } */
 
 extern __thread int i, j, k;
 extern void bar(int *, int *, int *);
diff --git a/gcc/testsuite/gcc.dg/torture/pr18582-1.c b/gcc/testsuite/gcc.dg/torture/pr18582-1.c
index 93fde0c4a2f..25218562a5d 100644
--- a/gcc/testsuite/gcc.dg/torture/pr18582-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pr18582-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-msse3" } */
 typedef char v16qi __attribute__((vector_size (16)));
 typedef int v4si __attribute__((vector_size (16)));
diff --git a/gcc/testsuite/gcc.dg/unroll-1.c b/gcc/testsuite/gcc.dg/unroll-1.c
index 1e2dd09ebec..0148490e6ba 100644
--- a/gcc/testsuite/gcc.dg/unroll-1.c
+++ b/gcc/testsuite/gcc.dg/unroll-1.c
@@ -1,7 +1,7 @@
 /* PR optimization/8599 */
 /* { dg-do run } */
 /* { dg-options "-O2 -funroll-loops" } */
-/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target i?86-*-* } } */
+/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.misc-tests/dg-1.c b/gcc/testsuite/gcc.misc-tests/dg-1.c
deleted file mode 100644
index 319f8a20a7b..00000000000
--- a/gcc/testsuite/gcc.misc-tests/dg-1.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Test the tester.  */
-/* { dg-prms-id 42 } */
-/* { dg-do compile } */
-
-main () { return 0; }
-
-/* { dg-final { if ![file exists dg-1.s] { fail "dg-1.c (compile)"; return; } } } */
-
-/* { dg-final { set tmp [grep dg-1.s main line]			} } */
-/* { dg-final { if ![string match "" $tmp] \{			} } */
-/* { dg-final {     pass "dg-1.c (main function present)"	} } */
-/* { dg-final { \} else \{					} } */
-/* { dg-final {     fail "dg-1.c (main function not present)"	} } */
-/* { dg-final { \}						} } */
diff --git a/gcc/testsuite/gcc.misc-tests/dg-10.c b/gcc/testsuite/gcc.misc-tests/dg-10.c
deleted file mode 100644
index 6d7b3441623..00000000000
--- a/gcc/testsuite/gcc.misc-tests/dg-10.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Test the tester.  */
-/* { dg-prms-id 42 } */
-/* { dg-options "-Wall" } */
-
-/* FIXME: we want to test dg-lose here.  Anyone know of a good way to
-   crash the compiler?  */
-
-int
-main (int argc, char *argv[])
-{
-  return 0;
-}
diff --git a/gcc/testsuite/gcc.misc-tests/dg-2.c b/gcc/testsuite/gcc.misc-tests/dg-2.c
deleted file mode 100644
index bb40387e632..00000000000
--- a/gcc/testsuite/gcc.misc-tests/dg-2.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Test the tester.  */
-/* { dg-prms-id 42 } */
-/* { dg-do assemble } */
-
-main () { return 0; }
-
-/* { dg-final { if [file exists dg-2.o] \{			} } */
-/* { dg-final {     pass "dg-2.c (assemble: produce .o test)"	} } */
-/* { dg-final { \} else \{					} } */
-/* { dg-final {     fail "dg-2.c (assemble: produce .o test)"	} } */
-/* { dg-final { \}						} } */
diff --git a/gcc/testsuite/gcc.misc-tests/dg-3.c b/gcc/testsuite/gcc.misc-tests/dg-3.c
deleted file mode 100644
index 017ab279f8e..00000000000
--- a/gcc/testsuite/gcc.misc-tests/dg-3.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Test the tester.  */
-/* { dg-prms-id 42 } */
-/* { dg-do link } */
-
-main () { return 0; }
-
-/* { dg-final { if [file exists a.out] \{			} } */
-/* { dg-final {     pass "dg-2.c (link: produce a.out test)"	} } */
-/* { dg-final { \} else \{					} } */
-/* { dg-final {     fail "dg-2.c (link: produce a.out test)"	} } */
-/* { dg-final { \}						} } */
diff --git a/gcc/testsuite/gcc.misc-tests/dg-test.exp b/gcc/testsuite/gcc.misc-tests/dg-test.exp
deleted file mode 100644
index 820e28de471..00000000000
--- a/gcc/testsuite/gcc.misc-tests/dg-test.exp
+++ /dev/null
@@ -1,38 +0,0 @@
-#   Copyright (C) 1997 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-
-# Test the dg.exp driver.
-# This is a testsuite tester tester.  As such we *want* to test things like
-# expected failure handling.  But expected failures must continually be
-# monitored and so in the normal case we create unnecessary work.  So only
-# run these tests if DG_TEST is defined to "yes".
-
-global DG_TEST
-if { ![info exists DG_TEST] || "$DG_TEST" != "yes" } {
-    return
-}
-
-# Load support procs.
-load_lib gcc-dg.exp
-
-# Initialize harness.
-dg-init
-
-# Main loop.
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/dg-*.c]] "" ""
-
-# All done.
-dg-finish
diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
index 5774963d04f..ffb2e79530b 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
@@ -1,7 +1,10 @@
 /* Test that the correct data prefetch instructions are generated for i386
    variants that use 3DNow! prefetch instructions.  */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-*} } */
+/* { dg-require-effective-target ilp32 } */
+
+extern void exit (int);
 
 char *msg = "howdy there";
 
diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
index 301e8b7ed9f..8d5ad1efe7d 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
@@ -2,7 +2,10 @@
    variants that use 3DNow! prefetchw or SSE prefetch instructions with
    locality hints.  */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
+
+extern void exit (int);
 
 char *msg = "howdy there";
 
diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
index bdd236ade88..d87a2100dda 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
@@ -1,7 +1,10 @@
 /* Test that data prefetch instructions are not generated for i386 variants
    that do not support those instructions.  */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
+
+extern void exit (int);
 
 char *msg = "howdy there";
 
diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
index 783fc822dae..fb47c9dfc53 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
@@ -1,7 +1,10 @@
 /* Test that the correct data prefetch instructions are generated for i386
    variants that use SSE prefetch instructions.  */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
+
+extern void exit (int);
 
 char *msg = "howdy there";
 
diff --git a/gcc/testsuite/gcc.test-framework/README b/gcc/testsuite/gcc.test-framework/README
new file mode 100644
index 00000000000..3a9d4f086af
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/README
@@ -0,0 +1,25 @@
+Check the test directives used in GCC's testsuite by generating and
+running tests that use combinations of those commands or that stress
+the selector expressions that can be used in those directives.  Also
+run a few tests of specific functionality from the source directory.
+                                                                                
+Each generated test has two parts: a file ending in "-1.c" whose
+expected result is encoded in the filename after "-exp-", and a file
+ending in "-2.c" which is always expected to pass.
+                                                                                
+This test directory is normally skipped and is not meant to be run at
+the same time as other parts of the testsuite; it's only of interest to
+people who are modifying the test directives or their support in GCC's
+.exp files.
+
+To run these tests:
+                                                                                
+    CHECK_TEST_FRAMEWORK=1 make -k check RUNTESTFLAGS="test-framework.exp"
+                                                                                
+To check the results:
+                                                                                
+    TF=${SRC}/gcc/testsuite/gcc.test-framework
+    awk -f ${TF}/test-framework.awk gcc/testsuite/gcc.sum
+                                                                                
+The awk script prints unexpected results followed by the number of tests
+that passed and failed.
diff --git a/gcc/testsuite/gcc.test-framework/dg-bogus-exp-P.c b/gcc/testsuite/gcc.test-framework/dg-bogus-exp-P.c
new file mode 100644
index 00000000000..003264a72df
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-bogus-exp-P.c
@@ -0,0 +1,8 @@
+/* Test the tester; previously part of gcc.misc-tests/dg-9.c.  */
+/* { dg-prms-id 42 } */
+/* { dg-options "-Wall" } */
+
+int main (int argc, char *argv[])
+{
+  return 0; /* { dg-bogus "foobar" "bogus fail test" } */
+}
diff --git a/gcc/testsuite/gcc.test-framework/dg-bogus-exp-XF.c b/gcc/testsuite/gcc.test-framework/dg-bogus-exp-XF.c
new file mode 100644
index 00000000000..60c9147af6e
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-bogus-exp-XF.c
@@ -0,0 +1,9 @@
+/* Test the tester; previously part of gcc.misc-tests/dg-9.c.  */
+/* { dg-prms-id 42 } */
+/* { dg-options "-Wall" } */
+
+main (int argc, char *argv[])
+{	/* { dg-bogus "return type" "bogus pass test" { xfail *-*-* } } */
+}
+
+/* { dg-excess-errors "bogus pass test" { xfail *-*-* } } */
diff --git a/gcc/testsuite/gcc.test-framework/dg-do-assemble-exp-P.c b/gcc/testsuite/gcc.test-framework/dg-do-assemble-exp-P.c
new file mode 100644
index 00000000000..316572092a6
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-do-assemble-exp-P.c
@@ -0,0 +1,11 @@
+/* Test the tester; previously gcc.misc-tests/dg-2.c.  */
+/* { dg-prms-id 42 } */
+/* { dg-do assemble } */
+
+main () { return 0; }
+
+/* { dg-final { if [file exists dg-do-assemble-exp-P.o] \{	} } */
+/* { dg-final {     pass "dg-do-assemble-exp-P.c (assemble: produce .o test)"	} } */
+/* { dg-final { \} else \{					} } */
+/* { dg-final {     fail "dg-do-assemble-exp-P.c (assemble: produce .o test)"	} } */
+/* { dg-final { \}						} } */
diff --git a/gcc/testsuite/gcc.test-framework/dg-do-compile-exp-P.c b/gcc/testsuite/gcc.test-framework/dg-do-compile-exp-P.c
new file mode 100644
index 00000000000..93857465a16
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-do-compile-exp-P.c
@@ -0,0 +1,14 @@
+/* Test the tester; previously gcc.misc-tests/dg-1.c.  */
+/* { dg-prms-id 42 } */
+/* { dg-do compile } */
+
+main () { return 0; }
+
+/* { dg-final { if ![file exists dg-do-compile-exp-P.s] { fail "dg-do-compile-exp-P.c (compile)"; return; } } } */
+
+/* { dg-final { set tmp [grep dg-do-compile-exp-P.s main line]			} } */
+/* { dg-final { if ![string match "" $tmp] \{			} } */
+/* { dg-final {     pass "dg-do-compile-exp-P.c (main function present)"	} } */
+/* { dg-final { \} else \{					} } */
+/* { dg-final {     fail "dg-do-compile-exp-P.c (main function not present)"	} } */
+/* { dg-final { \}						} } */
diff --git a/gcc/testsuite/gcc.test-framework/dg-do-link-exp-P.c b/gcc/testsuite/gcc.test-framework/dg-do-link-exp-P.c
new file mode 100644
index 00000000000..254109e6526
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-do-link-exp-P.c
@@ -0,0 +1,11 @@
+/* Test the tester; previously gcc.misc-tests/dg-3.c.  */
+/* { dg-prms-id 42 } */
+/* { dg-do link } */
+
+main () { return 0; }
+
+/* { dg-final { if [file exists dg-do-link-exp-P.exe] \{			} } */
+/* { dg-final {     pass "dg-do-link-exp-P.c (link: produce a.out test)"	} } */
+/* { dg-final { \} else \{					} } */
+/* { dg-final {     fail "dg-do-link-exp-P.c (link: produce a.out test)"	} } */
+/* { dg-final { \}						} } */
diff --git a/gcc/testsuite/gcc.misc-tests/dg-4.c b/gcc/testsuite/gcc.test-framework/dg-do-run-exp-P.c
index 806bdfbf91a..a7f3ffa680a 100644
--- a/gcc/testsuite/gcc.misc-tests/dg-4.c
+++ b/gcc/testsuite/gcc.test-framework/dg-do-run-exp-P.c
@@ -1,4 +1,4 @@
-/* Test the tester.  */
+/* Test the tester; previously gcc.misc-tests/dg-4.c.  */
 /* { dg-prms-id 42 } */
 /* { dg-do run } */
 
diff --git a/gcc/testsuite/gcc.misc-tests/dg-11.c b/gcc/testsuite/gcc.test-framework/dg-dot-run-exp-P.c
index bfbba4d1216..3bbc4e1bd40 100644
--- a/gcc/testsuite/gcc.misc-tests/dg-11.c
+++ b/gcc/testsuite/gcc.test-framework/dg-dot-run-exp-P.c
@@ -1,6 +1,6 @@
-/* Test the tester.  */
+/* Test the tester; previously gcc.misc-tests/dg-11.c.  */
 /* { dg-prms-id 42 } */
-/* { dg-do run { target sparc-sun-solaris2* } } */
+/* { dg-do run { target *-*-* } } */
 /* The \n is left out of the pattern because tcl's exec will remove it.  */
 /* { dg-output {Hello world[.]} } */
 
diff --git a/gcc/testsuite/gcc.misc-tests/dg-12.c b/gcc/testsuite/gcc.test-framework/dg-dot-run-exp-U.c
index c6adbf53d95..9d79604b226 100644
--- a/gcc/testsuite/gcc.misc-tests/dg-12.c
+++ b/gcc/testsuite/gcc.test-framework/dg-dot-run-exp-U.c
@@ -1,4 +1,4 @@
-/* Test the tester.  */
+/* Test the tester; previously gcc.misc-tests/dg-12.c.  */
 /* { dg-prms-id 42 } */
 /* { dg-do run { target foo-bar-eh } } */
 /* The \n is left out of the pattern because tcl's exec will remove it.  */
diff --git a/gcc/testsuite/gcc.test-framework/dg-dot-run-sif-exp-P.c b/gcc/testsuite/gcc.test-framework/dg-dot-run-sif-exp-P.c
new file mode 100644
index 00000000000..bf473616abb
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-dot-run-sif-exp-P.c
@@ -0,0 +1,8 @@
+/* { dg-do run { target { *-*-* && yes } } } */
+/* { dg-skip-if "comment" { no && yes } { "*" } { "" } } */
+
+int
+main ()
+{
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.test-framework/dg-dot-run-sif-exp-U.c b/gcc/testsuite/gcc.test-framework/dg-dot-run-sif-exp-U.c
new file mode 100644
index 00000000000..65008c8ab28
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-dot-run-sif-exp-U.c
@@ -0,0 +1,8 @@
+/* { dg-do run { target { *-*-* || no } } } */
+/* { dg-skip-if "comment" { *-*-* && yes } { "*" } { "" } } */
+
+int
+main ()
+{
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.test-framework/dg-dot-run-xif-exp-P.c b/gcc/testsuite/gcc.test-framework/dg-dot-run-xif-exp-P.c
new file mode 100644
index 00000000000..eb2af26081f
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-dot-run-xif-exp-P.c
@@ -0,0 +1,8 @@
+/* { dg-do run { target { *-*-* && yes } } } */
+/* { dg-xfail-if "comment" { empty-*-* && yes } { "*" } { "" } } */
+
+int
+main ()
+{
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.test-framework/dg-dot-run-xif-exp-XP.c b/gcc/testsuite/gcc.test-framework/dg-dot-run-xif-exp-XP.c
new file mode 100644
index 00000000000..59cb7689401
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-dot-run-xif-exp-XP.c
@@ -0,0 +1,8 @@
+/* { dg-do compile { target { *-*-* empty-*-* } } } */
+/* { dg-xfail-if "comment" { *-*-* && yes } { "*" } { "" } } */
+
+int
+main ()
+{
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.misc-tests/dg-7.c b/gcc/testsuite/gcc.test-framework/dg-dox-run-exp-XF.c
index adde4cb60d2..69cff8bb8e3 100644
--- a/gcc/testsuite/gcc.misc-tests/dg-7.c
+++ b/gcc/testsuite/gcc.test-framework/dg-dox-run-exp-XF.c
@@ -1,4 +1,4 @@
-/* Test the tester.  */
+/* Test the tester; previously gcc.misc-tests/dg-7.c.  */
 /* { dg-prms-id 42 } */
 /* { dg-do run { xfail *-*-* } } */
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.test-framework/dg-error-exp-P.c b/gcc/testsuite/gcc.test-framework/dg-error-exp-P.c
new file mode 100644
index 00000000000..cb28e34ce95
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-error-exp-P.c
@@ -0,0 +1,9 @@
+/* Test the tester; previously part of gcc.misc-tests/dg-9.c.  */
+/* { dg-prms-id 42 } */
+/* { dg-options "-Wall" } */
+
+int main (int argc, char *argv[])
+{
+  +;		/* { dg-error "syntax error" "error test" } */
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.test-framework/dg-error-exp-XP.c b/gcc/testsuite/gcc.test-framework/dg-error-exp-XP.c
new file mode 100644
index 00000000000..856b7270b25
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-error-exp-XP.c
@@ -0,0 +1,11 @@
+/* Test the tester; previously part of gcc.misc-tests/dg-9.c.  */
+/* { dg-prms-id 42 } */
+/* { dg-options "-Wall" } */
+
+int main (int argc, char *argv[])
+{
+  +;
+              /* { dg-error "syntax error" "error test" { xfail *-*-* } 7 } */
+  return 0;
+}
+/* { dg-excess-errors "expect failure" { xfail *-*-* } } */
diff --git a/gcc/testsuite/gcc.misc-tests/dg-8.c b/gcc/testsuite/gcc.test-framework/dg-excess-errors-exp-XF.c
index 63a5b0e73fa..496c6a60d50 100644
--- a/gcc/testsuite/gcc.misc-tests/dg-8.c
+++ b/gcc/testsuite/gcc.test-framework/dg-excess-errors-exp-XF.c
@@ -1,7 +1,7 @@
-/* Test the tester.  */
+/* Test the tester; previously gcc.misc-tests/dg-8.c.  */
 /* { dg-prms-id 42 } */
 /* { dg-options "-Wall" } */
-/* { dg-do run } */
+/* { dg-do compile } */
 /* { dg-excess-errors "excess errors" } */
 
 /* should get warning about defaulting return type - excess error */
diff --git a/gcc/testsuite/gcc.test-framework/dg-excess-errors-exp-XP.c b/gcc/testsuite/gcc.test-framework/dg-excess-errors-exp-XP.c
new file mode 100644
index 00000000000..4aecca3ba34
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/dg-excess-errors-exp-XP.c
@@ -0,0 +1,9 @@
+/* Test the tester.  */
+/* { dg-prms-id 42 } */
+/* { dg-options "-Wall" } */
+/* { dg-do compile } */
+/* { dg-excess-errors "excess errors" } */
+
+/* No messages, so unexpected pass.  */
+
+int main () { return 0; }
diff --git a/gcc/testsuite/gcc.misc-tests/dg-5.c b/gcc/testsuite/gcc.test-framework/dg-output-exp-P.c
index 178fcb85a4d..4cec76f982c 100644
--- a/gcc/testsuite/gcc.misc-tests/dg-5.c
+++ b/gcc/testsuite/gcc.test-framework/dg-output-exp-P.c
@@ -1,4 +1,4 @@
-/* Test the tester.  */
+/* Test the tester; previously gcc.misc-tests/dg-5.c.  */
 /* { dg-prms-id 42 } */
 /* { dg-do run } */
 /* The \n is left out of the pattern because tcl's exec will remove it.  */
diff --git a/gcc/testsuite/gcc.misc-tests/dg-6.c b/gcc/testsuite/gcc.test-framework/dg-output-exp-XF.c
index 8323792c918..6606e5c932a 100644
--- a/gcc/testsuite/gcc.misc-tests/dg-6.c
+++ b/gcc/testsuite/gcc.test-framework/dg-output-exp-XF.c
@@ -1,4 +1,4 @@
-/* Test the tester.  */
+/* Test the tester; previously gcc.misc-tests/dg-6.c.  */
 /* { dg-prms-id 42 } */
 /* { dg-do run { target *-*-* } } */
 /* The \n is left out of the pattern because tcl's exec will remove it.  */
diff --git a/gcc/testsuite/gcc.misc-tests/dg-9.c b/gcc/testsuite/gcc.test-framework/dg-warning-exp-P.c
index b228fff7437..cb9883ac4e8 100644
--- a/gcc/testsuite/gcc.misc-tests/dg-9.c
+++ b/gcc/testsuite/gcc.test-framework/dg-warning-exp-P.c
@@ -1,15 +1,15 @@
-/* Test the tester.  */
+/* Test the tester; previously part of gcc.misc-tests/dg-9.c.  */
 /* { dg-prms-id 42 } */
 /* { dg-options "-Wall" } */
 
+int i;
+
 f ()
 {	/* { dg-warning "return type" "warning test" } */
+  i = 1;
 }	/* { dg-warning "control reaches end" "warning test" } */
 
 main (int argc, char *argv[])
 {		/* { dg-warning "return type" "warning test" } */
-  +;		/* { dg-error "parse" "error test" } */
-		/* { dg-bogus "foobar" "bogus fail test" } */
-
-  return a;	/* { dg-bogus "undeclared|identifier|appears" "bogus pass test" { xfail *-*-* } } */
+  i = 1;
 }		/* { dg-warning "control reaches end" "warning test" } */
diff --git a/gcc/testsuite/gcc.test-framework/gen_directive_tests b/gcc/testsuite/gcc.test-framework/gen_directive_tests
new file mode 100755
index 00000000000..42e63826b31
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/gen_directive_tests
@@ -0,0 +1,693 @@
+#! /bin/bash
+
+########################################################################
+#
+# File:    generate_framework_tests
+# Author:  Janis Johnson
+# Date:    2004/11/02
+#
+# Generate tests of GCC's test framework.  Each test has encoded in
+# its name the dg commands that are used in the test and the expected
+# result of the test, *-1.c.  Each test is followed by a test ending
+# in *-2.c that is expected to pass.
+#
+# This script has evolved and could be rewritten to be more compact.
+#
+#
+# Copyright (c) 2004, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+#
+# For a copy of the GNU General Public License, write the the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+########################################################################
+
+cd $1
+
+GOOD0='*-*-*'
+GOOD1="yes"
+GOOD2='empty-*-* *-*-empty *-*-*'
+BAD0='empty-empty-empty'
+BAD1="no"
+BAD2='empty-*-* *-empty-* *-*-empty'
+
+# Programs used in the tests: good compile and run, bad compile, and
+# bad run.
+GOOD_PROG="int main () { return 0; }"
+BADC_PROG="int missing_body () }"
+BADR_PROG="extern void abort (void); int main () { abort (); }"
+
+# dg-do commands with a target list.
+DOT_S0="{ dg-do compile { target ${GOOD0} } }"
+DOT_S1="{ dg-do compile { target ${GOOD1} } }"
+DOT_N0="{ dg-do compile { target ${BAD0} } }"
+DOT_N1="{ dg-do compile { target ${BAD1} } }"
+
+# dg-do commands with an xfail list; the xfail list is ignored for
+# everything but "run".
+DOX_P0="{ dg-do run { xfail ${BAD0} } }"
+DOX_P1="{ dg-do run { xfail ${BAD1} } }"
+DOX_F0="{ dg-do run { xfail ${GOOD0} } }"
+DOX_F1="{ dg-do run { xfail ${GOOD1} } }"
+
+# dg-xfail-if commands.
+XIF_P0="{ dg-xfail-if \"target not matched\" { ${BAD0} } { \"-DY1\" } { \"-DY2\" } }"
+XIF_P1="{ dg-xfail-if \"target not matched\" { ${BAD0} } { \"-DY1\" } { \"-DN\" } }"
+XIF_P2="{ dg-xfail-if \"target not matched\" { ${BAD0} } { \"-DN\" } { \"-DY1\" } }"
+XIF_P3="{ dg-xfail-if \"target not matched\" { ${BAD0} } { \"-DN1\" } { \"-DN2\" } }"
+XIF_P4="{ dg-xfail-if \"exclude option matched\" { ${GOOD0} } { \"-DY1\" } { \"-DY2\" } }"
+XIF_P5="{ dg-xfail-if \"include option not matched\" { ${GOOD0} } { \"-DN\" } { \"-DY1\" } }"
+XIF_P6="{ dg-xfail-if \"include option not matched\" { ${GOOD0} } { \"-DN1\" } { \"-DN2\" } }"
+XIF_F0="{ dg-xfail-if \"all matches succeed\" { ${GOOD0} } { \"-DY1\" } { \"-DN\" } }"
+XIF_F1="{ dg-xfail-if \"all matches succeed\" { ${GOOD0} } { \"*\" } { \"-DN\" } }"
+XIF_F2="{ dg-xfail-if \"all matches succeed\" { ${GOOD0} } { \"-DY1\" } { \"\" } }"
+XIF_F3="{ dg-xfail-if \"all matches succeed\" { ${GOOD0} } { \"*\" } { \"\" } }"
+
+XIF_P7="{ dg-xfail-if \"target not matched\" { ${BAD1} } { \"-DY1\" } { \"-DY2\" } }"
+XIF_P8="{ dg-xfail-if \"target not matched\" { ${BAD1} } { \"-DY1\" } { \"-DN\" } }"
+XIF_P9="{ dg-xfail-if \"target not matched\" { ${BAD1} } { \"-DN\" } { \"-DY1\" } }"
+XIF_P10="{ dg-xfail-if \"target not matched\" { ${BAD1} } { \"-DN1\" } { \"-DN2\" } }"
+XIF_P11="{ dg-xfail-if \"exclude option matched\" { ${GOOD1} } { \"-DY1\" } { \"-DY2\" } }"
+XIF_P12="{ dg-xfail-if \"include option not matched\" { ${GOOD1} } { \"-DN\" } { \"-DY1\" } }"
+XIF_P13="{ dg-xfail-if \"include option not matched\" { ${GOOD1} } { \"-DN1\" } { \"-DN2\" } }"
+XIF_F4="{ dg-xfail-if \"all matches succeed\" { ${GOOD1} } { \"-DY1\" } { \"-DN\" } }"
+XIF_F5="{ dg-xfail-if \"all matches succeed\" { ${GOOD1} } { \"*\" } { \"-DN\" } }"
+XIF_F6="{ dg-xfail-if \"all matches succeed\" { ${GOOD1} } { \"-DY1\" } { \"\" } }"
+XIF_F7="{ dg-xfail-if \"all matches succeed\" { ${GOOD1} } { \"*\" } { \"\" } }"
+
+
+# dg-skip-if commands.
+SIF_S0="{ dg-skip-if \"target not matched\" { ${BAD0} } { \"-DY1\" } { \"-DY2\" } }"
+SIF_S1="{ dg-skip-if \"target not matched\" { ${BAD0} } { \"-DY1\" } { \"-DN\" } }"
+SIF_S2="{ dg-skip-if \"target not matched\" { ${BAD0} } { \"-DN\" } { \"-DY1\" } }"
+SIF_S3="{ dg-skip-if \"target not matched\" { ${BAD0} } { \"-DN1\" } { \"-DN2\" } }"
+SIF_S4="{ dg-skip-if \"exclude option matched\" { ${GOOD0} } { \"-DY1\" } { \"-DY2\" } }"
+SIF_S5="{ dg-skip-if \"include option not matched\" { ${GOOD0} } { \"-DN\" } { \"-DY1\" } }"
+SIF_S6="{ dg-skip-if \"include option not matched\" { ${GOOD0} } { \"-DN1\" } { \"-DN2\" } }"
+SIF_N0="{ dg-skip-if \"all matches succeed\" { ${GOOD0} } { \"-DY1\" } { \"-DN\" } }"
+SIF_N1="{ dg-skip-if \"all matches succeed\" { ${GOOD0} } { \"*\" } { \"-DN\" } }"
+SIF_N2="{ dg-skip-if \"all matches succeed\" { ${GOOD0} } { \"-DY1\" } { \"\" } }"
+SIF_N3="{ dg-skip-if \"all matches succeed\" { ${GOOD0} } { \"*\" } { \"\" } }"
+SIF_S7="{ dg-skip-if \"target not matched\" { ${BAD1} } { \"-DY1\" } { \"-DY2\" } }"
+SIF_S8="{ dg-skip-if \"target not matched\" { ${BAD1} } { \"-DY1\" } { \"-DN\" } }"
+SIF_S9="{ dg-skip-if \"target not matched\" { ${BAD1} } { \"-DN\" } { \"-DY1\" } }"
+SIF_S10="{ dg-skip-if \"target not matched\" { ${BAD1} } { \"-DN1\" } { \"-DN2\" } }"
+SIF_S11="{ dg-skip-if \"exclude option matched\" { ${GOOD1} } { \"-DY1\" } { \"-DY2\" } }"
+SIF_S12="{ dg-skip-if \"include option not matched\" { ${GOOD1} } { \"-DN\" } { \"-DY1\" } }"
+SIF_S13="{ dg-skip-if \"include option not matched\" { ${GOOD1} } { \"-DN1\" } { \"-DN2\" } }"
+SIF_N4="{ dg-skip-if \"all matches succeed\" { ${GOOD1} } { \"-DY1\" } { \"-DN\" } }"
+SIF_N5="{ dg-skip-if \"all matches succeed\" { ${GOOD1} } { \"*\" } { \"-DN\" } }"
+SIF_N6="{ dg-skip-if \"all matches succeed\" { ${GOOD1} } { \"-DY1\" } { \"\" } }"
+SIF_N7="{ dg-skip-if \"all matches succeed\" { ${GOOD1} } { \"*\" } { \"\" } }"
+
+# dg-require-* commands, using procedures defined for this set of tests.
+REQ_S0="{ dg-require-true \"\" }"    # do not skip the test
+REQ_N0="{ dg-require-false \"\" }"   # skip the test
+
+# scan-assembler-not, which is hoped to be representative of commands
+# used with dg-final, with a target list.
+SAT_N0="{ dg-final { scan-assembler-not \"unexpected gargage\" { target ${BAD0} } } }"
+SAT_N1="{ dg-final { scan-assembler-not \"unexpected gargage\" { target ${BAD1} } } }"
+SAT_S0="{ dg-final { scan-assembler-not \"unexpected gargage\" { target ${GOOD0} } } }"
+SAT_S1="{ dg-final { scan-assembler-not \"unexpected gargage\" { target ${GOOD1} } } }"
+
+# scan-assembler-not, which is hoped to be representative of commands
+# used with dg-final, with an xfail list.
+SAX_P0="{ dg-final { scan-assembler-not \"unexpected gargage\" { xfail ${BAD0} } } }"
+SAX_P1="{ dg-final { scan-assembler-not \"unexpected gargage\" { xfail ${BAD1} } } }"
+SAX_F0="{ dg-final { scan-assembler-not \"unexpected gargage\" { xfail ${GOOD0} } } }"
+SAX_F1="{ dg-final { scan-assembler-not \"unexpected gargage\" { xfail ${GOOD1} } } }"
+
+KIND_LIST=""
+
+# Expected result of the *-1.c test, encoded into the file name.
+EXP_PASS="exp-P"
+EXP_XPASS="exp-XP"
+EXP_SKIP="exp-U"
+EXP_FAIL="exp-F"
+EXP_XFAIL="exp-XF"
+
+get_list() {
+    KIND=$1
+    case $KIND in
+      "dots") KIND_LIST="dots0 dots1";;
+      "dotn") KIND_LIST="dotn0 dotn1";;
+      "doxp") KIND_LIST="doxp0 doxp1";;
+      "doxf") KIND_LIST="doxf0 doxf1";;
+      "sifs") KIND_LIST="sifs0 sifs1 sifs2 sifs3 sifs4 sifs5 sifs6 sifs7 sifs8 sifs9 sifs10 sifs11 sifs12 sifs13";;
+      "sifn") KIND_LIST="sifn0 sifn1 sifn2 sifn3 sifn4 sifn5 sifn6 sifn7";;
+      "xifp") KIND_LIST="xifp0 xifp1 xifp2 xifp3 xifp4 xifp5 xifp6 xifp7 xifp8 xifp9 xifp10 xifp11 xifp12 xifp13";;
+      "xiff") KIND_LIST="xiff0 xiff1 xiff2 xiff3 xiff4 xiff5 xiff6 xiff7";;
+      "sats") KIND_LIST="sats0 sats1";;
+      "satn") KIND_LIST="satn0 satn1";;
+      "saxp") KIND_LIST="saxp0 saxp1";;
+      "saxf") KIND_LIST="saxf0 saxf1";;
+      "reqs") KIND_LIST="reqs0";;
+      "reqn") KIND_LIST="reqn0";;
+      *) echo "oops: $KIND"; exit 1;;
+    esac
+}
+
+cmd() {
+    KIND=$1
+    FILE=$2
+
+    case $KIND in
+      "dots") echo '/*' "${DOT_S0}" '*/' >> $FILE;;
+      "dots0") echo '/*' "${DOT_S0}" '*/' >> $FILE;;
+      "dots1") echo '/*' "${DOT_S1}" '*/' >> $FILE;;
+      "dots2") echo '/*' "${DOT_S2}" '*/' >> $FILE;;
+      "dots3") echo '/*' "${DOT_S3}" '*/' >> $FILE;;
+      "dots4") echo '/*' "${DOT_S4}" '*/' >> $FILE;;
+      "dotn") echo '/*' "${DOT_N0}" '*/' >> $FILE;;
+      "dotn0") echo '/*' "${DOT_N0}" '*/' >> $FILE;;
+      "dotn1") echo '/*' "${DOT_N1}" '*/' >> $FILE;;
+      "dotn2") echo '/*' "${DOT_N2}" '*/' >> $FILE;;
+      "dotn3") echo '/*' "${DOT_N3}" '*/' >> $FILE;;
+      "dotn4") echo '/*' "${DOT_N4}" '*/' >> $FILE;;
+      "doxp") echo '/*' "${DOX_P0}" '*/' >> $FILE;;
+      "doxp0") echo '/*' "${DOX_P0}" '*/' >> $FILE;;
+      "doxp1") echo '/*' "${DOX_P1}" '*/' >> $FILE;;
+      "doxp2") echo '/*' "${DOX_P2}" '*/' >> $FILE;;
+      "doxp3") echo '/*' "${DOX_P3}" '*/' >> $FILE;;
+      "doxp4") echo '/*' "${DOX_P4}" '*/' >> $FILE;;
+      "doxf") echo '/*' "${DOX_F0}" '*/' >> $FILE;;
+      "doxf0") echo '/*' "${DOX_F0}" '*/' >> $FILE;;
+      "doxf1") echo '/*' "${DOX_F1}" '*/' >> $FILE;;
+      "doxf2") echo '/*' "${DOX_F2}" '*/' >> $FILE;;
+      "doxf3") echo '/*' "${DOX_F3}" '*/' >> $FILE;;
+      "doxf4") echo '/*' "${DOX_F4}" '*/' >> $FILE;;
+      "sifs") echo '/*' "${SIF_S0}" '*/' >> $FILE;;
+      "sifs0") echo '/*' "${SIF_S0}" '*/' >> $FILE;;
+      "sifs1") echo '/*' "${SIF_S1}" '*/' >> $FILE;;
+      "sifs2") echo '/*' "${SIF_S2}" '*/' >> $FILE;;
+      "sifs3") echo '/*' "${SIF_S3}" '*/' >> $FILE;;
+      "sifs4") echo '/*' "${SIF_S4}" '*/' >> $FILE;;
+      "sifs5") echo '/*' "${SIF_S5}" '*/' >> $FILE;;
+      "sifs6") echo '/*' "${SIF_S6}" '*/' >> $FILE;;
+      "sifs7") echo '/*' "${SIF_S7}" '*/' >> $FILE;;
+      "sifs8") echo '/*' "${SIF_S8}" '*/' >> $FILE;;
+      "sifs9") echo '/*' "${SIF_S9}" '*/' >> $FILE;;
+      "sifs10") echo '/*' "${SIF_S10}" '*/' >> $FILE;;
+      "sifs11") echo '/*' "${SIF_S11}" '*/' >> $FILE;;
+      "sifs12") echo '/*' "${SIF_S12}" '*/' >> $FILE;;
+      "sifs13") echo '/*' "${SIF_S13}" '*/' >> $FILE;;
+      "sifn") echo '/*' "${SIF_N0}" '*/' >> $FILE;;
+      "sifn0") echo '/*' "${SIF_N0}" '*/' >> $FILE;;
+      "sifn1") echo '/*' "${SIF_N1}" '*/' >> $FILE;;
+      "sifn2") echo '/*' "${SIF_N2}" '*/' >> $FILE;;
+      "sifn3") echo '/*' "${SIF_N3}" '*/' >> $FILE;;
+      "sifn4") echo '/*' "${SIF_N4}" '*/' >> $FILE;;
+      "sifn5") echo '/*' "${SIF_N5}" '*/' >> $FILE;;
+      "sifn6") echo '/*' "${SIF_N6}" '*/' >> $FILE;;
+      "sifn7") echo '/*' "${SIF_N7}" '*/' >> $FILE;;
+      "xifp") echo '/*' "${XIF_P0}" '*/' >> $FILE;;
+      "xifp0") echo '/*' "${XIF_P0}" '*/' >> $FILE;;
+      "xifp1") echo '/*' "${XIF_P1}" '*/' >> $FILE;;
+      "xifp2") echo '/*' "${XIF_P2}" '*/' >> $FILE;;
+      "xifp3") echo '/*' "${XIF_P3}" '*/' >> $FILE;;
+      "xifp4") echo '/*' "${XIF_P4}" '*/' >> $FILE;;
+      "xifp5") echo '/*' "${XIF_P5}" '*/' >> $FILE;;
+      "xifp6") echo '/*' "${XIF_P6}" '*/' >> $FILE;;
+      "xifp7") echo '/*' "${XIF_P7}" '*/' >> $FILE;;
+      "xifp8") echo '/*' "${XIF_P8}" '*/' >> $FILE;;
+      "xifp9") echo '/*' "${XIF_P9}" '*/' >> $FILE;;
+      "xifp10") echo '/*' "${XIF_P10}" '*/' >> $FILE;;
+      "xifp11") echo '/*' "${XIF_P11}" '*/' >> $FILE;;
+      "xifp12") echo '/*' "${XIF_P12}" '*/' >> $FILE;;
+      "xifp13") echo '/*' "${XIF_P13}" '*/' >> $FILE;;
+      "xiff") echo '/*' "${XIF_F0}" '*/' >> $FILE;;
+      "xiff0") echo '/*' "${XIF_F0}" '*/' >> $FILE;;
+      "xiff1") echo '/*' "${XIF_F1}" '*/' >> $FILE;;
+      "xiff2") echo '/*' "${XIF_F2}" '*/' >> $FILE;;
+      "xiff3") echo '/*' "${XIF_F3}" '*/' >> $FILE;;
+      "xiff4") echo '/*' "${XIF_F4}" '*/' >> $FILE;;
+      "xiff5") echo '/*' "${XIF_F5}" '*/' >> $FILE;;
+      "xiff6") echo '/*' "${XIF_F6}" '*/' >> $FILE;;
+      "xiff7") echo '/*' "${XIF_F7}" '*/' >> $FILE;;
+      "satn") echo '/*' "${SAT_N0}" '*/' >> $FILE;;
+      "satn0") echo '/*' "${SAT_N0}" '*/' >> $FILE;;
+      "satn1") echo '/*' "${SAT_N1}" '*/' >> $FILE;;
+      "satn2") echo '/*' "${SAT_N2}" '*/' >> $FILE;;
+      "satn3") echo '/*' "${SAT_N3}" '*/' >> $FILE;;
+      "satn4") echo '/*' "${SAT_N4}" '*/' >> $FILE;;
+      "sats") echo '/*' "${SAT_S0}" '*/' >> $FILE;;
+      "sats0") echo '/*' "${SAT_S0}" '*/' >> $FILE;;
+      "sats1") echo '/*' "${SAT_S1}" '*/' >> $FILE;;
+      "sats2") echo '/*' "${SAT_S2}" '*/' >> $FILE;;
+      "sats3") echo '/*' "${SAT_S3}" '*/' >> $FILE;;
+      "sats4") echo '/*' "${SAT_S4}" '*/' >> $FILE;;
+      "saxp") echo '/*' "${SAX_P0}" '*/' >> $FILE;;
+      "saxp0") echo '/*' "${SAX_P0}" '*/' >> $FILE;;
+      "saxp1") echo '/*' "${SAX_P1}" '*/' >> $FILE;;
+      "saxp2") echo '/*' "${SAX_P2}" '*/' >> $FILE;;
+      "saxp3") echo '/*' "${SAX_P3}" '*/' >> $FILE;;
+      "saxp4") echo '/*' "${SAX_P4}" '*/' >> $FILE;;
+      "saxf") echo '/*' "${SAX_F0}" '*/' >> $FILE;;
+      "saxf0") echo '/*' "${SAX_F0}" '*/' >> $FILE;;
+      "saxf1") echo '/*' "${SAX_F1}" '*/' >> $FILE;;
+      "saxf2") echo '/*' "${SAX_F2}" '*/' >> $FILE;;
+      "saxf3") echo '/*' "${SAX_F3}" '*/' >> $FILE;;
+      "saxf4") echo '/*' "${SAX_F4}" '*/' >> $FILE;;
+      "reqs") echo '/*' "${REQ_S0}" '*/' >> $FILE;;
+      "reqs0") echo '/*' "${REQ_S0}" '*/' >> $FILE;;
+      "reqn") echo '/*' "${REQ_N0}" '*/' >> $FILE;;
+      "reqn0") echo '/*' "${REQ_N0}" '*/' >> $FILE;;
+      *) echo "oops: $KIND"; exit 1;;
+    esac
+}
+
+# Generate a test using a single dg- command.  If requested, generate a
+# second version that will fail.
+one() {
+    KIND=$1
+    EXP=$2
+    FAIL_VERSION=$3
+
+    NAME=${KIND}-${EXP}
+    FILE1=${NAME}-1.c
+    FILE2=${NAME}-2.c
+    rm -f $FILE1
+    touch $FILE1
+    cmd $KIND $FILE1
+    echo "${GOOD_PROG}" >> $FILE1
+    echo "${GOOD_PROG}" > $FILE2
+
+    if [ "${FAIL_VERSION}" == "yes" ]; then
+	if [ "${EXP}" == "${EXP_PASS}" ]; then
+	    NAME=${KIND}-${EXP_FAIL}
+	else
+	    NAME=${KIND}-${EXP_XFAIL}
+	fi
+
+	FILE1=${NAME}-1.c
+	FILE2=${NAME}-2.c
+	rm -f $FILE1
+	touch $FILE1
+	cmd $KIND $FILE1
+	case $KIND in
+	dox*)	echo "${BADR_PROG}" >> $FILE1;;
+	*)	echo "${BADC_PROG}" >> $FILE1;;
+	esac
+	echo "${GOOD_PROG}" > $FILE2
+    fi
+}
+
+# Generate a test using two dg- commands.  If requested, generate a
+# second version that will fail.
+two() {
+    KIND1=$1
+    KIND2=$2
+    EXP=$3
+    FAIL_VERSION=$4
+
+    NAME=${KIND1}-${KIND2}-${EXP}
+    FILE1=${NAME}-1.c
+    FILE2=${NAME}-2.c
+
+    rm -f $FILE1
+    touch $FILE1
+    cmd $KIND1 $FILE1
+    cmd $KIND2 $FILE1
+    echo "${GOOD_PROG}" >> $FILE1
+    echo "${GOOD_PROG}" > $FILE2
+
+    if [ "${FAIL_VERSION}" == "yes" ]; then
+	if [ "${EXP}" == "${EXP_PASS}" ]; then
+	    NAME=${KIND1}-${KIND2}-${EXP_FAIL}
+	else
+	    NAME=${KIND1}-${KIND2}-${EXP_XFAIL}
+	fi
+
+	FILE1=${NAME}-1.c
+	FILE2=${NAME}-2.c
+	rm -f $FILE1
+	touch $FILE1
+	cmd $KIND1 $FILE1
+	cmd $KIND2 $FILE1
+	# dg-do with an xfail list is only used as the first command.
+	case $KIND1 in
+	dox*)	echo "${BADR_PROG}" >> $FILE1;;
+	*)	echo "${BADC_PROG}" >> $FILE1;;
+	esac
+	echo "${GOOD_PROG}" > $FILE2
+    fi
+}
+
+# Generate a test using three dg- commands.  If requested generate a
+# second version that will fail.
+three() {
+    KIND1=$1
+    KIND2=$2
+    KIND3=$3
+    EXP=$4
+    FAIL_VERSION=$5
+
+    NAME=${KIND1}-${KIND2}-${KIND3}-${EXP}
+    FILE1=${NAME}-1.c
+    FILE2=${NAME}-2.c
+    rm -f $FILE1
+    touch $FILE1
+    cmd $KIND1 $FILE1
+    cmd $KIND2 $FILE1
+    cmd $KIND3 $FILE1
+    echo "${GOOD_PROG}" >> $FILE1
+    echo "${GOOD_PROG}" > $FILE2
+
+    if [ "${FAIL_VERSION}" == "${yes}" ]; then
+	if [ "${EXP}" == "${EXP_PASS}" ]; then
+	    NAME=${KIND1}-${KIND2}-${KIND3}-${EXP_FAIL}
+	else
+	    NAME=${KIND1}-${KIND2}-${KIND3}-${EXP_XFAIL}
+	fi
+
+	FILE1=${NAME}-1.c
+	FILE2=${NAME}-2.c
+	rm -f $FILE1
+	touch $FILE1
+	cmd $KIND1 $FILE1
+	cmd $KIND2 $FILE1
+	cmd $KIND3 $FILE1
+	# dg-do with an xfail list is only used as the first command.
+	case $KIND1 in
+	dox*)	echo "${BADR_PROG}" >> $FILE1;;
+	*)	echo "${BADC_PROG}" >> $FILE1;;
+	esac
+	echo "${GOOD_PROG}" > $FILE2
+    fi
+}
+
+# Generate tests using one dg- command.  Generate a test for each variant
+# of KIND.
+one_all() {
+    KIND=$1
+    EXP=$2
+    FAIL_VERSION=$3
+
+    get_list $KIND
+    for k in $KIND_LIST; do
+	one $k $EXP $FAIL_VERSION
+    done
+}
+
+# Generate tests using two dg- commands.  For each KIND, generate
+# a test for each of its variants.
+two_all() {
+    KIND1=$1
+    KIND2=$2
+    EXP=$3
+    FAIL_VERSION=$4
+
+    get_list $KIND1
+    KIND_LIST1="$KIND_LIST"
+    get_list $KIND2
+    KIND_LIST2="$KIND_LIST"
+    for k1 in $KIND_LIST1; do
+	for k2 in $KIND_LIST2; do
+	    two $k1 $k2 $EXP $FAIL_VERSION
+	done
+    done
+}
+
+# Generate tests using three dg- commands.  For each KIND, generate
+# a test for each of its variants.
+three_all() {
+    KIND1=$1
+    KIND2=$2
+    KIND3=$3
+    EXP=$4
+    FAIL_VERSION=$5
+
+    get_list $KIND1
+    KIND_LIST1="$KIND_LIST"
+    get_list $KIND2
+    KIND_LIST2="$KIND_LIST"
+    get_list $KIND3
+    KIND_LIST3="$KIND_LIST"
+    for k1 in $KIND_LIST1; do
+	for k2 in $KIND_LIST2; do
+	    for k3 in $KIND_LIST3; do
+		three $k1 $k2 $k3 $EXP $FAIL_VERSION
+	    done
+	done
+    done
+}
+
+# Generate a test that uses a dg-do directive with a selector expression.
+dgdo_progs() {
+    WHAT=$1
+    KIND=$2
+    PROG="$3"
+    NAME="$4"
+    XPR="$5"
+    
+    FILE1=${NAME}-1.c
+    FILE2=${NAME}-2.c
+    rm -f $FILE1
+    touch $FILE1
+    echo '/* { dg-do' $WHAT '{' $KIND "$XPR" '} } */' >> $FILE1
+    echo "${PROG}" >> $FILE1
+    echo "${GOOD_PROG}" > $FILE2
+}
+
+# Use various selector-expressions that evaluate to TRUE in dg-do directives.
+selector_good() {
+    NUM=101
+    for xpr in \
+        "$GOOD0" \
+        "$GOOD1" \
+        "$GOOD2" \
+        "{ ! $BAD0 }" \
+        "{ ! $BAD1 }" \
+	"{ ! { $BAD2 } }" \
+	"{ ! \"${BAD2}\" }" \
+        "{ $GOOD1 || $GOOD0 }"  \
+        "{ $BAD1 || $GOOD0 }" \
+        "{ $GOOD0 && $GOOD1 }"  \
+        "{ $BAD1 || { \"${GOOD2}\" && $GOOD1 } }" \
+        "{ { $BAD0 || $GOOD0 } && $GOOD0 }" \
+        "{ $GOOD1 && { \"${GOOD2}\" || $BAD1 } }" \
+        "{ \"${GOOD2}\" && { $GOOD1 || $BAD1 } }"
+    do
+        dgdo_progs compile target "$GOOD_PROG" "dots${NUM}-exp-P" "$xpr"
+        dgdo_progs compile target "$BADC_PROG" "dots${NUM}-exp-F" "$xpr"
+        dgdo_progs run xfail "$GOOD_PROG" "doxf${NUM}-exp-XP" "$xpr"
+        dgdo_progs run xfail "$BADR_PROG" "doxf${NUM}-exp-XF" "$xpr"
+        let NUM=NUM+1
+    done
+}
+
+# Use various selector-expressions that evaluate to FALSE in dg-do directives.
+selector_bad() {
+    NUM=101
+    for xpr in \
+        "$BAD0" \
+        "$BAD1" \
+        "$BAD2" \
+        "{ ! $GOOD0 }" \
+        "{ ! $GOOD1 }" \
+	"{ ! { $GOOD2 } }" \
+	"{ ! \"${GOOD2}\" }" \
+        "{ $BAD1 || $BAD0 }" \
+        "{ $BAD0 && $GOOD1 }" \
+        "{ $GOOD1 && $BAD0 }" \
+        "{ $BAD1 || { $GOOD1 && $BAD0 } }" \
+        "{ { $GOOD1 || $BAD1 } && $BAD0 }" \
+        "{ $BAD1 || { \"${BAD2}\" && $GOOD1 } }" \
+        "{ \"${BAD2}\" && { $GOOD1 || $BAD1 } }"
+    do
+        dgdo_progs compile target "$GOOD_PROG" "dotn${NUM}-exp-U" "$xpr"
+        dgdo_progs run xfail "$GOOD_PROG" "doxp${NUM}-exp-P" "$xpr"
+        dgdo_progs run xfail "$BADR_PROG" "doxp${NUM}-exp-F" "$xpr"
+        let NUM=NUM+1
+    done
+}
+
+# Write a test whose directive is too long and messy to do as one string.
+deep_progs() {
+    PROG="$1"
+    NAME=$2
+    CMD1="$3"
+    CMD2="$4"
+    CMD3="$5"
+
+    FILE1=${NAME}-1.c
+    FILE2=${NAME}-2.c
+    rm -f $FILE1
+    touch $FILE1
+    echo "$CMD1" "$CMD2" "$CMD3" > $FILE1
+    echo "$PROG" >> $FILE1
+    echo "$GOOD_PROG" > $FILE2
+}
+
+# Use nested expressions in various test directives.
+selector_deep() {
+    GOODXPR="{ \"${GOOD2}\" && { ! { $BAD0 || $BAD1 } } }"
+    BADXPR="{ ! { \"${GOOD2}\" || { $GOOD1 && $BAD1 } } }"
+    NUM=100
+    dgdo_progs compile target "$GOOD_PROG" "dots${NUM}-exp-P" "$GOODXPR"
+    dgdo_progs compile target "$GOOD_PROG" "dotn${NUM}-exp-U" "$BADXPR"
+
+    deep_progs "$BADC_PROG" "xiff-100-exp-XF" \
+      '/* { dg-xfail-if "match" { ' "{ $GOODXPR }" ' } { "*" } { "" } } */'
+    deep_progs "$GOOD_PROG" "xifp-100-exp-P" \
+      '/* { dg-xfail-if "no match" { ' "{ $BADXPR }" ' } { "*" } { "" } } */'
+    deep_progs "$BADC_PROG" "xifn-100-exp-U" \
+      '/* { dg-skip-if "match" { ' "{ $GOODXPR }" ' } { "*" } { "" } } */'
+    deep_progs "$GOOD_PROG" "xifs-100-exp-P" \
+      '/* { dg-skip-if "match" { ' "{ $BADXPR }" ' } { "*" } { "" } } */'
+    deep_progs "$GOOD_PROG" "satn-100-exp-P" \
+      '/* { dg-final { scan-assembler-not "unexpected garbage" { target ' \
+      "$GOODXPR" ' } } } */'
+    deep_progs "$GOOD_PROG" "satn-100-exp-U" \
+      '/* { dg-final { scan-assembler-not "unexpected garbage" { target ' \
+      "$BADXPR" ' } } } */'
+    deep_progs "$GOOD_PROG" "satf-100-exp-XP" \
+      '/* { dg-final { scan-assembler-not "unexpected garbage" { xfail ' \
+      "$GOODXPR" ' } } } */'
+    deep_progs "$GOOD_PROG" "satp-100-exp-P" \
+      '/* { dg-final { scan-assembler-not "unexpected garbage" { xfail ' \
+      "$BADXPR" ' } } } */'
+}
+
+selector_good
+selector_bad
+selector_deep
+
+one_all saxp $EXP_PASS no
+one_all saxf $EXP_XPASS no
+one_all sats $EXP_PASS no
+one_all satn $EXP_SKIP no
+one_all dots $EXP_PASS yes
+one_all dotn $EXP_SKIP no
+one_all doxp $EXP_PASS yes
+one_all doxf $EXP_XPASS yes
+one_all sifs $EXP_PASS yes
+one_all sifn $EXP_SKIP no
+one_all xifp $EXP_PASS yes
+one_all xiff $EXP_XPASS yes
+one_all reqs $EXP_PASS yes
+one_all reqn $EXP_SKIP no
+
+two_all dots xifp $EXP_PASS yes
+two_all dots xiff $EXP_XPASS yes
+two_all dots sifs $EXP_PASS yes
+two_all dots sifn $EXP_SKIP no
+two_all dotn xifp $EXP_SKIP no
+two_all dotn sifs $EXP_SKIP no
+two_all dotn sifn $EXP_SKIP no
+two_all dotn xiff $EXP_SKIP no
+two_all dots reqs $EXP_PASS yes
+two_all dots reqn $EXP_SKIP no
+two_all dotn reqs $EXP_SKIP no
+two_all dotn reqn $EXP_SKIP no
+
+two_all doxp xifp $EXP_PASS yes
+two_all doxp xiff $EXP_PASS yes   # dg-xfail-if applies to compile, not run
+two_all doxp sifs $EXP_PASS yes
+two_all doxp sifn $EXP_SKIP no
+two_all doxf xifp $EXP_XPASS yes
+two_all doxf xiff $EXP_XPASS yes
+two_all doxf sifs $EXP_XPASS yes
+two_all doxf sifn $EXP_SKIP no
+
+two_all doxp reqs $EXP_PASS yes
+two_all doxp reqn $EXP_SKIP no
+two_all doxf reqs $EXP_XPASS yes
+two_all doxf reqn $EXP_SKIP no
+
+two_all reqs xifp $EXP_PASS yes
+two_all reqs xiff $EXP_XPASS yes
+two_all reqs sifs $EXP_PASS yes
+two_all reqs sifn $EXP_SKIP no
+two_all reqn xifp $EXP_SKIP no
+two_all reqn xiff $EXP_SKIP no
+two_all reqn sifs $EXP_SKIP no
+two_all reqn sifn $EXP_SKIP no
+
+two_all xifp reqs $EXP_PASS yes
+two_all xiff reqs $EXP_XPASS yes
+two_all sifs reqs $EXP_PASS yes
+two_all sifn reqs $EXP_SKIP no
+two_all xifp reqn $EXP_SKIP no
+two_all xiff reqn $EXP_SKIP no
+two_all sifs reqn $EXP_SKIP no
+two_all sifn reqn $EXP_SKIP no
+
+three_all dots reqs xifp $EXP_PASS yes
+three_all dots reqs xiff $EXP_XPASS yes
+three_all dots reqs sifs $EXP_PASS yes
+three_all dots reqs sifn $EXP_SKIP no
+three_all dots reqn xifp $EXP_SKIP no
+three_all dots reqn xiff $EXP_SKIP no
+three_all dots reqn sifs $EXP_SKIP no
+three_all dots reqn sifn $EXP_SKIP no
+three_all dotn reqs xifp $EXP_SKIP no
+three_all dotn reqs xiff $EXP_SKIP no
+three_all dotn reqs sifs $EXP_SKIP no
+three_all dotn reqs sifn $EXP_SKIP no
+three_all dotn reqn xifp $EXP_SKIP no
+three_all dotn reqn xiff $EXP_SKIP no
+three_all dotn reqn sifs $EXP_SKIP no
+three_all dotn reqn sifn $EXP_SKIP no
+#
+three_all dots xifp reqs $EXP_PASS yes
+three_all dots xiff reqs $EXP_XPASS yes
+three_all dots sifs reqs $EXP_PASS yes
+three_all dots sifn reqs $EXP_SKIP no
+three_all dots xifp reqn $EXP_SKIP no
+three_all dots xiff reqn $EXP_SKIP no
+three_all dots sifs reqn $EXP_SKIP no
+three_all dots sifn reqn $EXP_SKIP no
+three_all dotn xifp reqs $EXP_SKIP no
+three_all dotn xiff reqs $EXP_SKIP no
+three_all dotn sifs reqs $EXP_SKIP no
+three_all dotn sifn reqs $EXP_SKIP no
+three_all dotn xifp reqn $EXP_SKIP no
+three_all dotn xiff reqn $EXP_SKIP no
+three_all dotn sifs reqn $EXP_SKIP no
+three_all dotn sifn reqn $EXP_SKIP no
+
+three_all doxp reqs xifp $EXP_PASS yes
+three_all doxp reqs xiff $EXP_PASS yes # dg-xfail-if applies to compile, not run
+three_all doxp reqs sifs $EXP_PASS yes
+three_all doxp reqs sifn $EXP_SKIP no
+three_all doxp reqn xifp $EXP_SKIP no
+three_all doxp reqn xiff $EXP_SKIP no
+three_all doxp reqn sifs $EXP_SKIP no
+three_all doxp reqn sifn $EXP_SKIP no
+three_all doxf reqs xifp $EXP_XPASS yes
+three_all doxf reqs xiff $EXP_XPASS yes
+three_all doxf reqs sifs $EXP_XPASS yes
+three_all doxf reqs sifn $EXP_SKIP no
+three_all doxf reqn xifp $EXP_SKIP no
+three_all doxf reqn xiff $EXP_SKIP no
+three_all doxf reqn sifs $EXP_SKIP no
+three_all doxf reqn sifn $EXP_SKIP no
+
+three_all doxp xifp reqs $EXP_PASS yes
+three_all doxp xiff reqs $EXP_PASS yes # dg-xfail-if applies to compile, not run
+three_all doxp sifs reqs $EXP_PASS yes
+three_all doxp sifn reqs $EXP_SKIP no
+three_all doxp xifp reqn $EXP_SKIP no
+three_all doxp xiff reqn $EXP_SKIP no
+three_all doxp sifs reqn $EXP_SKIP no
+three_all doxp sifn reqn $EXP_SKIP no
+three_all doxf xifp reqs $EXP_XPASS yes
+three_all doxf xiff reqs $EXP_XPASS yes
+three_all doxf sifs reqs $EXP_XPASS yes
+three_all doxf sifn reqs $EXP_SKIP no
+three_all doxf xifp reqn $EXP_SKIP no
+three_all doxf xiff reqn $EXP_SKIP no
+three_all doxf sifs reqn $EXP_SKIP no
+three_all doxf sifn reqn $EXP_SKIP no
diff --git a/gcc/testsuite/gcc.test-framework/test-framework.awk b/gcc/testsuite/gcc.test-framework/test-framework.awk
new file mode 100644
index 00000000000..30ff13d6e2d
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/test-framework.awk
@@ -0,0 +1,65 @@
+# Process the gcc.sum file for a run through gcc.test-framework.
+# Print result lines that show potential problems.  Report the number
+# of passing tests.
+#
+#
+# Copyright (c) 2004, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+#
+# For a copy of the GNU General Public License, write the the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+function pass(msg)	{
+			  passes++;
+			# printf("pass   %s\n", $0);
+			}
+function fail(msg)	{
+			  fails++;
+			  printf("fail   %s\n", $0);
+			}
+function ignore(msg)	{
+			# printf("ignore %s\n", $0);
+			}
+
+BEGIN			{ skip = 1; passes = 0; fails = 0; }
+/Running.*test-frame/	{ skip = 0; next }
+/gcc Summary/		{ skip = 1; next }
+			{ if (skip) next }
+/^$/			{ next }
+# The post tests are always expected to pass.
+/^PASS.*-2.c/		{ ignore(); next }
+# dg-xfail-if applies to the compile step; these should be XPASS for the
+# compile step on dox tests, which are run tests.
+/^XPASS.*dox.*xiff.*-1.c.*(test for excess errors)/ { ignore(); next }
+# xfail for scan-assembler-not tests doesn't apply to the compile step.
+/^PASS.*sa.*-1.c.*(test for excess errors)/ { ignore(); next }
+# The other dox tests pass the compile step; ignore that message.
+/^PASS.*dox.*(test for excess errors)/ { ignore(); next }
+# Ignore lines that begin with comma.
+/^,/			{ ignore(); next }
+# For tests of dg-output, ignore successful compilation.
+/^PASS.*dg-output.*(test for excess error)/	{ ignore(); next }
+# For tests of dg-output, ignore successful execution.
+/^PASS.*dg-output.*execution test/	{ ignore(); next }
+/^PASS/			{ if (match ($0, "exp-P")) { pass(); next } }
+/^FAIL/			{ if (match ($0, "exp-F")) { pass(); next } }
+/^XPASS/		{ if (match ($0, "exp-XP")) { pass(); next } }
+/^XFAIL/		{ if (match ($0, "exp-XF")) { pass(); next } }
+/^UNSUPPORTED/		{ if (match ($0, "exp-U")) { pass(); next } }
+			{ fail() }
+END			{
+			  printf("\n\t\t=== Test Framework Summary ===\n\n");
+			  printf("# of expected passes\t\t%d\n", passes);
+			  if (fails != 0)
+			    printf("# of unexpected failures\t%d\n", fails);
+			}
diff --git a/gcc/testsuite/gcc.test-framework/test-framework.exp b/gcc/testsuite/gcc.test-framework/test-framework.exp
new file mode 100644
index 00000000000..495ffe2cb99
--- /dev/null
+++ b/gcc/testsuite/gcc.test-framework/test-framework.exp
@@ -0,0 +1,75 @@
+# Copyright (c) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+#
+# For a copy of the GNU General Public License, write the the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# Based on gcc/testsuite/gcc.dg/dg.exp.
+
+# Don't run these tests unless an environment variable is defined.
+if { ![info exists env(CHECK_TEST_FRAMEWORK)] } {
+    verbose "skipping test framework tests, CHECK_TEST_FRAMEWORK is not defined" 0
+    return
+}
+
+load_lib gcc-dg.exp
+
+proc dg-require-true { args } {
+    verbose "dg-require-true" 2
+}
+
+proc dg-require-false { args } {
+    verbose "dg-require-false" 2
+    upvar dg-do-what dg-do-what
+    set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+}
+
+proc check_effective_target_yes { args } {
+    return 1
+}
+
+proc check_effective_target_no { args } {
+    return 0
+}
+
+global dg-do-what-default
+set save-dg-do-what-default ${dg-do-what-default}
+set dg-do-what-default compile
+
+dg-init
+
+# Run tests from the source directory.
+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/dg-*.c]] "" ""
+
+# Skip generated tests unless CHECK_TEST_FRAMEWORK is 1.
+if { $env(CHECK_TEST_FRAMEWORK) != 1 } {
+    verbose "skipping generated test framework tests, CHECK_TEST_FRAMEWORK is not 1" 0
+    return
+}
+
+# Generate additional tests.
+set tstobjdir "$tmpdir/gcc.test-framework"
+set generator "$srcdir/$subdir/gen_directive_tests"
+file delete -force $tstobjdir
+file mkdir $tstobjdir
+set status [remote_exec host "$generator $tstobjdir"]
+set status [lindex $status 0]
+if { $status == 0 } {
+    # Run the generated tests.
+    dg-runtest [lsort [find $tstobjdir *.c]] "" "-DY1 -DY2"
+} else {
+    warning "Could not generate test framework tests"
+}
+
+dg-finish
+set dg-do-what-default ${save-dg-do-what-default}
diff --git a/gcc/testsuite/lib/compat.exp b/gcc/testsuite/lib/compat.exp
index 95852da2363..ee0a92b328c 100644
--- a/gcc/testsuite/lib/compat.exp
+++ b/gcc/testsuite/lib/compat.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004 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
@@ -147,22 +147,52 @@ proc compat-run { testname objlist dest optall optfile optstr } {
 }
 
 #
-# compat-get-options -- get special tool flags to use for a source file
+# compat-get-options-main -- get target requirements for a test and
+# options for the primary source file and the test as a whole
 #
-# SRC is the full patchname of the source file.
+# SRC is the full pathname of the primary source file.
+#
+proc compat-get-options-main { src } {
+    # dg-options sets a variable called dg-extra-tool-flags.
+    set dg-extra-tool-flags ""
+
+    # dg-require-* sets dg-do-what.
+    upvar dg-do-what dg-do-what 
+
+    set tmp [dg-get-options $src]
+    foreach op $tmp {
+	set cmd [lindex $op 0]
+	if { ![string compare "dg-options" $cmd] \
+	     || [string match "dg-require-*" $cmd]  } {
+	    set status [catch "$op" errmsg]
+	    if { $status != 0 } {
+		perror "src: $errmsg for \"$op\"\n"
+		unresolved "$src: $errmsg for \"$op\""
+		return
+	    }
+	} elseif { ![string compare "dg-xfail-if" $cmd] } {
+	    warning "compat.exp does not support $cmd in primary source file"
+	} else {
+	    # Ignore unrecognized dg- commands, but warn about them.
+	    warning "compat.exp does not support $cmd"
+	}
+    }
+
+    # Return flags to use for compiling the primary source file and for
+    # linking.
+    return ${dg-extra-tool-flags}
+}
+
+#
+# compat-get-options -- get special tool flags to use for a secondary
+# source file
+#
+# SRC is the full pathname of the source file.
 # The result is a list of options to use.
 #
 # This code is copied from proc dg-test in dg.exp from DejaGNU.
 #
 proc compat-get-options { src } {
-    # Define our own special function `unknown` so we catch spelling errors.
-    # But first rename the existing one so we can restore it afterwards.
-    catch {rename dg-save-unknown ""}
-    rename unknown dg-save-unknown
-    proc unknown { args } {
-	return -code error "unknown dg option: $args"
-    }
-
     # dg-options sets a variable called dg-extra-tool-flags.
     set dg-extra-tool-flags ""
 
@@ -170,26 +200,28 @@ proc compat-get-options { src } {
     global compiler_conditional_xfail_data
     set compiler_conditional_xfail_data ""
 
+    # dg-xfail-if needs access to dg-do-what.
+    upvar dg-do-what dg-do-what 
+
     set tmp [dg-get-options $src]
     foreach op $tmp {
 	set cmd [lindex $op 0]
-	if { ![string compare "dg-options" $cmd] || ![string compare "dg-xfail-if" $cmd] } {
+	if { ![string compare "dg-options" $cmd] \
+	     || ![string compare "dg-xfail-if" $cmd] } {
 	    set status [catch "$op" errmsg]
 	    if { $status != 0 } {
 		perror "src: $errmsg for \"$op\"\n"
 		unresolved "$src: $errmsg for \"$op\""
 		return
 	    }
+	} elseif { [string match "dg-require-*" $cmd] } {
+	    warning "compat.exp does not support $cmd in secondary source files"
 	} else {
 	    # Ignore unrecognized dg- commands, but warn about them.
 	    warning "compat.exp does not support $cmd"
 	}
     }
 
-    # Restore normal error handling.
-    rename unknown ""
-    rename dg-save-unknown unknown
-
     return ${dg-extra-tool-flags}
 }
 
@@ -209,6 +241,21 @@ proc compat-execute { src1 sid use_alt } {
     global testcase
     global gluefile
     global compiler_conditional_xfail_data
+    global dg-do-what-default
+
+    # Get extra flags for this test from the primary source file, and
+    # process other dg-* options that this suite supports.  Warn about
+    # unsupported flags.
+    verbose "compat-execute: $src1" 1
+    set dg-do-what [list ${dg-do-what-default} "" P]
+    set extra_flags_1 [compat-get-options-main $src1]
+
+    # Check whether this test is supported for this target.
+    if { [lindex ${dg-do-what} 1 ] == "N" } {
+	unsupported "$src1"
+	verbose "$src1 not supported on this target, skipping it" 3
+	return
+    }
 
     # Set up the names of the other source files.
     regsub "_main.*" $src1 "" base
@@ -219,7 +266,6 @@ proc compat-execute { src1 sid use_alt } {
     # Use the dg-options mechanism to specify extra flags for this test. 
     # The extra flags in each file are used to compile that file, and the
     # extra flags in *_main.* are also used for linking.
-    set extra_flags_1 [compat-get-options $src1]
     set extra_flags_2 [compat-get-options $src2]
     set compile_xfail_2 $compiler_conditional_xfail_data
     set extra_flags_3 [compat-get-options $src3]
@@ -241,6 +287,10 @@ proc compat-execute { src1 sid use_alt } {
     if {[string first "$srcdir/" "$src1"] == 0} {
 	set testcase [string range "$src1" [string length "$srcdir/"] end]
     }
+    if {[string first "$tmpdir/" "$testcase"] == 0} {
+	set testcase [string range "$testcase" [string length "$tmpdir/"] end]
+	set testcase "tmpdir-$testcase"
+    }
     regsub "_main.*" $testcase "" testcase
     # Set up the base name of executable files so they'll be unique.
     regsub -all "\[./\]" $testcase "-" execbase
@@ -285,15 +335,19 @@ proc compat-execute { src1 sid use_alt } {
 	# later.  Skip this if we don't have an alternate compiler.
 	if { $use_alt != 0 } then {
 	    compat-use-alt-compiler
-	    compat-obj "$src2" "$obj2_alt" $alt_option $extra_flags_2 $optstr $compile_xfail_2
-	    compat-obj "$src3" "$obj3_alt" $alt_option $extra_flags_3 $optstr $compile_xfail_3
+	    compat-obj "$src2" "$obj2_alt" $alt_option $extra_flags_2 \
+		       $optstr $compile_xfail_2
+	    compat-obj "$src3" "$obj3_alt" $alt_option $extra_flags_3 \
+		       $optstr $compile_xfail_3
 	}
 
 	# Compile pieces with the compiler under test.
 	compat-use-tst-compiler
 	compat-obj "$src1" "$obj1" $tst_option $extra_flags_1 $optstr ""
-	compat-obj "$src2" "$obj2_tst" $tst_option $extra_flags_2 $optstr $compile_xfail_2
-	compat-obj "$src3" "$obj3_tst" $tst_option $extra_flags_3 $optstr $compile_xfail_3
+	compat-obj "$src2" "$obj2_tst" $tst_option $extra_flags_2 \
+		   $optstr $compile_xfail_2
+	compat-obj "$src3" "$obj3_tst" $tst_option $extra_flags_3 \
+		   $optstr $compile_xfail_3
 
 	# Link (using the compiler under test), run, and clean up tests.
 	compat-run "${obj2_tst}-${obj3_tst}" \
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 32c0e998186..91627cb09f2 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -17,6 +17,7 @@
 load_lib dg.exp
 load_lib file-format.exp
 load_lib target-supports.exp
+load_lib target-supports-dg.exp
 load_lib scanasm.exp
 load_lib prune.exp
 
@@ -260,148 +261,6 @@ proc gcc-dg-debug-runtest { target_compile trivial opt_opts testcases } {
     }
 }
 
-# If this target does not support weak symbols, skip this test.
-
-proc dg-require-weak { args } {
-    upvar dg-do-what dg-do-what
-    upvar name name
-
-    set weak_available [ check_weak_available ]
-    if { $weak_available == -1 } {
-	unresolved "$name"
-    }
-    if { $weak_available != 1 } {
-	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-	return
-    }
-}
-
-# If this target does not support the "visibility" attribute, skip this
-# test.
-
-proc dg-require-visibility { args } {
-    upvar dg-do-what dg-do-what
-    upvar name name
-
-    set visibility_available [ check_visibility_available ]
-    if { $visibility_available == -1 } {
-	unresolved "$name"
-    }
-    if { $visibility_available != 1 } {
-	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-	return
-    }
-}
-
-# If this target does not support the "alias" attribute, skip this
-# test.
-
-proc dg-require-alias { args } {
-    upvar dg-do-what dg-do-what
-    upvar name name
-
-    set alias_available [ check_alias_available ]
-    if { $alias_available == -1 } {
-	unresolved "$name"
-    }
-    if { $alias_available < 2 } {
-	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-	return
-    }
-}
-
-# If this target's linker does not support the --gc-sections flag,
-# skip this test.
-
-proc dg-require-gc-sections { args } {
-    if { ![ check_gc_sections_available ] } {
-	upvar dg-do-what dg-do-what
-	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-	return
-    }
-}
-
-# If this target does not support profiling, skip this test.
-
-proc dg-require-profiling { args } {
-    if { ![ check_profiling_available ${args} ] } {
-	upvar dg-do-what dg-do-what
-	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-	return
-    }
-}
-
-# If this target does not support DLL attributes skip this test.
-
-proc dg-require-dll { args } { 
-    global target_triplet
-    # As a special case, the mcore-*-elf supports dllimport/dllexport.
-    if { [string match "mcore-*-elf" $target_triplet] } {
-	return
-    }
-    # PE/COFF targets support dllimport/dllexport.
-    if { [gcc_target_object_format] == "pe" } {
-	return
-    }
-
-    upvar dg-do-what dg-do-what
-    set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-}
-
-# If this target does not support named sections skip this test.
-
-proc dg-require-named-sections { args } {
-   upvar name name
-
-   if { ![ check_named_sections_available ] } {
-       upvar dg-do-what dg-do-what
-       set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-   }
-}
-
-# Skip the test (report it as UNSUPPORTED) if the target list and
-# included flags are matched and the excluded flags are not matched.
-#
-# The first argument is the line number of the dg-skip-if directive
-# within the test file.   Remaining arguments are as for xfail lists:
-# message { targets } { include } { exclude }
-#
-# This tests against multilib flags plus either the default flags for this
-# group of tests or flags specified with a previous dg-options command.
-
-proc dg-skip-if { args } {
-    set args [lreplace $args 0 0]
-
-    set selector "target [join [lindex $args 1]]"
-    if { [dg-process-target $selector] == "S" } {
-	# The target list matched; now check the flags.  The DejaGnu proc
-	# check_conditional_xfail will look at the options in compiler_flags,
-	# so set that up for this test based on flags we know about.  Start
-	# the list with a dummy tool name so the list will match "*" if
-	# there are no flags.
-
-	global compiler_flags
-	upvar dg-extra-tool-flags extra_tool_flags
-
-	set compiler_flags " toolname "
-	append compiler_flags $extra_tool_flags
-	set dest [target_info name]
-	if [board_info $dest exists multilib_flags] {
-	    append compiler_flags "[board_info $dest multilib_flags] "
-	}
-
-	# The target list might be an effective-target keyword, so replace
-	# the original list with "*-*-*".
-	if [check_conditional_xfail [lreplace $args 1 1 "*-*-*"]] {
-	    upvar dg-do-what dg-do-what
-            set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-	}
-
-	# Any value in this variable was left over from an earlier test.
-	set compiler_flags ""
-    }
-}
-
 # Prune any messages matching ARGS[1] (a regexp) from test output.
 proc dg-prune-output { args } {
     global additional_prunes
@@ -414,18 +273,6 @@ proc dg-prune-output { args } {
     lappend additional_prunes [lindex $args 1]
 }
 
-# Like check_conditional_xfail, but callable from a dg test.
-
-proc dg-xfail-if { args } {
-    set args [lreplace $args 0 0]
-    set selector "target [join [lindex $args 1]]"
-    if { [dg-process-target $selector] == "S" } {
-	global compiler_conditional_xfail_data
-	set compiler_conditional_xfail_data $args
-    }
-}
-
-
 # We need to make sure that additional_* are cleared out after every
 # test.  It is not enough to clear them out *before* the next test run
 # because gcc-target-compile gets run directly from some .exp files
@@ -442,17 +289,24 @@ if { [info procs saved-dg-test] == [list] } {
 	global additional_sources
 	global additional_prunes
 	global errorInfo
+	global compiler_conditional_xfail_data
 
 	if { [ catch { eval saved-dg-test $args } errmsg ] } {
 	    set saved_info $errorInfo
 	    set additional_files ""
 	    set additional_sources ""
 	    set additional_prunes ""
+	    if [info exists compiler_conditional_xfail_data] {
+		unset compiler_conditional_xfail_data
+	    }
 	    error $errmsg $saved_info
 	}
 	set additional_files ""
 	set additional_sources ""
 	set additional_prunes ""
+	if [info exists compiler_conditional_xfail_data] {
+	    unset compiler_conditional_xfail_data
+	}
     }
 }
 set additional_prunes ""
diff --git a/gcc/testsuite/lib/gcov.exp b/gcc/testsuite/lib/gcov.exp
index c4a5c8c90df..6b3ee7800fe 100644
--- a/gcc/testsuite/lib/gcov.exp
+++ b/gcc/testsuite/lib/gcov.exp
@@ -52,6 +52,7 @@ proc verify-lines { testcase file } {
 	    }
 	}
     }
+    close $fd
     return $failed
 }
 
diff --git a/gcc/testsuite/lib/target-supports-dg.exp b/gcc/testsuite/lib/target-supports-dg.exp
new file mode 100644
index 00000000000..01ca0a8cdd2
--- /dev/null
+++ b/gcc/testsuite/lib/target-supports-dg.exp
@@ -0,0 +1,327 @@
+#   Copyright (C) 1997, 1999, 2000, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# If this target does not support weak symbols, skip this test.
+
+proc dg-require-weak { args } {
+    upvar dg-do-what dg-do-what
+    upvar name name
+
+    set weak_available [ check_weak_available ]
+    if { $weak_available == -1 } {
+	unresolved "$name"
+    }
+    if { $weak_available != 1 } {
+	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+	return
+    }
+}
+
+# If this target does not support the "visibility" attribute, skip this
+# test.
+
+proc dg-require-visibility { args } {
+    upvar dg-do-what dg-do-what
+    upvar name name
+
+    set visibility_available [ check_visibility_available ]
+    if { $visibility_available == -1 } {
+	unresolved "$name"
+    }
+    if { $visibility_available != 1 } {
+	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+	return
+    }
+}
+
+# If this target does not support the "alias" attribute, skip this
+# test.
+
+proc dg-require-alias { args } {
+    upvar dg-do-what dg-do-what
+    upvar name name
+
+    set alias_available [ check_alias_available ]
+    if { $alias_available == -1 } {
+	unresolved "$name"
+    }
+    if { $alias_available < 2 } {
+	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+	return
+    }
+}
+
+# If this target's linker does not support the --gc-sections flag,
+# skip this test.
+
+proc dg-require-gc-sections { args } {
+    if { ![ check_gc_sections_available ] } {
+	upvar dg-do-what dg-do-what
+	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+	return
+    }
+}
+
+# If this target does not support profiling, skip this test.
+
+proc dg-require-profiling { args } {
+    if { ![ check_profiling_available ${args} ] } {
+	upvar dg-do-what dg-do-what
+	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+	return
+    }
+}
+
+# If this target does not support DLL attributes skip this test.
+
+proc dg-require-dll { args } { 
+    global target_triplet
+    # As a special case, the mcore-*-elf supports dllimport/dllexport.
+    if { [string match "mcore-*-elf" $target_triplet] } {
+	return
+    }
+    # PE/COFF targets support dllimport/dllexport.
+    if { [gcc_target_object_format] == "pe" } {
+	return
+    }
+
+    upvar dg-do-what dg-do-what
+    set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+}
+
+# If this target does not support named sections skip this test.
+
+proc dg-require-named-sections { args } {
+   upvar name name
+
+   if { ![ check_named_sections_available ] } {
+       upvar dg-do-what dg-do-what
+       set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+   }
+}
+
+# If the target does not match the required effective target, skip this test.
+
+proc dg-require-effective-target { args } {
+    set args [lreplace $args 0 0]
+    if { ![is-effective-target [lindex $args 0]] } {
+	upvar dg-do-what dg-do-what
+        set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+    }
+}
+
+# Check the flags with which the test will be run against options in
+# a test directive that will skip or xfail that test.  The DejaGnu proc
+# check_conditional_xfail will look at the options in compiler_flags, so
+# set that up for this test based on flags we know about.
+
+proc check_test_flags { args } {
+    global compiler_flags
+    upvar 2 dg-extra-tool-flags extra_tool_flags
+
+    # Pull the args out of the enclosing list.
+    set args [lindex $args 0]
+
+    # Start the list with a dummy tool name so the list will match "*"
+    # if there are no flags.
+    set compiler_flags " toolname "
+    append compiler_flags $extra_tool_flags
+    set dest [target_info name]
+    if [board_info $dest exists multilib_flags] {
+	append compiler_flags "[board_info $dest multilib_flags] "
+    }
+
+    set answer [check_conditional_xfail $args]
+
+    # Any value in this variable originally was left over from an earlier test.
+    set compiler_flags ""
+
+    verbose "check_test_flags: $args $answer" 2
+    return $answer
+}
+
+# Skip the test (report it as UNSUPPORTED) if the target list and
+# included flags are matched and the excluded flags are not matched.
+#
+# The first argument is the line number of the dg-skip-if directive
+# within the test file.   Remaining arguments are as for xfail lists:
+# message { targets } { include } { exclude }
+#
+# This tests against multilib flags plus either the default flags for this
+# group of tests or flags specified with a previous dg-options command.
+
+proc dg-skip-if { args } {
+    set args [lreplace $args 0 0]
+
+    set selector [list target [lindex $args 1]]
+    if { [dg-process-target $selector] == "S" } {
+	# The target list matched; now check the flags.  The DejaGnu proc
+	# check_conditional_xfail will look at the options in compiler_flags,
+	# so set that up for this test based on flags we know about.  Start
+	# the list with a dummy tool name so the list will match "*" if
+	# there are no flags.
+
+	global compiler_flags
+	upvar dg-extra-tool-flags extra_tool_flags
+
+	set compiler_flags " toolname "
+	append compiler_flags $extra_tool_flags
+	set dest [target_info name]
+	if [board_info $dest exists multilib_flags] {
+	    append compiler_flags "[board_info $dest multilib_flags] "
+	}
+
+	# The target list might be an effective-target keyword, so replace
+	# the original list with "*-*-*".
+	if [check_conditional_xfail [lreplace $args 1 1 "*-*-*"]] {
+	    upvar dg-do-what dg-do-what
+            set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+	}
+
+	# Any value in this variable was left over from an earlier test.
+	set compiler_flags ""
+    }
+}
+
+# Like check_conditional_xfail, but callable from a dg test.
+
+proc dg-xfail-if { args } {
+    # Don't change anything if we're already skipping the test.
+    upvar dg-do-what dg-do-what
+    if { [lindex ${dg-do-what} 1] == "N" } {
+      return
+    }
+
+    set args [lreplace $args 0 0]
+    set selector [list target [lindex $args 1]]
+    if { [dg-process-target $selector] == "S" } {
+	global compiler_conditional_xfail_data
+	set compiler_conditional_xfail_data [lreplace $args 1 1 "*-*-*"]
+    }
+}
+
+# Intercept the call to the DejaGnu version of dg-process-target to
+# support use of an effective-target keyword in place of a list of
+# target triplets to xfail or skip a test.
+#
+# selector is one of:
+#    xfail target-triplet-1 ...
+#    xfail effective-target-keyword
+#    xfail selector-expression
+#    target target-triplet-1 ...
+#    target effective-target-keyword
+#    target selector-expression
+#
+# For a target list the result is "S" if the target is selected, "N" otherwise.
+# For an xfail list the result is "F" if the target is affected, "P" otherwise.
+#
+# A selector expression appears within curly braces and uses a single logical
+# operator: !, &&, or ||.  An operand is another selector expression, an
+# effective-target keyword, or a list of target triplets within quotes or
+# curly braces.
+
+if { [info procs saved-dg-process-target] == [list] } {
+    rename dg-process-target saved-dg-process-target
+
+    # Evaluate an operand within a selector expression.
+    proc selector_opd { op } {
+	set selector "target"
+	lappend selector $op
+	set answer [ expr { [dg-process-target $selector] == "S" } ]
+	verbose "selector_opd: `$op' $answer" 2
+	return $answer
+    }
+
+    # Evaluate a target triplet list within a selector expression.
+    # Unlike other operands, this needs to be expanded from a list to
+    # the same string as "target".
+    proc selector_list { op } {
+	set selector "target [join $op]"
+	set answer [ expr { [dg-process-target $selector] == "S" } ]
+	verbose "selector_list: `$op' $answer" 2
+	return $answer
+    }
+
+    # Evaluate a selector expression.
+    proc selector_expression { exp } {
+	if { [llength $exp] == 2 } {
+	    if [string match "!" [lindex $exp 0]] {
+		set op1 [lindex $exp 1]
+		set answer [expr { ! [selector_opd $op1] }]
+	    } else {
+		# Assume it's a list of target triplets.
+		set answer [selector_list $exp]
+	    }
+	} elseif { [llength $exp] == 3 } {
+	    set op1 [lindex $exp 0]
+	    set opr [lindex $exp 1]
+	    set op2 [lindex $exp 2]
+	    if [string match "&&" $opr] {
+		set answer [expr { [selector_opd $op1] && [selector_opd $op2] }]
+	    } elseif [string match "||" $opr] {
+		set answer [expr { [selector_opd $op1] || [selector_opd $op2] }]
+	    } else {
+		# Assume it's a list of target triplets.
+		set answer [selector_list $exp]
+	    }
+	} else {
+	    # Assume it's a list of target triplets.
+	    set answer [selector_list $exp]
+	}
+
+	verbose "selector_expression: `$exp' $answer" 2
+	return $answer
+    }
+
+    proc dg-process-target { args } {
+	verbose "replacement dg-process-target: `$args'" 2
+	
+	# Extract the 'what' keyword from the argument list.
+	set selector [string trim [lindex $args 0]]
+	if [regexp "^xfail " $selector] {
+	    set what "xfail"
+	} elseif [regexp "^target " $selector] {
+	    set what "target"
+	} else {
+	    error "syntax error in target selector \"$selector\""
+	}
+
+	# Extract the rest of the list, which might be a keyword.
+	regsub "^${what}" $selector "" rest
+	set rest [string trim $rest]
+
+	if [is-effective-target-keyword $rest] {
+	    # The selector is an effective target keyword.
+	    if [is-effective-target $rest] {
+		return [expr { $what == "xfail" ? "F" : "S" }]
+	    } else {
+		return [expr { $what == "xfail" ? "P" : "N" }]
+	    }
+	}
+
+	if [string match "{*}" $rest] {
+	    if [selector_expression [lindex $rest 0]] {
+		return [expr { $what == "xfail" ? "F" : "S" }]
+	    } else {
+		return [expr { $what == "xfail" ? "P" : "N" }]
+	    }
+	}
+
+	# The selector is not an effective-target keyword, so process
+	# the list of target triplets.
+	return [saved-dg-process-target $selector]
+    }
+}
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index ae3197da575..a2dde90e381 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -19,6 +19,47 @@
 
 # This file defines procs for determining features supported by the target.
 
+# Try to compile some code and return the messages printed by the compiler.
+#
+# BASENAME is a basename to use for temporary files.
+# TYPE is the type of compilation to perform (see target_compile).
+# CONTENTS gives the contents of the input file.
+# The rest is optional:
+# OPTIONS: additional compiler options to use.
+proc get_compiler_messages {basename type contents args} {
+    global tool
+
+    if { [llength $args] > 0 } {
+	set options "additional_flags=[lindex $args 0]"
+    } else {
+	set options ""
+    }
+
+    set src ${basename}[pid].c
+    switch $type {
+	assembly { set output ${basename}[pid].s }
+	object { set output ${basename}[pid].o }
+    }
+    set f [open $src "w"]
+    puts $f $contents
+    close $f
+    set lines [${tool}_target_compile $src $output $type "$options"]
+    file delete $src
+    remote_file build delete $output
+
+    return $lines
+}
+
+proc current_target_name { } {
+    global target_info
+    if [info exists target_info(target,name)] {
+	set answer $target_info(target,name)
+    } else {
+	set answer ""
+    }
+    return $answer
+}
+
 ###############################
 # proc check_weak_available { }
 ###############################
@@ -289,3 +330,161 @@ proc check_vmx_hw_available { } {
 
     return $vmx_hw_available_saved
 }
+
+# Return 1 if -fpic and -fPIC are supported, as in no warnings or errors
+# emitted, 0 otherwise.  Whether a shared library can actually be built is
+# out of scope for this test.
+#
+# When the target name changes, replace the cached result.
+
+proc check_effective_target_fpic { } {
+    global et_fpic_saved
+    global et_fpic_target_name
+
+    if { ![info exists et_fpic_target_name] } {
+	set et_fpic_target_name ""
+    }
+
+    # If the target has changed since we set the cached value, clear it.
+    set current_target [current_target_name]
+    if { $current_target != $et_fpic_target_name } {
+	verbose "check_effective_target_fpic: `$et_fpic_target_name'" 2
+	set et_fpic_target_name $current_target
+	if [info exists et_fpic_saved] {
+	    verbose "check_effective_target_fpic: removing cached result" 2
+	    unset et_fpic_saved
+	}
+    }
+
+    if [info exists et_fpic_saved] {
+	verbose "check_effective_target_fpic: using cached result" 2
+    } else {
+	verbose "check_effective_target_fpic: compiling source" 2
+
+	# Note that M68K has a multilib that supports -fpic but not
+	# -fPIC, so we need to check both.  We test with a program that
+	# requires GOT references.
+	set et_fpic_saved [string match "" [get_compiler_messages fpic object {
+	    extern int foo (void); extern int bar;
+	    int baz (void) { return foo () + bar; }
+	} "-fpic"]]
+
+	if { $et_fpic_saved != 0 } {
+	    set et_fpic_saved [string match "" [get_compiler_messages fpic object {
+		extern int foo (void); extern int bar;
+		int baz (void) { return foo () + bar; }
+	    } "-fPIC"]]
+	}
+    }
+    verbose "check_effective_target_fpic: returning $et_fpic_saved" 2
+    return $et_fpic_saved
+}
+
+# Return 1 if we're generating 32-bit code using default options, 0
+# otherwise.
+#
+# When the target name changes, replace the cached result.
+
+proc check_effective_target_ilp32 { } {
+    global et_ilp32_saved
+    global et_ilp32_target_name
+
+    if { ![info exists et_ilp32_target_name] } {
+	set et_ilp32_target_name ""
+    }
+
+    # If the target has changed since we set the cached value, clear it.
+    set current_target [current_target_name]
+    if { $current_target != $et_ilp32_target_name } {
+	verbose "check_effective_target_ilp32: `$et_ilp32_target_name' `$current_target'" 2
+	set et_ilp32_target_name $current_target
+	if { [info exists et_ilp32_saved] } {
+	    verbose "check_effective_target_ilp32: removing cached result" 2
+	    unset et_ilp32_saved
+	}
+    }
+
+    if [info exists et_ilp32_saved] {
+	verbose "check-effective_target_ilp32: using cached result" 2
+    } else {
+	verbose "check_effective_target_ilp32: compiling source" 2
+	set et_ilp32_saved [string match "" [get_compiler_messages ilp32 object {
+	    int dummy[(sizeof (int) == 4 && sizeof (void *) == 4 && sizeof (long) == 4 ) ? 1 : -1];
+	}]]
+    }
+    verbose "check_effective_target_ilp32: returning $et_ilp32_saved" 2
+    return $et_ilp32_saved
+}
+
+# Return 1 if we're generating 64-bit code using default options, 0
+# otherwise.
+#
+# When the target name changes, replace the cached result.
+
+proc check_effective_target_lp64 { } {
+    global et_lp64_saved
+    global et_lp64_target_name
+
+    if { ![info exists et_lp64_target_name] } {
+	set et_lp64_target_name ""
+    }
+
+    # If the target has changed since we set the cached value, clear it.
+    set current_target [current_target_name]
+    if { $current_target != $et_lp64_target_name } {
+	verbose "check_effective_target_lp64: `$et_lp64_target_name' `$current_target'" 2
+	set et_lp64_target_name $current_target
+	if [info exists et_lp64_saved] {
+	    verbose "check_effective_target_lp64: removing cached result" 2
+	    unset et_lp64_saved
+	}
+    }
+
+    if [info exists et_lp64_saved] {
+	verbose "check_effective_target_lp64: using cached result" 2
+    } else {
+	verbose "check_effective_target_lp64: compiling source" 2
+	set et_lp64_saved [string match "" [get_compiler_messages lp64 object {
+	    int dummy[(sizeof (int) == 4 && sizeof (void *) == 8 && sizeof (long) == 8 ) ? 1 : -1];
+	}]]
+    }
+    verbose "check_effective_target_lp64: returning $et_lp64_saved" 2
+    return $et_lp64_saved
+}
+
+# Return 1 if the target matches the effective target 'arg', 0 otherwise.
+# This can be used with any check_* proc that takes no argument and
+# returns only 1 or 0.  It could be used with check_* procs that take
+# arguments with keywords that pass particular arguments.
+
+proc is-effective-target { arg } {
+    set selected 0
+    if { [info procs check_effective_target_${arg}] != [list] } {
+	set selected [check_effective_target_${arg}]
+    } else {
+	switch $arg {
+	  "vmx_hw"         { set selected [check_vmx_hw_available] }
+	  "named_sections" { set selected [check_named_sections_available] }
+	  "gc_sections"    { set selected [check_gc_sections_available] }
+	  default          { error "unknown effective target keyword `$arg'" }
+	}
+    }
+    verbose "is-effective-target: $arg $selected" 2
+    return $selected
+}
+
+# Return 1 if the argument is an effective-target keyword, 0 otherwise.
+
+proc is-effective-target-keyword { arg } {
+    if { [info procs check_effective_target_${arg}] != [list] } {
+	return 1
+    } else {
+	# These have different names for their check_* procs.
+	switch $arg {
+	  "vmx_hw"         { return 1 }
+	  "named_sections" { return 1 }
+	  "gc_sections"    { return 1 }
+	  default          { return 0 }
+	}
+    }
+}
diff --git a/gcc/testsuite/treelang/ChangeLog b/gcc/testsuite/treelang/ChangeLog
index fc46c4576e0..f2d716347cd 100644
--- a/gcc/testsuite/treelang/ChangeLog
+++ b/gcc/testsuite/treelang/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/tree.c b/gcc/tree.c
index 067af0c1ca1..0b258375058 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -3422,10 +3422,8 @@ simple_cst_equal (tree t1, tree t2)
 			 TREE_STRING_LENGTH (t1)));
 
     case CONSTRUCTOR:
-      if (CONSTRUCTOR_ELTS (t1) == CONSTRUCTOR_ELTS (t2))
-	return 1;
-      else
-	abort ();
+      return simple_cst_list_equal (CONSTRUCTOR_ELTS (t1),
+				    CONSTRUCTOR_ELTS (t2));
 
     case SAVE_EXPR:
       return simple_cst_equal (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0));
diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index 5eef15dc87d..d8006fb9457 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/version.c b/gcc/version.c
index cfacb866564..acfae688100 100644
--- a/gcc/version.c
+++ b/gcc/version.c
@@ -5,7 +5,7 @@
    please modify this string to indicate that, e.g. by putting your
    organization's name in parentheses at the end of the string.  */
 
-const char version_string[] = "3.4.5 20051201 (Red Hat 3.4.5-1)";
+const char version_string[] = "3.4.6 20060404 (Red Hat 3.4.6-1)";
 
 /* This is the location of the online document giving instructions for
    reporting bugs.  If you distribute a modified version of GCC,
diff --git a/include/ChangeLog b/include/ChangeLog
index 3662517c69d..5c5af5b291d 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,21 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2006-02-06  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	Backport:
+	2006-01-18  DJ Delorie  <dj@redhat.com>
+
+	* md5.h: Include ansidecl.h
+	
+	2005-07-03  Steve Ellcey  <sje@cup.hp.com>
+
+	PR other/13906
+	* ansidecl.h (ATTRIBUTE_ALIGNED_ALIGNOF): New.
+	* md5.h (md5_uintptr): New.
+	(md5_ctx): Align buffer field.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/include/ansidecl.h b/include/ansidecl.h
index d2c87768ce2..ee0aecf22de 100644
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -305,6 +305,15 @@ So instead we use the macro below and test it against specific values.  */
 # define ATTRIBUTE_NULL_PRINTF_5 ATTRIBUTE_NULL_PRINTF(5, 6)
 #endif /* ATTRIBUTE_NULL_PRINTF */
 
+
+#ifndef ATTRIBUTE_ALIGNED_ALIGNOF
+# if (GCC_VERSION >= 3000)
+#  define ATTRIBUTE_ALIGNED_ALIGNOF(m) __attribute__ ((__aligned__ (__alignof__ (m))))
+# else
+#  define ATTRIBUTE_ALIGNED_ALIGNOF(m)
+# endif /* GNUC >= 3.0 */
+#endif /* ATTRIBUTE_ALIGNED_ALIGNOF */
+
 /* We use __extension__ in some places to suppress -pedantic warnings
    about GCC extensions.  This feature didn't work properly before
    gcc 2.8.  */
diff --git a/include/md5.h b/include/md5.h
index ad51f19877a..4d6161c3236 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -27,6 +27,8 @@
 # include <limits.h>
 #endif
 
+#include "ansidecl.h"
+
 /* The following contortions are an attempt to use the C preprocessor
    to determine an unsigned integral type that is 32 bits wide.  An
    alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
@@ -37,6 +39,7 @@
 #ifdef _LIBC
 # include <sys/types.h>
 typedef u_int32_t md5_uint32;
+typedef uintptr_t md5_uintptr;
 #else
 #  define INT_MAX_32_BITS 2147483647
 
@@ -64,6 +67,9 @@ typedef u_int32_t md5_uint32;
 #   endif
 #  endif
 # endif
+/* We have to make a guess about the integer type equivalent in size
+   to pointers which should always be correct.  */
+typedef unsigned long int md5_uintptr;
 #endif
 
 #undef __P
@@ -83,7 +89,7 @@ struct md5_ctx
 
   md5_uint32 total[2];
   md5_uint32 buflen;
-  char buffer[128];
+  char buffer[128] ATTRIBUTE_ALIGNED_ALIGNOF(md5_uint32);
 };
 
 /*
diff --git a/intl/ChangeLog b/intl/ChangeLog
index 4e43001c440..b1cc06165cc 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 399fdfca211..e5f5c08c9ca 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index fd83d690fda..974efb9fe84 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 721c93db166..5dc546ef180 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,23 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2006-02-16  Roger Sayle  <roger@eyesopen.com>
+	    R. Scott Bailey  <scott.bailey@eds.com>
+	    Bill Northcott  <w.northcott@unsw.edu.au>
+
+	PR bootstrap/16787
+	* floatformat.c: Include <float.h> where available.
+	(NAN): Use value of DBL_QNAN if defined, and NAN isn't.
+
+2006-02-06  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	Backport:
+	2005-07-03  Steve Ellcey  <sje@cup.hp.com>
+
+	PR other/13906
+	* md5.c (md5_process_bytes): Check alignment.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libiberty/floatformat.c b/libiberty/floatformat.c
index a0f65354e48..273edd750a9 100644
--- a/libiberty/floatformat.c
+++ b/libiberty/floatformat.c
@@ -1,5 +1,6 @@
 /* IEEE floating point support routines, for GDB, the GNU Debugger.
-   Copyright (C) 1991, 1994, 1999, 2000, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1994, 1999, 2000, 2003, 2006
+   Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -30,6 +31,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <string.h>
 #endif
 
+/* On some platforms, <float.h> provides DBL_QNAN.  */
+#ifdef STDC_HEADERS
+#include <float.h>
+#endif
+
 #include "ansidecl.h"
 #include "libiberty.h"
 #include "floatformat.h"
@@ -43,8 +49,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #endif
 
 #ifndef NAN
+#ifdef DBL_QNAN
+#define NAN DBL_QNAN
+#else
 #define NAN (0.0 / 0.0)
 #endif
+#endif
 
 static unsigned long get_field PARAMS ((const unsigned char *,
 					enum floatformat_byteorders,
diff --git a/libiberty/md5.c b/libiberty/md5.c
index e458f2a6a64..7a202d8c123 100644
--- a/libiberty/md5.c
+++ b/libiberty/md5.c
@@ -236,6 +236,23 @@ md5_process_bytes (buffer, len, ctx)
   /* Process available complete blocks.  */
   if (len > 64)
     {
+#if !_STRING_ARCH_unaligned
+/* To check alignment gcc has an appropriate operator.  Other
+   compilers don't.  */
+# if __GNUC__ >= 2
+#  define UNALIGNED_P(p) (((md5_uintptr) p) % __alignof__ (md5_uint32) != 0)
+# else
+#  define UNALIGNED_P(p) (((md5_uintptr) p) % sizeof (md5_uint32) != 0)
+# endif
+      if (UNALIGNED_P (buffer))
+        while (len > 64)
+          {
+            md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+            buffer = (const char *) buffer + 64;
+            len -= 64;
+          }
+      else
+#endif
       md5_process_block (buffer, len & ~63, ctx);
       buffer = (const void *) ((const char *) buffer + (len & ~63));
       len &= 63;
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5ff74bb9817..1bfae720f9d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2006-01-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR libgcj/25840
+	* include/x86_64-signal.h (RESTORE2): Add ".text\n".
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
index ab59e5e69bc..f9c8e23913b 100644
--- a/libjava/include/x86_64-signal.h
+++ b/libjava/include/x86_64-signal.h
@@ -50,6 +50,7 @@ while (0)
 #define RESTORE2(name, syscall)			\
 asm						\
   (						\
+   ".text\n"					\
    ".byte 0  # Yes, this really is necessary\n" \
    ".align 16\n"				\
    "__" #name ":\n"				\
diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog
index 9a28a5a3e0c..54215bffd85 100644
--- a/libjava/libltdl/ChangeLog
+++ b/libjava/libltdl/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 072e3852900..b2abb18c627 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index c2cc0612385..6d48e8a7914 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
+2005-12-15  David Ayers  <d.ayers@inode.at>
+
+	PR libobjc/14382
+	* README (+load,+initialize): Fix documentation to reflect
+	intended and implemented semantics for +load and +initialize.
+	
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libobjc/README b/libobjc/README
index f478d67dec8..093116fd594 100644
--- a/libobjc/README
+++ b/libobjc/README
@@ -39,19 +39,26 @@ adopts it -- it is not enough to inherit them.  The flag
 `-Wprotocols' is the default which requires them defined.
 
 
++load
+===========
+This method, if defined, is called for each class and category
+implementation when the class is loaded into the runtime.  This method
+is not inherited, and is thus not called for a subclass that doesn't
+define it itself.  Thus, each +load method is called exactly once by
+the runtime.  The runtime invocation of this method is thread safe.
+
+
 +initialize 
 ===========
 
 This method, if defined, is called before any other instance or class
-methods of that particular class.  This method is not inherited, and
-is thus not called as initializer for a subclass that doesn't define
-it itself.  Thus, each +initialize method is called exactly once (or
-never if no methods of that particular class is never called).
-Besides this, it is allowed to have several +initialize methods, one
-for each category.  The order in which these (multiple methods) are
-called is not well defined.  I am not completely certain what the
-semantics of this method is for other implementations, but this is
-how it works for GNU Objective C.
+methods of that particular class.  For the GNU runtime, this method is 
+not inherited, and is thus not called as initializer for a subclass that 
+doesn't define it itself.  Thus, each +initialize method is called exactly 
+once by the runtime (or never if no methods of that particular class is 
+never called).  It is wise to guard against multiple invocations anyway 
+to remain portable with the NeXT runtime.  The runtime invocation of 
+this method is thread safe.
 
 
 Passivation/Activation/Typedstreams
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 67e356f372d..ac8c282f3c3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 80b79248485..15e4b28d7e2 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -35,7 +35,7 @@
 #include <bits/os_defines.h>
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20051201
+#define __GLIBCXX__ 20060311
 
 // Allow use of "export template." This is currently not a feature
 // that g++ supports.
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 52cf2fc108d..4d2d8054271 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/zlib/ChangeLog b/zlib/ChangeLog
index ae7e0a9d552..680e4e74f42 100644
--- a/zlib/ChangeLog
+++ b/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Release Manager
+
+	* GCC 3.4.6 released.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.