svn merge -r109401:109815 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_1-branch

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

1870 files changed, 4866 insertions, 19196 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a2d6ccc1be7..8ead73ff512 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -327,6 +327,7 @@ Richard Stallman				rms@gnu.org
 Graham Stott					graham.stott@btinternet.com
 Mike Stump					mrs@apple.com
 Jeff Sturm					jsturm@gcc.gnu.org
+Paul Thomas					pault@gcc.gnu.org
 Kresten Krab Thorup				krab@gcc.gnu.org
 Caroline Tice					ctice@apple.com
 Michael Tiemann					tiemann@redhat.com
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af92ee59bd1..961a780a032 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,106 @@
+2006-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/25682
+	* c-typeck.c (build_unary_op): Fold offsetof-like expressions
+	even when the pointer is not NULL.
+
+2006-01-16  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* pa.md: Disparage copies between general and floating-point registers
+	in 32-bit move patterns.
+
+2006-01-16  Steven Bosscher  <stevenb.gcc@gmail.com>
+	Richard Guenther  <rguenther@suse.de>
+
+	PR rtl-optimization/24257
+	* gcse.c (find_moveable_store): Only consider a store movable
+	when the SET_SRC of the insn can be assigned to a register.
+
+2006-01-15  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR target/25168
+	* tree.c (get_file_function_name_long): Concatenate the first global
+	object name with a string derived from the input filename of the object
+	for type "F".
+
+2006-01-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR tree-opt/24365
+	* tree-inline.c (declare_return_variable): If the return variable
+	was marked as a non gimple complex, set the return slot variable
+	to be a non gimple comple variable.
+
+2006-01-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR tree-optimization/23109
+	PR tree-optimization/23948
+	PR tree-optimization/24123
+
+	* Makefile.in (tree-ssa-math-opts.o): Adjust dependencies.
+        * tree-cfg.c (single_noncomplex_succ): New.
+        * tree-flow.h (single_noncomplex_succ): Declare it.
+        * tree-ssa-math-opts.c (enum place_reciprocal): Remove.
+        * tree-ssa-math-opts.c (enum place_reciprocal): Remove.
+        (struct occurrence, occ_head, occ_pool, is_divide_by, compute_merit,
+	insert_bb, register_division_in, insert_reciprocals,
+	replace_reciprocal, free_bb): New.
+        (execute_cse_reciprocals_1): Rewritten.
+        (execute_cse_reciprocals): Adjust calls to execute_cse_reciprocals_1.
+        Do not commit any edge insertion.  Always compute dominators and
+        create the allocation pool.
+        * target-def.h (TARGET_MIN_DIVISIONS_FOR_RECIP_MUL): New.
+	* target.h (struct gcc_target): Add min_divistions_for_recip_mul.
+	* targhooks.c (default_min_divistions_for_recip_mul): New.
+	* targhooks.h (default_min_divistions_for_recip_mul): New prototype.
+        * passes.c (init_optimization_passes): Run recip after tree loop
+        optimizations.
+        * doc/tm.texi (Misc): Document TARGET_MIN_DIVISIONS_FOR_RECIP_MUL.
+
+2006-01-11  Jan Hubicka  <jh@suse.cz>
+
+	PR target/25042
+	* i386.c (ix86_init_mmx_sse_builtins): Do not delcare float128
+
+2006-01-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR target/20754
+	* config/pa/pa.md: Create separate 32 and 64-bit move patterns
+	for SI, DI, SF and DF modes.  Add alternatives to copy between
+	general and floating point registers to the 32-bit patterns.
+	* config/pa/pa-64.h (SECONDARY_MEMORY_NEEDED_RTX): Delete undefine.
+	* config/pa/pa.h (SECONDARY_MEMORY_NEEDED_RTX): Delete define.
+	(SECONDARY_MEMORY_NEEDED): Secondary memory is only needed when
+	generating 64-bit code.
+	* config/pa/pa.c (output_move_double): Handle copies between general
+	and floating registers.
+
+2006-01-10  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR rtl-optimization/25367
+	* config/sparc/sparc.h (HARD_REGNO_RENAME_OK): New macro.
+
+2006-01-10  Jan Beulich  <jbeulich@novell.com>
+
+	* config/i386/netware.h (TARGET_SUBTARGET_DEFAULT): Include
+	MASK_ALIGN_DOUBLE.
+	* config/i386/nwld.h (LINK_SPEC): Add --extensions:GNU option.
+	* config/i386/t-nwld (SHLIB_LINK): Insert spaces between expr
+	arguments.
+
+2006-01-09  Kazu Hirata  <kazu@codesourcery.com>
+
+	PR tree-optimization/25125
+	* convert.c (convert_to_integer): Don't narrow the type of a
+	PLUX_EXPR or MINUS_EXPR if !flag_wrapv and the unwidened type
+	is signed.
+
+2006-01-08  Ian Lance Taylor  <ian@airs.com>
+            David Edelsohn  <edelsohn@gnu.org>
+
+        PR rtl-optimization/25662
+        * optabs.c (simplify_expand_binop): Use simplify_binary_operation
+        for constant operands instead of simplify_gen_binary.
+
 2006-01-05  Richard Henderson  <rth@redhat.com>
 
 	* c-parser.c (c_parser_objc_methodprotolist): Handle CPP_PRAGMA.
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 52fbab8e71d..5abc0afa085 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20060106
+20060117
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index c43bec328f9..4e097ee1421 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1927,7 +1927,8 @@ tree-ssa-loop-im.o : tree-ssa-loop-im.c $(TREE_FLOW_H) $(CONFIG_H) \
    $(TREE_DUMP_H) tree-pass.h $(FLAGS_H) real.h $(BASIC_BLOCK_H) \
    hard-reg-set.h
 tree-ssa-math-opts.o : tree-ssa-math-opts.c $(TREE_FLOW_H) $(CONFIG_H) \
-   $(SYSTEM_H) $(TREE_H) $(TIMEVAR_H) tree-pass.h $(TM_H) $(FLAGS_H)
+   $(SYSTEM_H) $(TREE_H) $(TIMEVAR_H) tree-pass.h $(TM_H) $(FLAGS_H) \
+   alloc-pool.h $(BASIC_BLOCK_H) $(TARGET_H)
 tree-ssa-alias.o : tree-ssa-alias.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
    $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) $(TREE_INLINE_H) $(FLAGS_H) \
    function.h $(TIMEVAR_H) convert.h $(TM_H) coretypes.h langhooks.h \
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index c086724b442..02d97b43f96 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -2926,8 +2926,13 @@ build_unary_op (enum tree_code code, tree xarg, int flag)
 	 when we have proper support for integer constant expressions.  */
       val = get_base_address (arg);
       if (val && TREE_CODE (val) == INDIRECT_REF
-	  && integer_zerop (TREE_OPERAND (val, 0)))
-	return fold_convert (argtype, fold_offsetof (arg));
+          && TREE_CONSTANT (TREE_OPERAND (val, 0)))
+	{
+	  tree op0 = fold_convert (argtype, fold_offsetof (arg)), op1;
+
+	  op1 = fold_convert (argtype, TREE_OPERAND (val, 0));
+	  return fold_build2 (PLUS_EXPR, argtype, op0, op1);
+	}
 
       val = build1 (ADDR_EXPR, argtype, arg);
 
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 63770aab407..f0ee6120143 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -14571,10 +14571,13 @@ ix86_init_mmx_sse_builtins (void)
       (*lang_hooks.types.register_builtin_type) (float80_type, "__float80");
     }
 
-  float128_type = make_node (REAL_TYPE);
-  TYPE_PRECISION (float128_type) = 128;
-  layout_type (float128_type);
-  (*lang_hooks.types.register_builtin_type) (float128_type, "__float128");
+  if (TARGET_64BIT)
+    {
+      float128_type = make_node (REAL_TYPE);
+      TYPE_PRECISION (float128_type) = 128;
+      layout_type (float128_type);
+      (*lang_hooks.types.register_builtin_type) (float128_type, "__float128");
+    }
 
   /* Add all builtins that are more or less simple operations on two
      operands.  */
diff --git a/gcc/config/i386/netware.h b/gcc/config/i386/netware.h
index 197bdc5a6a2..3630765c7aa 100644
--- a/gcc/config/i386/netware.h
+++ b/gcc/config/i386/netware.h
@@ -71,7 +71,7 @@ Boston, MA 02110-1301, USA.  */
    returns float values in the 387, and uses MSVC bit field layout. */
 #undef TARGET_SUBTARGET_DEFAULT
 #define TARGET_SUBTARGET_DEFAULT (MASK_80387 | MASK_IEEE_FP | \
-	MASK_FLOAT_RETURNS | MASK_MS_BITFIELD_LAYOUT)
+	MASK_FLOAT_RETURNS | MASK_ALIGN_DOUBLE | MASK_MS_BITFIELD_LAYOUT)
 
 #undef MATH_LIBRARY
 #define MATH_LIBRARY ""
diff --git a/gcc/config/i386/nwld.h b/gcc/config/i386/nwld.h
index 7585f86974e..fe132afbf84 100644
--- a/gcc/config/i386/nwld.h
+++ b/gcc/config/i386/nwld.h
@@ -31,7 +31,8 @@ Boston, MA 02110-1301, USA.  */
 #define LINKER_NAME "nwld"
 
 #undef  LINK_SPEC
-#define LINK_SPEC "--format nlm %{static:%{!nostdlib:%{!nodefaultlib:%eStatic linking is not supported.\n}}}"
+#define LINK_SPEC "--format:NLM --extensions:GNU" \
+	" %{static:%{!nostdlib:%{!nodefaultlib:%eStatic linking is not supported.\n}}}"
 
 #undef  LINK_GCC_C_SEQUENCE_SPEC
 #define LINK_GCC_C_SEQUENCE_SPEC "%L %G"
diff --git a/gcc/config/i386/t-nwld b/gcc/config/i386/t-nwld
index fbca0dfe933..6f6905541ec 100644
--- a/gcc/config/i386/t-nwld
+++ b/gcc/config/i386/t-nwld
@@ -40,7 +40,7 @@ SHLIB_LINK = set -e; \
 	echo "name $(SHLIB_NAME)" >>@shlib_base_name@.def; \
 	echo "version $(version)" | sed "s!\.!,!g" >>@shlib_base_name@.def; \
 	touch libgcc/build; \
-	echo "build $$$$(expr $$$$(<libgcc/build)+0)" >>@shlib_base_name@.def; \
+	echo "build $$$$(expr $$$$(<libgcc/build) + 0)" >>@shlib_base_name@.def; \
 	echo "export @$(SHLIB_MAP)" >>@shlib_base_name@.def; \
 	if mpkxdc -n -p @shlib_base_name@.xdc; \
 		then echo "xdcdata @shlib_base_name@.xdc" >>@shlib_base_name@.def; \
@@ -51,7 +51,7 @@ SHLIB_LINK = set -e; \
 		-Wl,--Map,--map-info,full,--strip-all,--def-file,@shlib_base_name@.def; \
 	rm -f @shlib_base_name@.imp; $(LN_S) $(SHLIB_MAP) @shlib_base_name@.imp; \
 	rm -f libgcc.imp; $(LN_S) @shlib_base_name@.imp libgcc.imp; \
-	expr $$$$(<libgcc/build)+1 >libgcc/build
+	expr $$$$(<libgcc/build) + 1 >libgcc/build
 
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
diff --git a/gcc/config/pa/pa-64.h b/gcc/config/pa/pa-64.h
index a59b4e04af2..750b13ca032 100644
--- a/gcc/config/pa/pa-64.h
+++ b/gcc/config/pa/pa-64.h
@@ -70,10 +70,6 @@ Boston, MA 02110-1301, USA.  */
    relocs which appear in stabs.  */
 #undef DBX_DEBUGGING_INFO
 
-/* We want the compiler to select a suitable secondary memory location.
-   ?!? This may not work reliably.  Keep an eye out for problems.  */
-#undef SECONDARY_MEMORY_NEEDED_RTX
-
 /* ?!? This needs to be made compile-time selectable.
 
    The PA64 runtime model has arguments that grow to higher addresses
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index a30a7ae3021..bf2420005ca 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -2195,6 +2195,25 @@ output_move_double (rtx *operands)
      supposed to allow to happen.  */
   gcc_assert (optype0 == REGOP || optype1 == REGOP);
 
+  /* Handle copies between general and floating registers.  */
+
+  if (optype0 == REGOP && optype1 == REGOP
+      && FP_REG_P (operands[0]) ^ FP_REG_P (operands[1]))
+    {
+      if (FP_REG_P (operands[0]))
+	{
+	  output_asm_insn ("{stws|stw} %1,-16(%%sp)", operands);
+	  output_asm_insn ("{stws|stw} %R1,-12(%%sp)", operands);
+	  return "{fldds|fldd} -16(%%sp),%0";
+	}
+      else
+	{
+	  output_asm_insn ("{fstds|fstd} %1,-16(%%sp)", operands);
+	  output_asm_insn ("{ldws|ldw} -16(%%sp),%0", operands);
+	  return "{ldws|ldw} -12(%%sp),%R0";
+	}
+    }
+
    /* Handle auto decrementing and incrementing loads and stores
      specifically, since the structure of the function doesn't work
      for them without major modification.  Do it better when we learn
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index b83630fba32..3db2d33a0cf 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -541,14 +541,15 @@ extern struct rtx_def *hppa_pic_save_rtx (void);
   reg_classes_intersect_p ((CLASS), FP_REGS)
 
 /* On the PA it is not possible to directly move data between
-   GENERAL_REGS and FP_REGS.  */
-#define SECONDARY_MEMORY_NEEDED(CLASS1, CLASS2, MODE)		\
-  (MAYBE_FP_REG_CLASS_P (CLASS1) != FP_REG_CLASS_P (CLASS2)	\
-   || MAYBE_FP_REG_CLASS_P (CLASS2) != FP_REG_CLASS_P (CLASS1))
-
-/* Return the stack location to use for secondary memory needed reloads.  */
-#define SECONDARY_MEMORY_NEEDED_RTX(MODE) \
-  gen_rtx_MEM (MODE, gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (-16)))
+   GENERAL_REGS and FP_REGS.  On the 32-bit port, we use the
+   location at SP-16.  We don't expose this location in the RTL to
+   avoid scheduling related problems.  For example, the store and
+   load could be separated by a call to a pure or const function
+   which has no frame and uses SP-16.  */
+#define SECONDARY_MEMORY_NEEDED(CLASS1, CLASS2, MODE)			\
+  (TARGET_64BIT								\
+   && (MAYBE_FP_REG_CLASS_P (CLASS1) != FP_REG_CLASS_P (CLASS2)		\
+       || MAYBE_FP_REG_CLASS_P (CLASS2) != FP_REG_CLASS_P (CLASS1)))
 
 
 /* Stack layout; function entry, exit and calling.  */
diff --git a/gcc/config/pa/pa.md b/gcc/config/pa/pa.md
index 779b1d6565b..0ea6cb277bc 100644
--- a/gcc/config/pa/pa.md
+++ b/gcc/config/pa/pa.md
@@ -2290,12 +2290,41 @@
 
 (define_insn ""
   [(set (match_operand:SI 0 "move_dest_operand"
+			  "=r,r,r,r,r,r,Q,!*q,!r,!*f,*f,T,!r,!f")
+	(match_operand:SI 1 "move_src_operand"
+			  "A,r,J,N,K,RQ,rM,!rM,!*q,!*fM,RT,*f,!f,!r"))]
+  "(register_operand (operands[0], SImode)
+    || reg_or_0_operand (operands[1], SImode))
+   && !TARGET_SOFT_FLOAT
+   && !TARGET_64BIT"
+  "@
+   ldw RT'%A1,%0
+   copy %1,%0
+   ldi %1,%0
+   ldil L'%1,%0
+   {zdepi|depwi,z} %Z1,%0
+   ldw%M1 %1,%0
+   stw%M0 %r1,%0
+   mtsar %r1
+   {mfctl|mfctl,w} %%sar,%0
+   fcpy,sgl %f1,%0
+   fldw%F1 %1,%0
+   fstw%F0 %1,%0
+   {fstws|fstw} %1,-16(%%sp)\n\t{ldws|ldw} -16(%%sp),%0
+   {stws|stw} %1,-16(%%sp)\n\t{fldws|fldw} -16(%%sp),%0"
+  [(set_attr "type" "load,move,move,move,shift,load,store,move,move,fpalu,fpload,fpstore,move,move")
+   (set_attr "pa_combine_type" "addmove")
+   (set_attr "length" "4,4,4,4,4,4,4,4,4,4,4,4,8,8")])
+
+(define_insn ""
+  [(set (match_operand:SI 0 "move_dest_operand"
 			  "=r,r,r,r,r,r,Q,!*q,!r,!*f,*f,T")
 	(match_operand:SI 1 "move_src_operand"
 			  "A,r,J,N,K,RQ,rM,!rM,!*q,!*fM,RT,*f"))]
   "(register_operand (operands[0], SImode)
     || reg_or_0_operand (operands[1], SImode))
-   && !TARGET_SOFT_FLOAT"
+   && !TARGET_SOFT_FLOAT
+   && TARGET_64BIT"
   "@
    ldw RT'%A1,%0
    copy %1,%0
@@ -3822,9 +3851,9 @@
 
 (define_insn ""
   [(set (match_operand:DF 0 "move_dest_operand"
-			  "=f,*r,Q,?o,?Q,f,*r,*r")
+			  "=f,*r,Q,?o,?Q,f,*r,*r,!r,!f")
 	(match_operand:DF 1 "reg_or_0_or_nonsymb_mem_operand"
-			  "fG,*rG,f,*r,*r,RQ,o,RQ"))]
+			  "fG,*rG,f,*r,*r,RQ,o,RQ,!f,!r"))]
   "(register_operand (operands[0], DFmode)
     || reg_or_0_operand (operands[1], DFmode))
    && !(GET_CODE (operands[1]) == CONST_DOUBLE
@@ -3833,13 +3862,15 @@
    && !TARGET_SOFT_FLOAT"
   "*
 {
-  if (FP_REG_P (operands[0]) || FP_REG_P (operands[1])
-      || operands[1] == CONST0_RTX (DFmode))
+  if ((FP_REG_P (operands[0]) || FP_REG_P (operands[1])
+       || operands[1] == CONST0_RTX (DFmode))
+      && !(REG_P (operands[0]) && REG_P (operands[1])
+	   && FP_REG_P (operands[0]) ^ FP_REG_P (operands[1])))
     return output_fp_move_double (operands);
   return output_move_double (operands);
 }"
-  [(set_attr "type" "fpalu,move,fpstore,store,store,fpload,load,load")
-   (set_attr "length" "4,8,4,8,16,4,8,16")])
+  [(set_attr "type" "fpalu,move,fpstore,store,store,fpload,load,load,move,move")
+   (set_attr "length" "4,8,4,8,16,4,8,16,12,12")])
 
 (define_insn ""
   [(set (match_operand:DF 0 "indexed_memory_operand" "=R")
@@ -3994,9 +4025,9 @@
 
 (define_insn ""
   [(set (match_operand:DF 0 "move_dest_operand"
-			  "=r,?o,?Q,r,r")
+			  "=r,?o,?Q,r,r,!r,!f")
 	(match_operand:DF 1 "reg_or_0_or_nonsymb_mem_operand"
-			  "rG,r,r,o,RQ"))]
+			  "rG,r,r,o,RQ,!f,!r"))]
   "(register_operand (operands[0], DFmode)
     || reg_or_0_operand (operands[1], DFmode))
    && !TARGET_64BIT
@@ -4005,8 +4036,8 @@
 {
   return output_move_double (operands);
 }"
-  [(set_attr "type" "move,store,store,load,load")
-   (set_attr "length" "8,8,16,8,16")])
+  [(set_attr "type" "move,store,store,load,load,move,move")
+   (set_attr "length" "8,8,16,8,16,12,12")])
 
 (define_insn ""
   [(set (match_operand:DF 0 "move_dest_operand"
@@ -4116,22 +4147,25 @@
 
 (define_insn ""
   [(set (match_operand:DI 0 "move_dest_operand"
-			  "=r,o,Q,r,r,r,*f,*f,T")
+			  "=r,o,Q,r,r,r,*f,*f,T,!r,!f")
 	(match_operand:DI 1 "general_operand"
-			  "rM,r,r,o*R,Q,i,*fM,RT,*f"))]
+			  "rM,r,r,o*R,Q,i,*fM,RT,*f,!f,!r"))]
   "(register_operand (operands[0], DImode)
     || reg_or_0_operand (operands[1], DImode))
    && !TARGET_64BIT
    && !TARGET_SOFT_FLOAT"
   "*
 {
-  if (FP_REG_P (operands[0]) || FP_REG_P (operands[1])
-      || (operands[1] == CONST0_RTX (DImode)))
+  if ((FP_REG_P (operands[0]) || FP_REG_P (operands[1])
+       || operands[1] == CONST0_RTX (DFmode))
+      && !(REG_P (operands[0]) && REG_P (operands[1])
+	   && FP_REG_P (operands[0]) ^ FP_REG_P (operands[1])))
     return output_fp_move_double (operands);
   return output_move_double (operands);
 }"
-  [(set_attr "type" "move,store,store,load,load,multi,fpalu,fpload,fpstore")
-   (set_attr "length" "8,8,16,8,16,16,4,4,4")])
+  [(set_attr "type"
+    "move,store,store,load,load,multi,fpalu,fpload,fpstore,move,move")
+   (set_attr "length" "8,8,16,8,16,16,4,4,4,12,12")])
 
 (define_insn ""
   [(set (match_operand:DI 0 "move_dest_operand"
@@ -4341,12 +4375,35 @@
 
 (define_insn ""
   [(set (match_operand:SF 0 "move_dest_operand"
+			  "=f,!*r,f,*r,Q,Q,!r,!f")
+	(match_operand:SF 1 "reg_or_0_or_nonsymb_mem_operand"
+			  "fG,!*rG,RQ,RQ,f,*rG,!f,!r"))]
+  "(register_operand (operands[0], SFmode)
+    || reg_or_0_operand (operands[1], SFmode))
+   && !TARGET_SOFT_FLOAT
+   && !TARGET_64BIT"
+  "@
+   fcpy,sgl %f1,%0
+   copy %r1,%0
+   fldw%F1 %1,%0
+   ldw%M1 %1,%0
+   fstw%F0 %1,%0
+   stw%M0 %r1,%0
+   {fstws|fstw} %1,-16(%%sp)\n\t{ldws|ldw} -16(%%sp),%0
+   {stws|stw} %1,-16(%%sp)\n\t{fldws|fldw} -16(%%sp),%0"
+  [(set_attr "type" "fpalu,move,fpload,load,fpstore,store,move,move")
+   (set_attr "pa_combine_type" "addmove")
+   (set_attr "length" "4,4,4,4,4,4,8,8")])
+
+(define_insn ""
+  [(set (match_operand:SF 0 "move_dest_operand"
 			  "=f,!*r,f,*r,Q,Q")
 	(match_operand:SF 1 "reg_or_0_or_nonsymb_mem_operand"
 			  "fG,!*rG,RQ,RQ,f,*rG"))]
   "(register_operand (operands[0], SFmode)
     || reg_or_0_operand (operands[1], SFmode))
-   && !TARGET_SOFT_FLOAT"
+   && !TARGET_SOFT_FLOAT
+   && TARGET_64BIT"
   "@
    fcpy,sgl %f1,%0
    copy %r1,%0
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index a72cc90910b..bb4647c1e86 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -884,6 +884,11 @@ extern int sparc_mode_class[];
 #define HARD_REGNO_MODE_OK(REGNO, MODE) \
   ((hard_regno_mode_classes[REGNO] & sparc_mode_class[MODE]) != 0)
 
+/* Value is 1 if it is OK to rename a hard register FROM to another hard
+   register TO.  We cannot rename %g1 as it may be used before the save
+   register window instruction in the prologue.  */
+#define HARD_REGNO_RENAME_OK(FROM, TO) ((FROM) != 1)
+
 /* Value is 1 if it is a good idea to tie two pseudo registers
    when one has mode MODE1 and one has mode MODE2.
    If HARD_REGNO_MODE_OK could produce different values for MODE1 and MODE2,
diff --git a/gcc/convert.c b/gcc/convert.c
index 5680c39df20..03cc098020d 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -608,7 +608,17 @@ convert_to_integer (tree type, tree expr)
 				|| ex_form == RSHIFT_EXPR
 				|| ex_form == LROTATE_EXPR
 				|| ex_form == RROTATE_EXPR))
-			|| ex_form == LSHIFT_EXPR)
+			|| ex_form == LSHIFT_EXPR
+			/* If we have !flag_wrapv, and either ARG0 or
+			   ARG1 is of a signed type, we have to do
+			   PLUS_EXPR or MINUS_EXPR in an unsigned
+			   type.  Otherwise, we would introduce
+			   signed-overflow undefinedness.  */
+			|| (!flag_wrapv
+			    && (ex_form == PLUS_EXPR
+				|| ex_form == MINUS_EXPR)
+			    && (!TYPE_UNSIGNED (TREE_TYPE (arg0))
+				|| !TYPE_UNSIGNED (TREE_TYPE (arg1)))))
 		      typex = lang_hooks.types.unsigned_type (typex);
 		    else
 		      typex = lang_hooks.types.signed_type (typex);
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b6cb9db7aa3..96eb2128e7a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,27 @@
+2006-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/25682
+	* decl.c (compute_array_index_type): After issuing not an integral
+	constant-expression error, set size to 1 to avoid ICEs later on.
+
+2006-01-14  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/25663
+	* parser.c (cp_parser_direct_declarator): Use cp_parser_error
+	instead of error.
+
+2006-01-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/24824
+	* class.c (handle_using_decl): Pass correct scope to
+	cp_emit_debug_info_for_using.
+
+2006-01-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/25386
+	* tree.c (lvalue_p_1): Any part of a COMPONENT_REF affects
+	packedness.
+
 2005-01-04  Zdenek Dvorak <dvorakz@suse.cz>
 
 	PR c++/25632
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index edadf0f0f3a..67071dc660d 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -1159,7 +1159,7 @@ handle_using_decl (tree using_decl, tree t)
 	old_value = NULL_TREE;
     }
 
-  cp_emit_debug_info_for_using (decl, current_class_type);
+  cp_emit_debug_info_for_using (decl, USING_DECL_SCOPE (using_decl));
 
   if (is_overloaded_fn (decl))
     flist = decl;
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 3983f981367..ed03c2680f0 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6474,6 +6474,7 @@ compute_array_index_type (tree name, tree size)
 	       name);
       else
 	error ("size of array is not an integral constant-expression");
+      size = integer_one_node;
     }
   else if (pedantic)
     {
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 34f4558a113..a28a7bc0386 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -11538,7 +11538,7 @@ cp_parser_direct_declarator (cp_parser* parser,
 			 here because we do not have enough
 			 information about its original syntactic
 			 form.  */
-		      error ("invalid declarator");
+		      cp_parser_error (parser, "invalid declarator");
 		      declarator = cp_error_declarator;
 		      break;
 		    }
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 4340c69e1d3..91d68ca5d0f 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -87,9 +87,6 @@ lvalue_p_1 (tree ref,
     case COMPONENT_REF:
       op1_lvalue_kind = lvalue_p_1 (TREE_OPERAND (ref, 0),
 				    treat_class_rvalues_as_lvalues);
-      /* In an expression of the form "X.Y", the packed-ness of the
-	 expression does not depend on "X".  */
-      op1_lvalue_kind &= ~clk_packed;
       /* Look at the member designator.  */
       if (!op1_lvalue_kind
 	  /* The "field" can be a FUNCTION_DECL or an OVERLOAD in some
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 09279ec7af5..c1bbd7b84e3 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8787,6 +8787,15 @@ point number to a signed fixed point number also convert validly to an
 unsigned one.
 @end defmac
 
+@deftypefn {Target Hook} int TARGET_MIN_DIVISIONS_FOR_RECIP_MUL (enum machine_mode @var{mode})
+When @option{-ffast-math} is in effect, GCC tries to optimize
+divisions by the same divisor, by turning them into multiplications by
+the reciprocal.  This target hook specifies the minimum number of divisions
+that should be there for GCC to perform the optimization for a variable
+of mode @var{mode}.  The default implementation returns 3 if the machine
+has an instruction for the division, and 2 if it does not.
+@end deftypefn
+
 @defmac MOVE_MAX
 The maximum number of bytes that a single instruction can move quickly
 between memory and registers or between two memory locations.
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e679dc63eb4..c9e81aaec63 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,103 @@
+2006-01-14  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/22146
+	* trans-array.c (gfc_reverse_ss): Remove static attribute.
+	(gfc_walk_elemental_function_args): Replace gfc_expr * argument for
+	the function call with the corresponding gfc_actual_arglist*.  Change
+	code accordingly.
+	(gfc_walk_function_expr): Call to gfc_walk_elemental_function_args
+	now requires the actual argument list instead of the expression for
+	the function call.
+	* trans-array.h: Modify the prototype for gfc_walk_elemental_function_args
+	and provide a prototype for gfc_reverse_ss.
+	* trans-stmt.h (gfc_trans_call): Add the scalarization code for the case
+	where an elemental subroutine has array valued actual arguments.
+
+	PR fortran/25029
+	PR fortran/21256
+	PR fortran/20868
+	PR fortran/20870
+	* resolve.c (check_assumed_size_reference): New function to check for upper
+	bound in assumed size array references.
+	(resolve_assumed_size_actual): New function to do a very restricted scan
+	of actual argument expressions of those procedures for which incomplete
+	assumed size array references are not allowed.
+	(resolve_function, resolve_call): Switch off assumed size checking of
+	actual arguments, except for elemental procedures and intrinsic
+	inquiry functions, in some circumstances.
+	(resolve_variable): Call check_assumed_size_reference.
+
+2006-01-11  Bernhard Fischer  <rep.nop@aon.at>
+
+	PR fortran/25486
+	* scanner.c (load_line): use maxlen to determine the line-length used
+	for padding lines in fixed form.
+
+2005-01-11  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/25730
+	* trans-types.c (copy_dt_decls_ifequal): Copy backend decl for
+	character lengths.
+
+2006-01-09  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	fortran/24936
+	* trans-stmt.c (gfc_trans_pointer_assign_need_temp): Use fold_convert
+	to avoid type mismatch.
+
+2006-01-09  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR fortran/21977
+	* trans-decl.c (gfc_generate_function_code): Move the NULLing of
+	current_fake_result_decl down to below generate_local_vars.
+
+2005-01-09  Erik Edelmann  <eedelman@gcc.gnu.org>
+
+	PR fortran/25093
+	* resolve.c (resolve_fntype): Check that PUBLIC functions
+	aren't of PRIVATE type.
+
+2006-01-09  Feng Wang  <fengwang@nudt.edu.cn>
+
+	PR fortran/12456
+	* trans-expr.c (gfc_to_single_character): New function that converts
+	string to single character if its length is 1.
+	(gfc_build_compare_string):New function that compare string and handle
+	single character specially.
+	(gfc_conv_expr_op): Use gfc_build_compare_string.
+	(gfc_trans_string_copy): Use gfc_to_single_character.
+	* trans-intrinsic.c (gfc_conv_intrinsic_strcmp): Use
+	gfc_build_compare_string.
+	* trans.h (gfc_build_compare_string): Add prototype.
+
+2006-01-09  Feng Wang  <fengwang@nudt.edu.cn>
+
+	* simplify.c (gfc_simplify_char): Use UCHAR_MAX instead of literal
+	constant.
+	(gfc_simplify_ichar): Get the result from unsinged char and in the
+	range 0 to UCHAR_MAX instead of CHAR_MIN to CHAR_MAX.
+
+2006-01-07  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/24268
+	* io.c (next_char_not_space): New function that returns the next
+	character that is not white space.
+	(format_lex): Use the new function to skip whitespace within
+	a format string.
+
+2006-01-06 Steven G. Kargl  <kargls@comcast.net>
+
+	PR fortran/25101
+	* resolve.c (resolve_forall_iterators):  Check for scalar variables;
+	Check stride is nonzero.
+
+	PR fortran/24640
+	* parse.c (next_free): Check for whitespace after the label;
+	Update copyright year.
+	* match.c (gfc_match_small_literal_int): Initialize cnt variable;
+	Update copyright year.
+
+
 2006-01-05  Erik Edelmann  <eedelman@gcc.gnu.org>
 
 	PR fortran/23675
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 161347cade1..a98847d66e7 100644
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -154,6 +154,20 @@ unget_char (void)
   use_last_char = 1;
 }
 
+/* Eat up the spaces and return a character. */
+
+static char
+next_char_not_space(void)
+{
+  char c;
+  do
+    {
+      c = next_char (0);
+    }
+  while (gfc_is_whitespace (c));
+  return c;
+}
+
 static int value = 0;
 
 /* Simple lexical analyzer for getting the next token in a FORMAT
@@ -174,19 +188,15 @@ format_lex (void)
       return token;
     }
 
-  do
-    {
-      c = next_char (0);
-    }
-  while (gfc_is_whitespace (c));
-
+  c = next_char_not_space ();
+  
   negative_flag = 0;
   switch (c)
     {
     case '-':
       negative_flag = 1;
     case '+':
-      c = next_char (0);
+      c = next_char_not_space ();
       if (!ISDIGIT (c))
 	{
 	  token = FMT_UNKNOWN;
@@ -197,11 +207,11 @@ format_lex (void)
 
       do
 	{
-	  c = next_char (0);
+	  c = next_char_not_space ();
           if(ISDIGIT (c))
             value = 10 * value + c - '0';
 	}
-      while (ISDIGIT (c));
+      while (ISDIGIT (c) || gfc_is_whitespace(c));
 
       unget_char ();
 
@@ -227,13 +237,13 @@ format_lex (void)
 
       do
 	{
-	  c = next_char (0);
+	  c = next_char_not_space ();
 	  if (c != '0')
 	    zflag = 0;
           if (ISDIGIT (c))
             value = 10 * value + c - '0';
 	}
-      while (ISDIGIT (c) || gfc_is_whitespace(c));
+      while (ISDIGIT (c));
 
       unget_char ();
       token = zflag ? FMT_ZERO : FMT_POSINT;
@@ -260,7 +270,7 @@ format_lex (void)
       break;
 
     case 'T':
-      c = next_char (0);
+      c = next_char_not_space ();
       if (c != 'L' && c != 'R')
 	unget_char ();
 
@@ -280,7 +290,7 @@ format_lex (void)
       break;
 
     case 'S':
-      c = next_char (0);
+      c = next_char_not_space ();
       if (c != 'P' && c != 'S')
 	unget_char ();
 
@@ -288,7 +298,7 @@ format_lex (void)
       break;
 
     case 'B':
-      c = next_char (0);
+      c = next_char_not_space ();
       if (c == 'N' || c == 'Z')
 	token = FMT_BLANK;
       else
@@ -350,7 +360,7 @@ format_lex (void)
       break;
 
     case 'E':
-      c = next_char (0);
+      c = next_char_not_space ();
       if (c == 'N' || c == 'S')
 	token = FMT_EXT;
       else
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index e1ce3937410..25148cdea42 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -1,6 +1,6 @@
 /* Matching subroutines in all sizes, shapes and colors.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of GCC.
@@ -151,6 +151,7 @@ gfc_match_small_literal_int (int *value, int *cnt)
 
   gfc_gobble_whitespace ();
   c = gfc_next_char ();
+  *cnt = 0;
 
   if (!ISDIGIT (c))
     {
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 6306cc4c4a8..e0f63ac025b 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -1,6 +1,6 @@
 /* Main parser.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, 
-   Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of GCC.
@@ -435,6 +435,10 @@ next_free (void)
 	  do
 	    c = gfc_next_char ();
 	  while (ISDIGIT(c));
+
+	  if (!gfc_is_whitespace (c))
+	    gfc_error_now ("Non-numeric character in statement label at %C");
+
 	}
       else
 	{
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index ce5c3242ac1..77acef9300a 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -694,6 +694,69 @@ procedure_kind (gfc_symbol * sym)
   return PTYPE_UNKNOWN;
 }
 
+/* Check references to assumed size arrays.  The flag need_full_assumed_size
+   is non-zero when matching actual arguments.  */
+
+static int need_full_assumed_size = 0;
+
+static bool
+check_assumed_size_reference (gfc_symbol * sym, gfc_expr * e)
+{
+  gfc_ref * ref;
+  int dim;
+  int last = 1;
+
+  if (need_full_assumed_size
+	|| !(sym->as && sym->as->type == AS_ASSUMED_SIZE))
+      return false;
+
+  for (ref = e->ref; ref; ref = ref->next)
+    if (ref->type == REF_ARRAY)
+      for (dim = 0; dim < ref->u.ar.as->rank; dim++)
+	last = (ref->u.ar.end[dim] == NULL) && (ref->u.ar.type == DIMEN_ELEMENT);
+
+  if (last)
+    {
+      gfc_error ("The upper bound in the last dimension must "
+		 "appear in the reference to the assumed size "
+		 "array '%s' at %L.", sym->name, &e->where);
+      return true;
+    }
+  return false;
+}
+
+
+/* Look for bad assumed size array references in argument expressions
+  of elemental and array valued intrinsic procedures.  Since this is
+  called from procedure resolution functions, it only recurses at
+  operators.  */
+
+static bool
+resolve_assumed_size_actual (gfc_expr *e)
+{
+  if (e == NULL)
+   return false;
+
+  switch (e->expr_type)
+    {
+    case EXPR_VARIABLE:
+      if (e->symtree
+	    && check_assumed_size_reference (e->symtree->n.sym, e))
+	return true;
+      break;
+
+    case EXPR_OP:
+      if (resolve_assumed_size_actual (e->value.op.op1)
+	    || resolve_assumed_size_actual (e->value.op.op2))
+	return true;
+      break;
+
+    default:
+      break;
+    }
+  return false;
+}
+
 
 /* Resolve an actual argument list.  Most of the time, this is just
    resolving the expressions in the list.
@@ -1072,10 +1135,18 @@ resolve_function (gfc_expr * expr)
   gfc_actual_arglist *arg;
   const char *name;
   try t;
+  int temp;
+
+  /* Switch off assumed size checking and do this again for certain kinds
+     of procedure, once the procedure itself is resolved.  */
+  need_full_assumed_size++;
 
   if (resolve_actual_arglist (expr->value.function.actual) == FAILURE)
     return FAILURE;
 
+  /* Resume assumed_size checking. */
+  need_full_assumed_size--;
+
 /* See if function is already resolved.  */
 
   if (expr->value.function.name != NULL)
@@ -1113,6 +1184,9 @@ resolve_function (gfc_expr * expr)
   if (expr->expr_type != EXPR_FUNCTION)
     return t;
 
+  temp = need_full_assumed_size;
+  need_full_assumed_size = 0;
+
   if (expr->value.function.actual != NULL
       && ((expr->value.function.esym != NULL
 	   && expr->value.function.esym->attr.elemental)
@@ -1121,7 +1195,6 @@ resolve_function (gfc_expr * expr)
     {
 
       /* The rank of an elemental is the rank of its array argument(s).  */
-
       for (arg = expr->value.function.actual; arg; arg = arg->next)
 	{
 	  if (arg->expr != NULL && arg->expr->rank > 0)
@@ -1130,8 +1203,45 @@ resolve_function (gfc_expr * expr)
 	      break;
 	    }
 	}
+
+      /* Being elemental, the last upper bound of an assumed size array
+	 argument must be present.  */
+      for (arg = expr->value.function.actual; arg; arg = arg->next)
+	{
+	  if (arg->expr != NULL
+		&& arg->expr->rank > 0
+		&& resolve_assumed_size_actual (arg->expr))
+	    return FAILURE;
+	}
+    }
+
+  else if (expr->value.function.actual != NULL
+      && expr->value.function.isym != NULL
+      && strcmp (expr->value.function.isym->name, "lbound"))
+    {
+      /* Array instrinsics must also have the last upper bound of an
+	 asumed size array argument.  UBOUND and SIZE have to be
+	 excluded from the check if the second argument is anything
+	 than a constant.  */
+      int inquiry;
+      inquiry = strcmp (expr->value.function.isym->name, "ubound") == 0
+		  || strcmp (expr->value.function.isym->name, "size") == 0;
+	    
+      for (arg = expr->value.function.actual; arg; arg = arg->next)
+	{
+	  if (inquiry && arg->next != NULL && arg->next->expr
+		&& arg->next->expr->expr_type != EXPR_CONSTANT)
+	    break;
+	  
+	  if (arg->expr != NULL
+		&& arg->expr->rank > 0
+		&& resolve_assumed_size_actual (arg->expr))
+	    return FAILURE;
+	}
     }
 
+  need_full_assumed_size = temp;
+
   if (omp_workshare_flag
       && expr->value.function.esym
       && ! gfc_elemental (expr->value.function.esym))
@@ -1387,10 +1497,17 @@ static try
 resolve_call (gfc_code * c)
 {
   try t;
+  
+  /* Switch off assumed size checking and do this again for certain kinds
+     of procedure, once the procedure itself is resolved.  */
+  need_full_assumed_size++;
 
   if (resolve_actual_arglist (c->ext.actual) == FAILURE)
     return FAILURE;
 
+  /* Resume assumed_size checking. */
+  need_full_assumed_size--;
+
   if (c->resolved_sym != NULL)
     return SUCCESS;
 
@@ -1412,6 +1529,21 @@ resolve_call (gfc_code * c)
       gfc_internal_error ("resolve_subroutine(): bad function type");
     }
 
+  if (c->ext.actual != NULL
+      && c->symtree->n.sym->attr.elemental)
+    {
+      gfc_actual_arglist * a;
+      /* Being elemental, the last upper bound of an assumed size array
+	 argument must be present.  */
+      for (a = c->ext.actual; a; a = a->next)
+	{
+	  if (a->expr != NULL
+		&& a->expr->rank > 0
+		&& resolve_assumed_size_actual (a->expr))
+	    return FAILURE;
+	}
+    }
+
   return t;
 }
 
@@ -2336,6 +2468,9 @@ resolve_variable (gfc_expr * e)
       e->ts = sym->ts;
     }
 
+  if (check_assumed_size_reference (sym, e))
+    return FAILURE;
+
   return SUCCESS;
 }
 
@@ -2507,7 +2642,9 @@ gfc_resolve_iterator (gfc_iterator * iter, bool real_ok)
 }
 
 
-/* Resolve a list of FORALL iterators.  */
+/* Resolve a list of FORALL iterators.  The FORALL index-name is constrained
+   to be a scalar INTEGER variable.  The subscripts and stride are scalar
+   INTEGERs, and if stride is a constant it must be nonzero.  */
 
 static void
 resolve_forall_iterators (gfc_forall_iterator * iter)
@@ -2516,28 +2653,35 @@ resolve_forall_iterators (gfc_forall_iterator * iter)
   while (iter)
     {
       if (gfc_resolve_expr (iter->var) == SUCCESS
-	  && iter->var->ts.type != BT_INTEGER)
-	gfc_error ("FORALL Iteration variable at %L must be INTEGER",
+	  && (iter->var->ts.type != BT_INTEGER || iter->var->rank != 0))
+	gfc_error ("FORALL index-name at %L must be a scalar INTEGER",
 		   &iter->var->where);
 
       if (gfc_resolve_expr (iter->start) == SUCCESS
-	  && iter->start->ts.type != BT_INTEGER)
-	gfc_error ("FORALL start expression at %L must be INTEGER",
+	  && (iter->start->ts.type != BT_INTEGER || iter->start->rank != 0))
+	gfc_error ("FORALL start expression at %L must be a scalar INTEGER",
 		   &iter->start->where);
       if (iter->var->ts.kind != iter->start->ts.kind)
 	gfc_convert_type (iter->start, &iter->var->ts, 2);
 
       if (gfc_resolve_expr (iter->end) == SUCCESS
-	  && iter->end->ts.type != BT_INTEGER)
-	gfc_error ("FORALL end expression at %L must be INTEGER",
+	  && (iter->end->ts.type != BT_INTEGER || iter->end->rank != 0))
+	gfc_error ("FORALL end expression at %L must be a scalar INTEGER",
 		   &iter->end->where);
       if (iter->var->ts.kind != iter->end->ts.kind)
 	gfc_convert_type (iter->end, &iter->var->ts, 2);
 
-      if (gfc_resolve_expr (iter->stride) == SUCCESS
-	  && iter->stride->ts.type != BT_INTEGER)
-	gfc_error ("FORALL Stride expression at %L must be INTEGER",
-		   &iter->stride->where);
+      if (gfc_resolve_expr (iter->stride) == SUCCESS)
+	{
+	  if (iter->stride->ts.type != BT_INTEGER || iter->stride->rank != 0)
+	    gfc_error ("FORALL stride expression at %L must be a scalar %s",
+		        &iter->stride->where, "INTEGER");
+
+	  if (iter->stride->expr_type == EXPR_CONSTANT
+	      && mpz_cmp_ui(iter->stride->value.integer, 0) == 0)
+	    gfc_error ("FORALL stride expression at %L cannot be zero",
+		       &iter->stride->where);
+	}
       if (iter->var->ts.kind != iter->stride->ts.kind)
 	gfc_convert_type (iter->stride, &iter->var->ts, 2);
 
@@ -5544,6 +5688,15 @@ resolve_fntype (gfc_namespace * ns)
       sym->attr.untyped = 1;
     }
 
+  if (sym->ts.type == BT_DERIVED && !sym->ts.derived->attr.use_assoc
+      && !gfc_check_access (sym->ts.derived->attr.access,
+                            sym->ts.derived->ns->default_access)
+      && gfc_check_access (sym->attr.access, sym->ns->default_access))
+    {
+      gfc_error ("PUBLIC function '%s' at %L cannot be of PRIVATE type '%s'",
+                 sym->name, &sym->declared_at, sym->ts.derived->name);
+    }
+
   if (ns->entries)
     for (el = ns->entries->next; el; el = el->next)
       {
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index 2317f02e896..261f2ec1848 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -972,11 +972,13 @@ load_line (FILE * input, char **pbuf, int *pbuflen)
 
   /* Pad lines to the selected line length in fixed form.  */
   if (gfc_current_form == FORM_FIXED
-      && gfc_option.fixed_line_length > 0
+      && gfc_option.fixed_line_length != 0
       && !preprocessor_flag
       && c != EOF)
-    while (i++ < gfc_option.fixed_line_length)
-      *buffer++ = ' ';
+    {
+      while (i++ < maxlen)
+	*buffer++ = ' ';
+    }
 
   *buffer = '\0';
   *pbuflen = buflen;
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 5b47e930db6..894903bdd2e 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -1,6 +1,6 @@
 /* Simplify intrinsic functions at compile-time.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
    Contributed by Andy Vaught & Katherine Holcomb
 
 This file is part of GCC.
@@ -662,7 +662,7 @@ gfc_simplify_char (gfc_expr * e, gfc_expr * k)
   if (e->expr_type != EXPR_CONSTANT)
     return NULL;
 
-  if (gfc_extract_int (e, &c) != NULL || c < 0 || c > 255)
+  if (gfc_extract_int (e, &c) != NULL || c < 0 || c > UCHAR_MAX)
     {
       gfc_error ("Bad character in CHAR function at %L", &e->where);
       return &gfc_bad_expr;
@@ -1370,9 +1370,9 @@ gfc_simplify_ichar (gfc_expr * e)
       return &gfc_bad_expr;
     }
 
-  index = (int) e->value.character.string[0];
+  index = (unsigned char) e->value.character.string[0];
 
-  if (index < CHAR_MIN || index > CHAR_MAX)
+  if (index < 0 || index > UCHAR_MAX)
     {
       gfc_error ("Argument of ICHAR at %L out of range of this processor",
 		 &e->where);
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index eafce793703..0cc048fbc44 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -4465,7 +4465,7 @@ gfc_walk_op_expr (gfc_ss * ss, gfc_expr * expr)
 
 /* Reverse a SS chain.  */
 
-static gfc_ss *
+gfc_ss *
 gfc_reverse_ss (gfc_ss * ss)
 {
   gfc_ss *next;
@@ -4491,10 +4491,9 @@ gfc_reverse_ss (gfc_ss * ss)
 /* Walk the arguments of an elemental function.  */
 
 gfc_ss *
-gfc_walk_elemental_function_args (gfc_ss * ss, gfc_expr * expr,
+gfc_walk_elemental_function_args (gfc_ss * ss, gfc_actual_arglist *arg,
 				  gfc_ss_type type)
 {
-  gfc_actual_arglist *arg;
   int scalar;
   gfc_ss *head;
   gfc_ss *tail;
@@ -4503,7 +4502,7 @@ gfc_walk_elemental_function_args (gfc_ss * ss, gfc_expr * expr,
   head = gfc_ss_terminator;
   tail = NULL;
   scalar = 1;
-  for (arg = expr->value.function.actual; arg; arg = arg->next)
+  for (; arg; arg = arg->next)
     {
       if (!arg->expr)
 	continue;
@@ -4580,7 +4579,8 @@ gfc_walk_function_expr (gfc_ss * ss, gfc_expr * expr)
   /* Walk the parameters of an elemental function.  For now we always pass
      by reference.  */
   if (sym->attr.elemental)
-    return gfc_walk_elemental_function_args (ss, expr, GFC_SS_REFERENCE);
+    return gfc_walk_elemental_function_args (ss, expr->value.function.actual,
+					     GFC_SS_REFERENCE);
 
   /* Scalar functions are OK as these are evaluated outside the scalarization
      loop.  Pass back and let the caller deal with it.  */
diff --git a/gcc/fortran/trans-array.h b/gcc/fortran/trans-array.h
index af990a9061c..02012d4ee23 100644
--- a/gcc/fortran/trans-array.h
+++ b/gcc/fortran/trans-array.h
@@ -48,11 +48,14 @@ void gfc_trans_static_array_pointer (gfc_symbol *);
 
 /* Generate scalarization information for an expression.  */
 gfc_ss *gfc_walk_expr (gfc_expr *);
-/* Walk the arguments of an intrinsic function.  */
-gfc_ss *gfc_walk_elemental_function_args (gfc_ss *, gfc_expr *, gfc_ss_type);
+/* Walk the arguments of an elemental function.  */
+gfc_ss *gfc_walk_elemental_function_args (gfc_ss *, gfc_actual_arglist *,
+					  gfc_ss_type);
 /* Walk an intrinsic function.  */
 gfc_ss *gfc_walk_intrinsic_function (gfc_ss *, gfc_expr *,
 				     gfc_intrinsic_sym *);
+/* Reverse the order of an SS chain.  */
+gfc_ss *gfc_reverse_ss (gfc_ss *);
 
 /* Free the SS associated with a loop.  */
 void gfc_cleanup_loop (gfc_loopinfo *);
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 2a3b9004804..538e393f073 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -2788,9 +2788,6 @@ gfc_generate_function_code (gfc_namespace * ns)
 
   trans_function_start (sym);
 
-  /* Will be created as needed.  */
-  current_fake_result_decl = NULL_TREE;
-
   gfc_start_block (&block);
 
   if (ns->entries && ns->proc_name->ts.type == BT_CHARACTER)
@@ -2812,7 +2809,9 @@ gfc_generate_function_code (gfc_namespace * ns)
   gfc_generate_contained_functions (ns);
 
   generate_local_vars (ns);
-
+  
+  /* Will be created as needed.  */
+  current_fake_result_decl = NULL_TREE;
   current_function_return_label = NULL;
 
   /* Now generate the code for the body of this function.  */
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index a5e89f63f35..944440fb6ab 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -1,5 +1,5 @@
 /* Expression translation
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
    and Steven Bosscher <s.bosscher@student.tudelft.nl>
 
@@ -902,7 +902,6 @@ gfc_conv_concat_op (gfc_se * se, gfc_expr * expr)
   se->string_length = len;
 }
 
-
 /* Translates an op expression. Common (binary) cases are handled by this
    function, others are passed on. Recursion is used in either case.
    We use the fact that (op1.ts == op2.ts) (except for the power
@@ -1044,23 +1043,15 @@ gfc_conv_expr_op (gfc_se * se, gfc_expr * expr)
   gfc_conv_expr (&rse, expr->value.op.op2);
   gfc_add_block_to_block (&se->pre, &rse.pre);
 
-  /* For string comparisons we generate a library call, and compare the return
-     value with 0.  */
   if (checkstring)
     {
       gfc_conv_string_parameter (&lse);
       gfc_conv_string_parameter (&rse);
-      tmp = NULL_TREE;
-      tmp = gfc_chainon_list (tmp, lse.string_length);
-      tmp = gfc_chainon_list (tmp, lse.expr);
-      tmp = gfc_chainon_list (tmp, rse.string_length);
-      tmp = gfc_chainon_list (tmp, rse.expr);
-
-      /* Build a call for the comparison.  */
-      lse.expr = gfc_build_function_call (gfor_fndecl_compare_string, tmp);
-      gfc_add_block_to_block (&lse.post, &rse.post);
 
+      lse.expr = gfc_build_compare_string (lse.string_length, lse.expr,
+ 					   rse.string_length, rse.expr);
       rse.expr = integer_zero_node;
+      gfc_add_block_to_block (&lse.post, &rse.post);
     }
 
   type = gfc_typenode_for_spec (&expr->ts);
@@ -1079,6 +1070,63 @@ gfc_conv_expr_op (gfc_se * se, gfc_expr * expr)
   gfc_add_block_to_block (&se->post, &lse.post);
 }
 
+/* If a string's length is one, we convert it to a single character.  */
+
+static tree
+gfc_to_single_character (tree len, tree str)
+{
+  gcc_assert (POINTER_TYPE_P (TREE_TYPE (str)));
+
+  if (INTEGER_CST_P (len) && TREE_INT_CST_LOW (len) == 1
+    && TREE_INT_CST_HIGH (len) == 0)
+    {
+      str = fold_convert (pchar_type_node, str);
+      return build_fold_indirect_ref (str);
+    }
+
+  return NULL_TREE;
+}
+
+/* Compare two strings. If they are all single characters, the result is the
+   subtraction of them. Otherwise, we build a library call.  */
+
+tree
+gfc_build_compare_string (tree len1, tree str1, tree len2, tree str2)
+{
+  tree sc1;
+  tree sc2;
+  tree type;
+  tree tmp;
+
+  gcc_assert (POINTER_TYPE_P (TREE_TYPE (str1)));
+  gcc_assert (POINTER_TYPE_P (TREE_TYPE (str2)));
+
+  type = gfc_get_int_type (gfc_default_integer_kind);
+
+  sc1 = gfc_to_single_character (len1, str1);
+  sc2 = gfc_to_single_character (len2, str2);
+
+  /* Deal with single character specially.  */
+  if (sc1 != NULL_TREE && sc2 != NULL_TREE)
+    {
+      sc1 = fold_convert (type, sc1);
+      sc2 = fold_convert (type, sc2);
+      tmp = fold_build2 (MINUS_EXPR, type, sc1, sc2);
+    }
+   else
+    {
+      tmp = NULL_TREE;
+      tmp = gfc_chainon_list (tmp, len1);
+      tmp = gfc_chainon_list (tmp, str1);
+      tmp = gfc_chainon_list (tmp, len2);
+      tmp = gfc_chainon_list (tmp, str2);
+
+      /* Build a call for the comparison.  */
+      tmp = build_function_call_expr (gfor_fndecl_compare_string, tmp);
+    }
+
+  return tmp;
+}
 
 static void
 gfc_conv_function_val (gfc_se * se, gfc_symbol * sym)
@@ -1819,6 +1867,17 @@ gfc_trans_string_copy (stmtblock_t * block, tree dlen, tree dest,
 		       tree slen, tree src)
 {
   tree tmp;
+  tree dsc;
+  tree ssc;
+
+  /* Deal with single character specially.  */
+  dsc = gfc_to_single_character (dlen, dest);
+  ssc = gfc_to_single_character (slen, src);
+  if (dsc != NULL_TREE && ssc != NULL_TREE)
+    {
+      gfc_add_modify_expr (block, dsc, ssc);
+      return;
+    }
 
   tmp = NULL_TREE;
   tmp = gfc_chainon_list (tmp, dlen);
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index ea9c2e3b7db..6f55b40a044 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -1,5 +1,5 @@
 /* Intrinsic translation
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
    and Steven Bosscher <s.bosscher@student.tudelft.nl>
 
@@ -2267,13 +2267,17 @@ gfc_conv_intrinsic_strcmp (gfc_se * se, gfc_expr * expr, int op)
 {
   tree type;
   tree args;
+  tree arg2;
 
   args = gfc_conv_intrinsic_function_args (se, expr);
-  /* Build a call for the comparison.  */
-  se->expr = gfc_build_function_call (gfor_fndecl_compare_string, args);
+  arg2 = TREE_CHAIN (TREE_CHAIN (args));
 
+  se->expr = gfc_build_compare_string (TREE_VALUE (args),
+		TREE_VALUE (TREE_CHAIN (args)), TREE_VALUE (arg2),
+		TREE_VALUE (TREE_CHAIN (arg2)));
+ 
   type = gfc_typenode_for_spec (&expr->ts);
-  se->expr = build2 (op, type, se->expr,
+  se->expr = fold_build2 (op, type, se->expr,
 		     build_int_cst (TREE_TYPE (se->expr), 0));
 }
 
@@ -3370,7 +3374,7 @@ gfc_walk_intrinsic_function (gfc_ss * ss, gfc_expr * expr,
   gcc_assert (isym);
 
   if (isym->elemental)
-    return gfc_walk_elemental_function_args (ss, expr, GFC_SS_SCALAR);
+    return gfc_walk_elemental_function_args (ss, expr->value.function.actual, GFC_SS_SCALAR);
 
   if (expr->rank == 0)
     return ss;
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 7c2d768286d..7be45e79d8a 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -209,6 +209,7 @@ tree
 gfc_trans_call (gfc_code * code)
 {
   gfc_se se;
+  gfc_ss * ss;
   int has_alternate_specifier;
 
   /* A CALL starts a new block because the actual arguments may have to
@@ -218,28 +219,81 @@ gfc_trans_call (gfc_code * code)
 
   gcc_assert (code->resolved_sym);
 
-  /* Translate the call.  */
-  has_alternate_specifier
-    = gfc_conv_function_call (&se, code->resolved_sym, code->ext.actual);
+  ss = gfc_ss_terminator;
+  if (code->resolved_sym->attr.elemental)
+    ss = gfc_walk_elemental_function_args (ss, code->ext.actual, GFC_SS_REFERENCE);
 
-  /* A subroutine without side-effect, by definition, does nothing!  */
-  TREE_SIDE_EFFECTS (se.expr) = 1;
-
-  /* Chain the pieces together and return the block.  */
-  if (has_alternate_specifier)
+  /* Is not an elemental subroutine call with array valued arguments.  */
+  if (ss == gfc_ss_terminator)
     {
-      gfc_code *select_code;
-      gfc_symbol *sym;
-      select_code = code->next;
-      gcc_assert(select_code->op == EXEC_SELECT);
-      sym = select_code->expr->symtree->n.sym;
-      se.expr = convert (gfc_typenode_for_spec (&sym->ts), se.expr);
-      gfc_add_modify_expr (&se.pre, sym->backend_decl, se.expr);
+
+      /* Translate the call.  */
+      has_alternate_specifier
+	= gfc_conv_function_call (&se, code->resolved_sym, code->ext.actual);
+
+      /* A subroutine without side-effect, by definition, does nothing!  */
+      TREE_SIDE_EFFECTS (se.expr) = 1;
+
+      /* Chain the pieces together and return the block.  */
+      if (has_alternate_specifier)
+	{
+	  gfc_code *select_code;
+	  gfc_symbol *sym;
+	  select_code = code->next;
+	  gcc_assert(select_code->op == EXEC_SELECT);
+	  sym = select_code->expr->symtree->n.sym;
+	  se.expr = convert (gfc_typenode_for_spec (&sym->ts), se.expr);
+	  gfc_add_modify_expr (&se.pre, sym->backend_decl, se.expr);
+	}
+      else
+	gfc_add_expr_to_block (&se.pre, se.expr);
+
+      gfc_add_block_to_block (&se.pre, &se.post);
     }
+
   else
-    gfc_add_expr_to_block (&se.pre, se.expr);
+    {
+      /* An elemental subroutine call with array valued arguments has
+	 to be scalarized.  */
+      gfc_loopinfo loop;
+      stmtblock_t body;
+      stmtblock_t block;
+      gfc_se loopse;
+
+      /* gfc_walk_elemental_function_args renders the ss chain in the
+         reverse order to the actual argument order.  */
+      ss = gfc_reverse_ss (ss);
+
+      /* Initialize the loop.  */
+      gfc_init_se (&loopse, NULL);
+      gfc_init_loopinfo (&loop);
+      gfc_add_ss_to_loop (&loop, ss);
+
+      gfc_conv_ss_startstride (&loop);
+      gfc_conv_loop_setup (&loop);
+      gfc_mark_ss_chain_used (ss, 1);
+
+      /* Generate the loop body.  */
+      gfc_start_scalarized_body (&loop, &body);
+      gfc_init_block (&block);
+      gfc_copy_loopinfo_to_se (&loopse, &loop);
+      loopse.ss = ss;
+
+      /* Add the subroutine call to the block.  */
+      gfc_conv_function_call (&loopse, code->resolved_sym, code->ext.actual);
+      gfc_add_expr_to_block (&loopse.pre, loopse.expr);
+
+      gfc_add_block_to_block (&block, &loopse.pre);
+      gfc_add_block_to_block (&block, &loopse.post);
+
+      /* Finish up the loop block and the loop.  */
+      gfc_add_expr_to_block (&body, gfc_finish_block (&block));
+      gfc_trans_scalarizing_loops (&loop, &body);
+      gfc_add_block_to_block (&se.pre, &loop.pre);
+      gfc_add_block_to_block (&se.pre, &loop.post);
+      gfc_cleanup_loop (&loop);
+    }
 
-  gfc_add_block_to_block (&se.pre, &se.post);
   return gfc_finish_block (&se.pre);
 }
 
@@ -2068,7 +2122,8 @@ gfc_trans_pointer_assign_need_temp (gfc_expr * expr1, gfc_expr * expr2,
       rse.want_pointer = 1;
       gfc_conv_expr (&rse, expr2);
       gfc_add_block_to_block (&body, &rse.pre);
-      gfc_add_modify_expr (&body, lse.expr, rse.expr);
+      gfc_add_modify_expr (&body, lse.expr,
+			   fold_convert (TREE_TYPE (lse.expr), rse.expr));
       gfc_add_block_to_block (&body, &rse.post);
 
       /* Increment count.  */
@@ -2501,6 +2556,14 @@ gfc_trans_forall_1 (gfc_code * code, forall_info * nested_forall_info)
           gfc_add_expr_to_block (&block, tmp);
           break;
 
+	/* Explicit subroutine calls are prevented by the frontend but interface
+	   assignments can legitimately produce them.  */
+	case EXEC_CALL:
+	  assign = gfc_trans_call (c);
+          tmp = gfc_trans_nested_forall_loop (nested_forall_info, assign, 1, 1);
+          gfc_add_expr_to_block (&block, tmp);
+          break;
+
 	default:
 	  gcc_unreachable ();
 	}
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index b41940c1cdc..fcdef6a0c0e 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -1418,12 +1418,16 @@ copy_dt_decls_ifequal (gfc_symbol *from, gfc_symbol *to)
      a derived type, we need a copy of its component declarations.
      This is done by recursing into gfc_get_derived_type and
      ensures that the component's component declarations have
-     been built.  */
+     been built.  If it is a character, we need the character 
+     length, as well.  */
   for (; to_cm; to_cm = to_cm->next, from_cm = from_cm->next)
     {
       to_cm->backend_decl = from_cm->backend_decl;
       if (from_cm->ts.type == BT_DERIVED)
 	gfc_get_derived_type (to_cm->ts.derived);
+
+      else if (from_cm->ts.type == BT_CHARACTER)
+	to_cm->ts.cl->backend_decl = from_cm->ts.cl->backend_decl;
     }
 
   return 1;
diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h
index c57ca1a2776..b93a05e3cbf 100644
--- a/gcc/fortran/trans.h
+++ b/gcc/fortran/trans.h
@@ -1,5 +1,5 @@
 /* Header for code translation functions
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Paul Brook
 
 This file is part of GCC.
@@ -268,6 +268,9 @@ void gfc_make_safe_expr (gfc_se * se);
 /* Makes sure se is suitable for passing as a function string parameter.  */
 void gfc_conv_string_parameter (gfc_se * se);
 
+/* Compare two strings.  */
+tree gfc_build_compare_string (tree, tree, tree, tree);
+
 /* Add an item to the end of TREE_LIST.  */
 tree gfc_chainon_list (tree, tree);
 
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 2c74574b449..1bf74684333 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -5647,6 +5647,14 @@ find_moveable_store (rtx insn, int *regs_set_before, int *regs_set_after)
   if (find_reg_note (insn, REG_EH_REGION, NULL_RTX))
     return;
 
+  /* Make sure that the SET_SRC of this store insns can be assigned to
+     a register, or we will fail later on in replace_store_insn, which
+     assumes that we can do this.  But sometimes the target machine has
+     oddities like MEM read-modify-write instruction.  See for example
+     PR24257.  */
+  if (!can_assign_to_reg_p (SET_SRC (set)))
+    return;
+
   ptr = ldst_entry (dest);
   if (!ptr->pattern_regs)
     ptr->pattern_regs = extract_mentioned_regs (dest);
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 0431e748794..ab3e0a88a8a 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,17 @@
+2006-01-16  Andrew Haley  <aph@redhat.com>
+
+	PR java/25535
+	* constants.c (build_constants_constructor): move initializer into
+	first halfword on a 64-bit big-endian machine.
+
+2006-01-06  Tom Tromey  <tromey@redhat.com>
+
+	* gcj.texi (Arrays): Added more documentation for
+	JvNewObjectArray.
+	(Primitive types): Correct information about primitive classes.
+	(Reference types): New node.
+	(Index): New node.
+
 2005-12-16  Alexandre Oliva  <aoliva@redhat.com>
 
 	* jcf-parse.c (set_source_filename): Set the decl source location
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index bba67a708eb..d5021da5006 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -1,5 +1,5 @@
 /* Handle the constant pool of the Java(TM) Virtual Machine.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -481,7 +481,12 @@ build_constants_constructor (void)
       case CONSTANT_Fieldref:
       case CONSTANT_NameAndType:
 	{
-	  jword temp = outgoing_cpool->data[i].w;
+	  unsigned HOST_WIDE_INT temp = outgoing_cpool->data[i].w;
+
+	  /* Make sure that on a 64-bit big-endian machine this 32-bit
+	     jint appears in the first word.  */
+	  if (BYTES_BIG_ENDIAN && BITS_PER_WORD > 32)
+	    temp <<= BITS_PER_WORD - 32;
 
 	  tags_list
 	    = tree_cons (NULL_TREE, 
diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index 21cc2a5770e..84e0e167288 100644
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -2,6 +2,13 @@
 @setfilename gcj.info
 @settitle Guide to GNU gcj
 
+@c Merge the standard indexes into a single one.
+@syncodeindex fn cp
+@syncodeindex vr cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
 @include gcc-common.texi
 
 @c Note: When reading this manual you'll find lots of strange
@@ -124,6 +131,7 @@ files and object files, and it can read both Java source code and
 * About CNI::           Description of the Compiled Native Interface
 * System properties::   Modifying runtime behavior of the libgcj library
 * Resources::		Where to look for more information
+* Index::               Index.
 @end menu
 
 
@@ -1426,7 +1434,8 @@ alternative to the standard JNI (Java Native Interface).
 @menu
 * Basic concepts::              Introduction to using CNI@.
 * Packages::                    How packages are mapped to C++.
-* Primitive types::             Handling Java types in C++.
+* Primitive types::             Handling primitive Java types in C++.
+* Reference types::             Handling Java reference types in C++.
 * Interfaces::                  How Java interfaces map to C++.
 * Objects and Classes::         C++ and Java classes.
 * Class Initialization::        How objects are initialized.
@@ -1623,7 +1632,7 @@ to avoid disappointment.
 @subsection Reference types associated with primitive types
 
 In Java each primitive type has an associated reference type, 
-e.g.: @code{boolean} has an associated @code{java.lang.Boolean} class.
+e.g.: @code{boolean} has an associated @code{java.lang.Boolean.TYPE} class.
 In order to make working with such classes easier GCJ provides the macro
 @code{JvPrimClass}:
 
@@ -1637,6 +1646,41 @@ JvPrimClass(void) @result{} java.lang.Void.TYPE
 @end deffn
 
 
+@node Reference types
+@section Reference types
+
+A Java reference type is treated as a class in C++.  Classes and
+interfaces are handled this way.  A Java reference is translated to a
+C++ pointer, so for instance a Java @code{java.lang.String} becomes,
+in C++, @code{java::lang::String *}.
+
+CNI provides a few built-in typedefs for the most common classes:
+@multitable @columnfractions .30 .25 .60
+@item @strong{Java type} @tab @strong{C++ typename} @tab @strong{Description}
+@item @code{java.lang.Object} @tab @code{jobject} @tab Object type
+@item @code{java.lang.String} @tab @code{jstring} @tab String type
+@item @code{java.lang.Class} @tab @code{jclass} @tab Class type
+@end multitable
+@cindex jobject
+@cindex jstring
+@cindex jclass
+
+Every Java class or interface has a corresponding @code{Class}
+instance.  These can be accessed in CNI via the static @code{class$}
+field of a class.  The @code{class$} field is of type @code{Class}
+(and not @code{Class *}), so you will typically take the address of
+it.
+@cindex class$
+
+Here is how you can refer to the class of @code{String}, which in
+Java would be written @code{String.class}:
+
+@example
+using namespace java::lang;
+doSomething (&String::class$);
+@end example
+
+
 @node Interfaces
 @section Interfaces
 
@@ -1896,10 +1940,17 @@ The name of this function may change in the future.
 
 
 @deftypefun jobjectArray JvNewObjectArray (jsize @var{length}, jclass @var{klass}, jobject @var{init})
-Here @code{klass} is the type of elements of the array and
+This creates a new array whose elements have reference type.
+@code{klass} is the type of elements of the array and
 @code{init} is the initial value put into every slot in the array.
 @end deftypefun
 
+@example
+using namespace java::lang;
+JArray<String *> *array
+  = (JArray<String *> *) JvNewObjectArray(length, &String::class$, NULL);
+@end example
+
 
 @subsection Creating arrays
 
@@ -2761,4 +2812,10 @@ a free software Java class library test suite which is being written
 because the JCK is not free.  See
 @uref{http://sources.redhat.com/mauve/} for more information.
 
+
+@node Index
+@unnumbered Index
+
+@printindex cp
+
 @bye
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 9053c7020f2..e7d50d0d578 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -1,6 +1,6 @@
 /* Expand the basic unary and binary arithmetic operations, for GNU compiler.
    Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -427,9 +427,14 @@ simplify_expand_binop (enum machine_mode mode, optab binoptab,
 		       enum optab_methods methods)
 {
   if (CONSTANT_P (op0) && CONSTANT_P (op1))
-    return simplify_gen_binary (binoptab->code, mode, op0, op1);
-  else
-    return expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods);
+    {
+      rtx x = simplify_binary_operation (binoptab->code, mode, op0, op1);
+
+      if (x)
+	return x;
+    }
+
+  return expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods);
 }
 
 /* Like simplify_expand_binop, but always put the result in TARGET.
diff --git a/gcc/passes.c b/gcc/passes.c
index 1fdd0faffb8..c360d603269 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -535,12 +535,12 @@ init_optimization_passes (void)
      we add may_alias right after fold builtins
      which can create arbitrary GIMPLE.  */
   NEXT_PASS (pass_may_alias);
-  NEXT_PASS (pass_cse_reciprocals);
   NEXT_PASS (pass_split_crit_edges);
   NEXT_PASS (pass_reassoc);
   NEXT_PASS (pass_pre);
   NEXT_PASS (pass_sink_code);
   NEXT_PASS (pass_tree_loop);
+  NEXT_PASS (pass_cse_reciprocals);
   NEXT_PASS (pass_dominator);
 
   /* The only copy propagation opportunities left after DOM
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index ed6093d08f9..67f088592a4 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-06  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* de.po: Update.
+
 2006-01-03  Joseph S. Myers  <joseph@codesourcery.com>
 
 	* zh_CN.po: Update.
diff --git a/gcc/po/de.po b/gcc/po/de.po
index c980d6430b8..101364fde7d 100644
--- a/gcc/po/de.po
+++ b/gcc/po/de.po
@@ -1,17 +1,17 @@
 # German translation of gcc messages.
 # Copyright © 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Karl Eichwalder <ke@suse.de>, 2002, 2003.
-# Roland Stigge <stigge@antcom.de>, 2003, 2004, 2005.
+# Roland Stigge <stigge@antcom.de>, 2003, 2004, 2005, 2006.
 # This file is distributed under the same license as the gcc package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gcc 4.0.1\n"
+"Project-Id-Version: gcc 4.1-b20051125\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2005-11-20 16:33+0000\n"
-"PO-Revision-Date: 2005-07-11 20:00+0300\n"
+"PO-Revision-Date: 2006-01-06 15:25+0000\n"
 "Last-Translator: Roland Stigge <stigge@antcom.de>\n"
-"Language-Team: German <de@li.org>\n"
+"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,7 +109,7 @@ msgstr "»q«-Kennzeichen"
 
 #: c-format.c:403 c-format.c:416
 msgid "the 'q' diagnostic flag"
-msgstr "das »q«-printf-Kennzeichen"
+msgstr "das »q«-Diagnose-Kennzeichen"
 
 #: c-format.c:424
 msgid "assignment suppression"
@@ -518,9 +518,9 @@ msgid "%d frame table(s) found\n"
 msgstr "%d Rahmentabelle(n) gefunden\n"
 
 #: collect2.c:1487
-#, fuzzy, c-format
+#, c-format
 msgid "can't get program status"
-msgstr "%s: %s: Status kann nicht ermittelt werden: %s\n"
+msgstr "Programm-Status kann nicht ermittelt werden"
 
 #: collect2.c:1537
 #, c-format
@@ -533,9 +533,9 @@ msgid "cannot find '%s'"
 msgstr "»%s« kann nicht gefunden werden"
 
 #: collect2.c:1556 collect2.c:2045 collect2.c:2200 gcc.c:2809
-#, fuzzy, c-format
+#, c-format
 msgid "pex_init failed"
-msgstr "Gimplifikation gescheitert"
+msgstr "pex_init gescheitert"
 
 #: collect2.c:1591
 #, c-format
@@ -557,9 +557,9 @@ msgid "cannot find 'nm'"
 msgstr "»nm« kann nicht gefunden werden"
 
 #: collect2.c:2066
-#, fuzzy, c-format
+#, c-format
 msgid "can't open nm output"
-msgstr "Ausgabedatei »%s« kann nicht geöffnet werden"
+msgstr "nm-Ausgabe kann nicht geöffnet werden"
 
 #: collect2.c:2110
 #, c-format
@@ -572,9 +572,9 @@ msgid "fini function found in object %s"
 msgstr "fini-Funktion im Objekt %s gefunden"
 
 #: collect2.c:2221
-#, fuzzy, c-format
+#, c-format
 msgid "can't open ldd output"
-msgstr "Ausgabedatei »%s« kann nicht geöffnet werden"
+msgstr "ldd-Ausgabe kann nicht geöffnet werden"
 
 #: collect2.c:2224
 #, c-format
@@ -603,7 +603,7 @@ msgstr "%s: keine COFF-Datei"
 #: collect2.c:2527
 #, c-format
 msgid "%s: cannot open as COFF file"
-msgstr "kann %s nicht als COFF-Datei öffnen"
+msgstr "%s kann nicht als COFF-Datei geöffnet werden"
 
 #: collect2.c:2585
 #, c-format
@@ -813,14 +813,12 @@ msgstr ""
 "Fortfahren? (y oder n) "
 
 #: gcc.c:2848
-#, fuzzy
 msgid "failed to get exit status"
-msgstr "ld gab %d als Ende-Status zurück"
+msgstr "Ende-Status konnte nicht ermittelt werden"
 
 #: gcc.c:2854
-#, fuzzy
 msgid "failed to get process times"
-msgstr "Suche nach Klasse »%s« gescheitert"
+msgstr "Verarbeitungszeiten konnten nicht ermittelt werden"
 
 #: gcc.c:2877
 #, c-format
@@ -966,6 +964,8 @@ msgid ""
 "  --sysroot=<directory>    Use <directory> as the root directory for headers\n"
 "                           for headers and libraries\n"
 msgstr ""
+"  --sysroot=<Verzeichnis>  <Verzeichnis> als Root-Verzeichnis für Header und\n"
+"                           Bibliotheken verwenden\n"
 
 #: gcc.c:3076
 msgid "  -B <directory>           Add <directory> to the compiler's search paths\n"
@@ -1065,7 +1065,7 @@ msgid ""
 "\n"
 msgstr ""
 "Dies ist freie Software; die Kopierbedingungen stehen in den Quellen. Es\n"
-"gibt KEINE Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE ZWECKE.\n"
+"gibt KEINE Garantie; auch nicht für MARKTGÄNGIGKEIT oder FÜR SPEZIELLE ZWECKE.\n"
 "\n"
 
 #: gcc.c:3526
@@ -1121,12 +1121,12 @@ msgstr "Argument für »-%s« fehlt"
 #: gcc.c:4382
 #, c-format
 msgid "switch '%s' does not start with '-'"
-msgstr "Schalter '%s' beginnt nicht mit '-'"
+msgstr "Schalter »%s« beginnt nicht mit »-«"
 
 #: gcc.c:4612
 #, c-format
 msgid "spec '%s' invalid"
-msgstr "Spezifikation '%s' ist ungültig"
+msgstr "Spezifikation »%s« ist ungültig"
 
 #: gcc.c:4678
 #, c-format
@@ -1182,12 +1182,12 @@ msgstr "schlechte Argumente für Spezifikationsfunktion"
 #: gcc.c:5671
 #, c-format
 msgid "braced spec '%s' is invalid at '%c'"
-msgstr "geschweift geklammertes '%s' ist bei '%c' ungültig"
+msgstr "geschweift geklammertes »%s« ist bei »%c« ungültig"
 
 #: gcc.c:5759
 #, c-format
 msgid "braced spec body '%s' is invalid"
-msgstr "geschweift geklammerter Körper '%s' ist ungültig"
+msgstr "geschweift geklammerter Körper »%s« ist ungültig"
 
 #: gcc.c:6306
 #, c-format
@@ -1246,9 +1246,9 @@ msgid "no input files"
 msgstr "keine Eingabedateien"
 
 #: gcc.c:6466
-#, fuzzy, c-format
+#, c-format
 msgid "cannot specify -o with -c or -S with multiple files"
-msgstr "-o kann nicht mit -c oder -S und mehreren Sprachen angegeben werden"
+msgstr "-o kann nicht mit -c oder -S mit mehreren Dateien angegeben werden"
 
 #: gcc.c:6500
 #, c-format
@@ -1276,24 +1276,24 @@ msgid "multilib exclusion '%s' is invalid"
 msgstr "Multilib-Ausschluss »%s« ist ungültig"
 
 #: gcc.c:7653 gcc.c:7658
-#, fuzzy, c-format
+#, c-format
 msgid "invalid version number `%s'"
-msgstr "ungültiges Optionsargument %qs"
+msgstr "ungültige Versionsnummer »%s«"
 
 #: gcc.c:7701
-#, fuzzy, c-format
+#, c-format
 msgid "too few arguments to %%:version-compare"
-msgstr "zu wenige Argumente für Funktion"
+msgstr "zu wenige Argumente für %%:version-compare"
 
 #: gcc.c:7707
-#, fuzzy, c-format
+#, c-format
 msgid "too many arguments to %%:version-compare"
-msgstr "zu viele Argumente für Funktion"
+msgstr "zu viele Argumente für %%:version-compare"
 
 #: gcc.c:7748
 #, c-format
 msgid "unknown operator '%s' in %%:version-compare"
-msgstr ""
+msgstr "unbekannter Operator »%s« in %%:version-compare"
 
 #: gcov.c:388
 #, c-format
@@ -1402,7 +1402,7 @@ msgid ""
 "\n"
 msgstr ""
 "Dies ist freie Software; die Kopierbedingungen stehen in den Quellen. Es\n"
-"gibt KEINE Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE ZWECKE.\n"
+"gibt KEINE Garantie; auch nicht für MARKTGÄNGIGKEIT oder FÜR SPEZIELLE ZWECKE.\n"
 "\n"
 
 #: gcov.c:507
@@ -1603,7 +1603,7 @@ msgstr "GCSE ausgeschaltet"
 #. Return if there's nothing to do, or it is too expensive.
 #: gcse.c:6518
 msgid "jump bypassing disabled"
-msgstr "Sprungumgehungen ausgeschaltet"
+msgstr "Sprungumgehung ausgeschaltet"
 
 #: gengtype-yacc.c:602 java/parse-scan.c:1988 java/parse-scan.y:1375
 #: java/parse.c:2981 java/parse.y:16475
@@ -1617,34 +1617,34 @@ msgstr "Syntaxfehler: es kann nicht zurückgesetzt werden"
 #: gengtype-yacc.c:1085 gengtype-yacc.c:1846 java/parse-scan.c:2471
 #: java/parse-scan.c:3359 java/parse.c:3464 java/parse.c:6451
 msgid "memory exhausted"
-msgstr ""
+msgstr "Speicher erschöpft"
 
 #. This is so xgettext sees the translatable formats that are
 #. constructed on the fly.
 #: gengtype-yacc.c:1653 java/parse-scan.c:3166 java/parse.c:6258
-#, fuzzy, c-format
+#, c-format
 msgid "syntax error, unexpected %s"
-msgstr "Syntaxfehler beim Token %qs"
+msgstr "Syntaxfehler, unerwartetes %s"
 
 #: gengtype-yacc.c:1654 java/parse-scan.c:3167 java/parse.c:6259
-#, fuzzy, c-format
+#, c-format
 msgid "syntax error, unexpected %s, expecting %s"
-msgstr "Syntaxfehler beim Token %qs"
+msgstr "Syntaxfehler, unerwartetes %s; %s erwartet"
 
 #: gengtype-yacc.c:1655 java/parse-scan.c:3168 java/parse.c:6260
 #, c-format
 msgid "syntax error, unexpected %s, expecting %s or %s"
-msgstr ""
+msgstr "Syntaxfehler, unerwartetes %s; %s oder %s erwartet"
 
 #: gengtype-yacc.c:1656 java/parse-scan.c:3169 java/parse.c:6261
 #, c-format
 msgid "syntax error, unexpected %s, expecting %s or %s or %s"
-msgstr ""
+msgstr "Syntaxfehler, unerwartetes %s; %s oder %s oder %s erwartet"
 
 #: gengtype-yacc.c:1657 java/parse-scan.c:3170 java/parse.c:6262
 #, c-format
 msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s"
-msgstr ""
+msgstr "Syntaxfehler, unerwartetes %s; %s oder %s oder %s oder %s erwartet"
 
 #. Depending on the version of Bison used to compile this grammar,
 #. it may issue generic diagnostics spelled "syntax error" or
@@ -1679,9 +1679,8 @@ msgid "--param max-inline-insns-single limit reached"
 msgstr "--param max-inline-insns-single: Limit erreicht"
 
 #: ipa-inline.c:312
-#, fuzzy
 msgid "--param max-inline-insns-auto limit reached"
-msgstr "--param max-inline-insns-single: Limit erreicht"
+msgstr "--param max-inline-insns-auto: Limit erreicht"
 
 #: ipa-inline.c:338 ipa-inline.c:764
 msgid "recursive inlining"
@@ -1689,7 +1688,7 @@ msgstr "rekursives inline"
 
 #: ipa-inline.c:777
 msgid "call is unlikely"
-msgstr ""
+msgstr "Aufruf ist unwahrscheinlich"
 
 #: ipa-inline.c:848
 msgid "--param inline-unit-growth limit reached"
@@ -1711,19 +1710,19 @@ msgstr "In Funktion %qs:"
 
 #: loop-iv.c:2709 tree-ssa-loop-niter.c:1026
 msgid "assuming that the loop is not infinite"
-msgstr ""
+msgstr "es wird angenommen, dass es sich nicht um eine Endlosschleife handelt"
 
 #: loop-iv.c:2710 tree-ssa-loop-niter.c:1027
 msgid "cannot optimize possibly infinite loops"
-msgstr ""
+msgstr "mögliche Endlosscheife kann nicht optimiert werden"
 
 #: loop-iv.c:2718 tree-ssa-loop-niter.c:1031
 msgid "assuming that the loop counter does not overflow"
-msgstr ""
+msgstr "es wird angenommen, dass die Schleifen-Zählvariable nicht überläuft"
 
 #: loop-iv.c:2719 tree-ssa-loop-niter.c:1032
 msgid "cannot optimize loop, the loop counter may overflow"
-msgstr ""
+msgstr "Schleife kann nicht optimiert werden, Schleifen-Zählvariable könnte überlaufen"
 
 #. What to print when a switch has no documentation.
 #: opts.c:90
@@ -2087,7 +2086,7 @@ msgstr "VOIDmode bei einer Ausgabe"
 
 #: reload1.c:7692
 msgid "Failure trying to reload:"
-msgstr ""
+msgstr "Neuladen gescheitert:"
 
 #: rtl-error.c:128
 msgid "unrecognizable insn:"
@@ -2123,12 +2122,12 @@ msgstr "sammeln: %s lesen\n"
 #: tlink.c:478
 #, c-format
 msgid "removing .rpo file"
-msgstr ""
+msgstr ".rpo-Datei wird gelöscht"
 
 #: tlink.c:480
 #, c-format
 msgid "renaming .rpo file"
-msgstr ""
+msgstr ".rpo-Datei wird umbenannt"
 
 #: tlink.c:534
 #, c-format
@@ -2151,19 +2150,18 @@ msgid "unrecoverable error"
 msgstr "nicht behebbarer Fehler"
 
 #: toplev.c:1114
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s%s%s version %s (%s)\n"
 "%s\tcompiled by GNU C version %s.\n"
 msgstr ""
 "%s%s%s Version %s (%s)\n"
 "%s\tkompiliert von GNU-C-Version %s.\n"
-"%s%s%s Version %s (%s) kompiliert von CC.\n"
 
 #: toplev.c:1116
 #, c-format
 msgid "%s%s%s version %s (%s) compiled by CC.\n"
-msgstr ""
+msgstr "%s%s%s Version %s (%s) kompiliert von CC.\n"
 
 #: toplev.c:1120
 #, c-format
@@ -2179,9 +2177,9 @@ msgid "options enabled: "
 msgstr "angeschaltete Optionen: "
 
 #: toplev.c:1330
-#, fuzzy, c-format
+#, c-format
 msgid "created and used with differing settings of '%s'"
-msgstr "erzeugt und mit anderen Einstellungen von »-m%s« verwendet"
+msgstr "erzeugt und mit anderen Einstellungen von »%s« verwendet"
 
 #: toplev.c:1332
 msgid "out of memory"
@@ -2238,17 +2236,15 @@ msgstr "zur Fehlersuche: "
 
 #: params.def:48
 msgid "The maximum number of fields in a structure variable without direct structure accesses that GCC will attempt to track separately"
-msgstr ""
+msgstr "Die Höchstzahl der Felder in einer Strukturvariable ohne direkte Strukturzugriffe, die GCC versuchen wird, gesondert zu zählen"
 
 #: params.def:57
-#, fuzzy
 msgid "The maximum structure size (in bytes) for which GCC will use by-element copies"
-msgstr "Die höchste Strukturgröße (in Bytes), bei der GCC Block-Kopien macht"
+msgstr "Die höchste Strukturgröße (in Bytes), bei der GCC elementweise Kopien verwenden wird"
 
 #: params.def:66
-#, fuzzy
 msgid "The maximum number of structure fields for which GCC will use by-element copies"
-msgstr "Die höchste Strukturgröße (in Bytes), bei der GCC Block-Kopien macht"
+msgstr "Die Höchstzahl der Strukturfelder, bei der GCC elementweise Kopien verwenden wird"
 
 #: params.def:78
 msgid "The threshold ratio between instantiated fields and the total structure size"
@@ -2280,10 +2276,9 @@ msgstr "Größte Tiefe mit rekursivem Inline für Nicht-Inline-Funktionen"
 
 #: params.def:132
 msgid "Inline recursively only when the probability of call being executed exceeds the parameter"
-msgstr ""
+msgstr "Rekursives inline nur, wenn die Wahrscheinlichkeit des Aufrufs den Parameter überschreitet"
 
 #: params.def:139
-#, fuzzy
 msgid "If -fvariable-expansion-in-unroller is used, the maximum number of times that an individual variable will be expanded during loop unrolling"
 msgstr "Wenn -fvariable-expansion-in-unroller verwendet wird, die Höchstzahl der Fälle, dass eine bestimmte Variable während Loop-Unrolling expandiert wird"
 
@@ -2308,18 +2303,16 @@ msgid "Maximal growth due to inlining of large function (in percent)"
 msgstr "Maximales Wachstum durch »inline« einer großen Funktion (in Prozent)"
 
 #: params.def:184
-#, fuzzy
 msgid "The size of translation unit to be considered large"
-msgstr "Die Größe eines als groß angesehenen Funktionskörpers"
+msgstr "Die Größe einer als groß angesehenen Übersetzungseinheit"
 
 #: params.def:188
 msgid "how much can given compilation unit grow because of the inlining (in percent)"
 msgstr "um wie viel eine Übersetzungseinheit durch »inline« wachsen kann (in Prozent)"
 
 #: params.def:192
-#, fuzzy
 msgid "expense of call operation relative to ordinary arithmetic operations"
-msgstr "Kosten der Aufrufoperation relativ zu gewöhnlichen arithmetischen Operationen"
+msgstr "Kosten einer Aufrufoperation relativ zu gewöhnlichen arithmetischen Operationen"
 
 #: params.def:199
 msgid "The maximum amount of memory to be allocated by GCSE"
@@ -2330,14 +2323,12 @@ msgid "The maximum number of passes to make when doing GCSE"
 msgstr "Die Höchstzahl der Durchläufe für GCSE"
 
 #: params.def:214
-#, fuzzy
 msgid "The threshold ratio for performing partial redundancy elimination after reload"
-msgstr "Der Anteil-Schwellwert für die Ausführung partieller Redundanzbeseitigung nach dem Neuladen."
+msgstr "Der Anteil-Schwellwert für die Ausführung partieller Redundanzbeseitigung nach dem Neuladen"
 
 #: params.def:221
-#, fuzzy
 msgid "The threshold ratio of critical edges execution count that permit performing redundancy elimination after reload"
-msgstr "Der Anteil-Schwellwert des Zählers kritischer Kanten, die Redundanzbeseitigung nach dem Neuladen erlauben"
+msgstr "Der Anteil-Schwellwert des Ausführungszählers kritischer Kanten, die Redundanzbeseitigung nach dem Neuladen erlauben"
 
 #: params.def:232
 msgid "The maximum number of instructions to consider to unroll in a loop"
@@ -2392,9 +2383,8 @@ msgid "A factor for tuning the upper bound that swing modulo scheduler uses for
 msgstr "Ein Faktor, um die obere Schranke des Swing-Modulo-Schedulers für Schleifenplanung einzustellen"
 
 #: params.def:301
-#, fuzzy
 msgid "The number of cycles the swing modulo scheduler considers when checking conflicts using DFA"
-msgstr "Anzahl der Durchläufe, die der Swing-Modulo-Scheduler bei \t  Konfliktprüfung mit DFA betrachtet"
+msgstr "Anzahl der Zyklen, die der Swing-Modulo-Scheduler bei Konfliktprüfung mit DFA betrachtet"
 
 #: params.def:305
 msgid "A threshold on the average loop count considered by the swing modulo scheduler"
@@ -2409,9 +2399,8 @@ msgid "Select fraction of the maximal frequency of executions of basic block in
 msgstr "Auswahl des Anteils an der Höchstfrequenz der Ausführungen des Basisblocks im Programm, vorausgesetzt, der Basisblock muss als »heiß« angesehen werden"
 
 #: params.def:330
-#, fuzzy
 msgid "The maximum number of loop iterations we predict statically"
-msgstr "Die Höchstzahl der Anweisungen für automatisches »inline«"
+msgstr "Die Höchstzahl der Schleifendurchläufe, die statisch vorhergesagt werden"
 
 #: params.def:334
 msgid "The percentage of function, weighted by execution frequency, that must be covered by trace formation. Used when profile feedback is available"
@@ -2447,7 +2436,7 @@ msgstr "Mindestanzahl der passenden zu betrachtenden Anweisungen für Kreuzsprun
 
 #: params.def:372
 msgid "The maximum expansion factor when copying basic blocks"
-msgstr ""
+msgstr "Der höchste Erweiterungsfaktor beim Kopieren von Basisblöcken"
 
 #: params.def:378
 msgid "The maximum number of insns to duplicate when unfactoring computed gotos"
@@ -2458,9 +2447,8 @@ msgid "The maximum length of path considered in cse"
 msgstr "Größte Länge des betrachteten Pfades in cse"
 
 #: params.def:388
-#, fuzzy
 msgid "The maximum instructions CSE process before flushing"
-msgstr "Die Höchstzahl der Anweisungen für RTL »inline«"
+msgstr "Die Höchstzahl der von CSE verarbeiteten Anweisungen vor dem Rücksetzen"
 
 #: params.def:395
 msgid "The minimum cost of an expensive expression in the loop invariant motion"
@@ -2484,7 +2472,7 @@ msgstr "Schranke für Größe von Ausdrücken im skalaren Evolutions-Analysierer
 
 #: params.def:430
 msgid "Bound on number of runtime checks inserted by the vectorizer's loop versioning"
-msgstr ""
+msgstr "Schranke für Anzahl der Laufzeitprüfungen, die von Schleifenversionierung des Vektorisierers eingefügt werden"
 
 #: params.def:437
 msgid "Given N calls and V call-clobbered vars in a function.  Use .GLOBAL_VAR if NxV is larger than this limit"
@@ -2495,9 +2483,8 @@ msgid "The maximum memory locations recorded by cselib"
 msgstr "Höchstzahl der Speicherstellen, die von cselib aufgezeichnet werden"
 
 #: params.def:446
-#, fuzzy
 msgid "The maximum memory locations recorded by flow"
-msgstr "Höchstzahl der Speicherstellen, die von cselib aufgezeichnet werden"
+msgstr "Höchstzahl der Speicherstellen, die vom Fluss aufgezeichnet werden"
 
 #: params.def:459
 msgid "Minimum heap expansion to trigger garbage collection, as a percentage of the total size of the heap"
@@ -2512,7 +2499,6 @@ msgid "The maximum number of instructions to search backward when looking for eq
 msgstr "Höchstzahl der rückwärts zu suchenden Anweisungen, wenn nach äquivalentem Neuladen gesucht wird"
 
 #: params.def:477
-#, fuzzy
 msgid "The maximum number of virtual operands allowed to represent aliases before triggering alias grouping"
 msgstr "Höchstzahl der erlaubten virtuellen Operanden, um Aliase vor Auslösen des Alias-Grouping zu repräsentieren"
 
@@ -2525,9 +2511,8 @@ msgid "The maximum number of insns in a region to be considered for interblock s
 msgstr "Höchstzahl der für Zwischen-Block-Scheduling zu betrachtenden Anweisungen in einer Region"
 
 #: params.def:492
-#, fuzzy
 msgid "The minimum probability of reaching a source block for interblock speculative scheduling"
-msgstr "Höchstzahl der für Zwischen-Block-Scheduling zu betrachtenden Blöcke in einer Region"
+msgstr "Die Mindestwahrscheinlichkeit für das Erreichen eines Quellblockes für spekulatives Zwischen-Block-Scheduling"
 
 #: params.def:497
 msgid "The maximum number of RTL nodes that can be recorded as combiner's last value"
@@ -2538,21 +2523,20 @@ msgid "The upper bound for sharing integer constants"
 msgstr "Obere Schranke zum gemeinsamen Verwenden von Ganzzahlkonstanten"
 
 #: params.def:524
-#, fuzzy
 msgid "Minimum number of virtual mappings to consider switching to full virtual renames"
-msgstr "Die Höchstzahl der zu betrachtenden Anweisungen um Verzögerungsschlitz zu füllen"
+msgstr "Mindestanzahl der zum Umschalten auf vollständige virtuelle Umbenennungen zu betrachtenden virtuellen Mappings"
 
 #: params.def:529
 msgid "Ratio between virtual mappings and virtual symbols to do full virtual renames"
-msgstr ""
+msgstr "Verhältnis zwischen virtuellen Mappings und virtuellen Symbolen für vollständige virtuelle Umbenennungen"
 
 #: params.def:534
 msgid "The lower bound for a buffer to be considered for stack smashing protection"
-msgstr ""
+msgstr "Untere Schranke für einen für Stack-Smashing-Protection betrachteten Puffer"
 
 #: params.def:552
 msgid "Maximum number of statements allowed in a block that needs to be duplicated when threading jumps"
-msgstr ""
+msgstr "Höchstzahl der in einem Block erlaubten Anweisungen, die für Sprungbehandlung vervielfältigt werden müssen"
 
 #: config/alpha/alpha.c:5069
 #, c-format
@@ -2821,9 +2805,8 @@ msgid "c4x_operand_subword: address not offsettable"
 msgstr "c4x_operand_subword: Adresse nicht versetzbar"
 
 #: config/c4x/c4x.c:4101
-#, fuzzy
 msgid "c4x_rptb_rpts_p: Repeat block top label moved"
-msgstr "c4x_rptb_rpts_p: Anfangsmarke des Wiederholungsblocks bewegt\n"
+msgstr "c4x_rptb_rpts_p: Anfangsmarke des Wiederholungsblocks bewegt"
 
 #. Use `%s' to print the string in case there are any escape
 #. characters in the message.
@@ -2850,14 +2833,12 @@ msgid "invalid operand for 'b' modifier"
 msgstr "ungültiger Operand für Modifizierer »b«"
 
 #: config/cris/cris.c:691
-#, fuzzy
 msgid "invalid operand for 'o' modifier"
-msgstr "ungültiger Operand für Modifizierer »b«"
+msgstr "ungültiger Operand für Modifizierer »o«"
 
 #: config/cris/cris.c:710
-#, fuzzy
 msgid "invalid operand for 'O' modifier"
-msgstr "ungültiger Operand für Modifizierer »b«"
+msgstr "ungültiger Operand für Modifizierer »O«"
 
 #: config/cris/cris.c:743
 msgid "invalid operand for 'p' modifier"
@@ -2897,7 +2878,7 @@ msgstr "ungültiger Operand für Modifizierer »T«"
 
 #: config/cris/cris.c:968
 msgid "invalid operand modifier letter"
-msgstr "ungültiger Operand für Modifizierer-Buchstaben"
+msgstr "ungültiger Modifizierer-Buchstabe für Operand"
 
 #: config/cris/cris.c:1025
 msgid "unexpected multiplicative operand"
@@ -2923,7 +2904,7 @@ msgstr "unerwartete Seiteneffekte in Adresse"
 #. right?
 #: config/cris/cris.c:3173
 msgid "Unidentifiable call op"
-msgstr ""
+msgstr "Unidentifizierbare Aufrufoperation"
 
 #: config/cris/cris.c:3208
 #, c-format
@@ -2977,18 +2958,15 @@ msgid "fr30_print_operand: unhandled MEM"
 msgstr "fr30_print_operand: unbehandeltes MEM"
 
 #: config/frv/frv.c:2541
-#, fuzzy
 msgid "bad insn to frv_print_operand_address:"
 msgstr "Falscher Befehl für frv_print_operand_address:"
 
 #: config/frv/frv.c:2552
-#, fuzzy
 msgid "bad register to frv_print_operand_memory_reference_reg:"
 msgstr "Falsches Register für frv_print_operand_memory_reference_reg:"
 
 #: config/frv/frv.c:2591 config/frv/frv.c:2601 config/frv/frv.c:2610
 #: config/frv/frv.c:2631 config/frv/frv.c:2636
-#, fuzzy
 msgid "bad insn to frv_print_operand_memory_reference:"
 msgstr "Falscher Befehl für frv_print_operand_memory_reference:"
 
@@ -2998,76 +2976,62 @@ msgid "bad condition code"
 msgstr "Falscher Bedingungscode"
 
 #: config/frv/frv.c:2797
-#, fuzzy
 msgid "bad insn in frv_print_operand, bad const_double"
 msgstr "Falscher Befehl in frv_print_operand, falsches const_double"
 
 #: config/frv/frv.c:2858
-#, fuzzy
 msgid "bad insn to frv_print_operand, 'e' modifier:"
 msgstr "Falscher Befehl für frv_print_operand, Modifizierer »e«:"
 
 #: config/frv/frv.c:2866
-#, fuzzy
 msgid "bad insn to frv_print_operand, 'F' modifier:"
 msgstr "Falscher Befehl für frv_print_operand, Modifizierer »F«:"
 
 #: config/frv/frv.c:2882
-#, fuzzy
 msgid "bad insn to frv_print_operand, 'f' modifier:"
 msgstr "Falscher Befehl für frv_print_operand, Modifizierer »f«:"
 
 #: config/frv/frv.c:2896
-#, fuzzy
 msgid "bad insn to frv_print_operand, 'g' modifier:"
 msgstr "Falscher Befehl für frv_print_operand, Modifizierer »g«:"
 
 #: config/frv/frv.c:2944
-#, fuzzy
 msgid "bad insn to frv_print_operand, 'L' modifier:"
 msgstr "Falscher Befehl für frv_print_operand, Modifizierer »L«:"
 
 #: config/frv/frv.c:2957
-#, fuzzy
 msgid "bad insn to frv_print_operand, 'M/N' modifier:"
 msgstr "Falscher Befehl für frv_print_operand, Modifizierer »M/N«:"
 
 #: config/frv/frv.c:2978
-#, fuzzy
 msgid "bad insn to frv_print_operand, 'O' modifier:"
 msgstr "Falscher Befehl für frv_print_operand, Modifizierer »O«:"
 
 #: config/frv/frv.c:2996
-#, fuzzy
 msgid "bad insn to frv_print_operand, P modifier:"
 msgstr "Falscher Befehl für frv_print_operand, Modifizierer »P«:"
 
 #: config/frv/frv.c:3016
-#, fuzzy
 msgid "bad insn in frv_print_operand, z case"
-msgstr "Falscher Befehl für frv_print_operand, Fall »z«:"
+msgstr "Falscher Befehl in frv_print_operand, Fall »z«:"
 
 #: config/frv/frv.c:3047
-#, fuzzy
 msgid "bad insn in frv_print_operand, 0 case"
-msgstr "Falscher Befehl für frv_print_operand, Fall 0:"
+msgstr "Falscher Befehl in frv_print_operand, Fall 0:"
 
 #: config/frv/frv.c:3052
 msgid "frv_print_operand: unknown code"
 msgstr "frv_print_operand: unbekannter Code"
 
 #: config/frv/frv.c:4421
-#, fuzzy
 msgid "bad output_move_single operand"
-msgstr "Falscher Operand für output_mode_single"
+msgstr "Falscher Operand für output_move_single"
 
 #: config/frv/frv.c:4548
-#, fuzzy
 msgid "bad output_move_double operand"
 msgstr "Falscher Operand für output_move_double"
 
 #: config/frv/frv.c:4690
-#, fuzzy
 msgid "bad output_condmove_single operand"
 msgstr "Falscher Operand für output_condmove_single"
 
@@ -3132,19 +3096,16 @@ msgid "ia64_print_operand: unknown code"
 msgstr "ia64_print_operand: unbekannter Code"
 
 #: config/ia64/ia64.c:8918
-#, fuzzy
 msgid "invalid conversion from %<__fpreg%>"
-msgstr "ungültige Umwandlung von %qT in %qT"
+msgstr "ungültige Umwandlung von %<__fpreg%>"
 
 #: config/ia64/ia64.c:8921
-#, fuzzy
 msgid "invalid conversion to %<__fpreg%>"
-msgstr "ungültige Umwandlung in Typ %qT von Typ %qT"
+msgstr "ungültige Umwandlung in %<__fpreg%>"
 
 #: config/ia64/ia64.c:8934 config/ia64/ia64.c:8945
-#, fuzzy
 msgid "invalid operation on %<__fpreg%>"
-msgstr "ungültiger Operand für Code %%p"
+msgstr "ungültige Operation auf %<__fpreg%>"
 
 #: config/iq2000/iq2000.c:3125
 #, c-format
@@ -3274,9 +3235,9 @@ msgid "invalid %%Y value"
 msgstr "ungültiger %%Y-Wert"
 
 #: config/mips/mips.c:5483 config/mips/mips.c:5491
-#, fuzzy, c-format
+#, c-format
 msgid "PRINT_OPERAND, invalid insn for %%q"
-msgstr "PRINT_OPERAND, ungültiger Befehl für %%W"
+msgstr "PRINT_OPERAND, ungültiger Befehl für %%q"
 
 #: config/mips/mips.c:5560
 msgid "PRINT_OPERAND, invalid operand for relocation"
@@ -3325,17 +3286,15 @@ msgstr "MMIX-intern: Dies ist keine Konstante:"
 
 #: config/ms1/ms1.c:302
 msgid "ms1_final_prescan_insn, invalid insn #1"
-msgstr ""
+msgstr "ms1_final_prescan_insn, ungültiger Befehl #1"
 
 #: config/ms1/ms1.c:373
-#, fuzzy
 msgid "PRINT_OPERAND_ADDRESS, 2 regs"
-msgstr "PRINT_OPERAND_ADDRESS, Null-Zeiger"
+msgstr "PRINT_OPERAND_ADDRESS, 2 Register"
 
 #: config/ms1/ms1.c:397
-#, fuzzy
 msgid "PRINT_OPERAND_ADDRESS, invalid insn #1"
-msgstr "PRINT_OPERAND_ADDRESS, Null-Zeiger"
+msgstr "PRINT_OPERAND_ADDRESS, ungültiger Befehl #1"
 
 #: config/rs6000/host-darwin.c:83
 #, c-format
@@ -3413,43 +3372,39 @@ msgid "invalid %%v value"
 msgstr "ungültiger %%v-Wert"
 
 #: config/rs6000/rs6000.c:19064
-#, fuzzy
 msgid "AltiVec argument passed to unprototyped function"
-msgstr "zu wenige Argumente für Funktion"
+msgstr "AltiVec-Argument an Funktion ohne Prototyp übergeben"
 
 #: config/s390/s390.c:4175
-#, fuzzy, c-format
+#, c-format
 msgid "cannot decompose address"
-msgstr "Adresse kann nicht zerlegt werden."
+msgstr "Adresse kann nicht zerlegt werden"
 
 #: config/s390/s390.c:4385
 msgid "UNKNOWN in print_operand !?"
 msgstr "UNKNOWN in print_operand !?"
 
 #: config/sh/sh.c:768
-#, fuzzy, c-format
+#, c-format
 msgid "invalid operand to %%R"
-msgstr "Ungültiger Operand für %%R-Code"
+msgstr "Ungültiger Operand für %%R"
 
 #: config/sh/sh.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "invalid operand to %%S"
-msgstr "ungültiger Operand für Code %%N"
+msgstr "ungültiger Operand für %%S"
 
 #: config/sh/sh.c:7661
-#, fuzzy
 msgid "created and used with different architectures / ABIs"
-msgstr "erzeugt und mit anderen Einstellungen von -fpie verwendet"
+msgstr "erzeugt und mit anderen Architekturen / ABIs verwendet"
 
 #: config/sh/sh.c:7663
-#, fuzzy
 msgid "created and used with different ABIs"
-msgstr "erzeugt und mit anderen Einstellungen von -fpic verwendet"
+msgstr "erzeugt und mit anderen ABIs verwendet"
 
 #: config/sh/sh.c:7665
-#, fuzzy
 msgid "created and used with different endianness"
-msgstr "erzeugt und mit anderen Einstellungen von -fpie verwendet"
+msgstr "erzeugt und mit anderer Endianness verwendet"
 
 #: config/sparc/sparc.c:6610 config/sparc/sparc.c:6616
 #, c-format
@@ -3588,14 +3543,12 @@ msgid "candidate 2:"
 msgstr "Kandidat 2:"
 
 #: cp/decl2.c:695
-#, fuzzy
 msgid "candidates are: %+#D"
-msgstr "Kandidaten sind:"
+msgstr "Kandidaten sind: %+#D"
 
 #: cp/decl2.c:697
-#, fuzzy
 msgid "candidate is: %+#D"
-msgstr "Kandidat 2:"
+msgstr "Kandidat ist: %+#D"
 
 #: cp/g++spec.c:238 java/jvspec.c:417
 #, c-format
@@ -3604,969 +3557,966 @@ msgstr "Argument für »%s« fehlt\n"
 
 #: fortran/arith.c:141
 msgid "Arithmetic OK at %L"
-msgstr ""
+msgstr "Arithmetik OK bei %L"
 
 #: fortran/arith.c:144
-#, fuzzy
 msgid "Arithmetic overflow at %L"
-msgstr "Annehmen, dass vorzeichenbehaftete arithmetische Überläufe regulär überschlagen"
+msgstr "Arithmetik-Überlauf bei %L"
 
 #: fortran/arith.c:147
 msgid "Arithmetic underflow at %L"
-msgstr ""
+msgstr "Arithmetik-Unterlauf bei %L"
 
 #: fortran/arith.c:150
 msgid "Arithmetic NaN at %L"
-msgstr ""
+msgstr "Arithmetisches NaN bei %L"
 
 #: fortran/arith.c:153
-#, fuzzy
 msgid "Division by zero at %L"
-msgstr "Division durch Null"
+msgstr "Division durch Null bei %L"
 
 #: fortran/arith.c:156
 msgid "Array operands are incommensurate at %L"
-msgstr ""
+msgstr "Feld-Operanden sind unzureichend bei %L"
 
 #: fortran/arith.c:160
 msgid "Integer outside symmetric range implied by Standard Fortran at %L"
-msgstr ""
+msgstr "Ganzzahl außerhalb symmetrischem Bereich wegen Standard-Fortran bei %L"
 
 #: fortran/arith.c:1384
-#, fuzzy
 msgid "Elemental binary operation"
-msgstr "Beherrscher-Optimierungen einschalten"
+msgstr "Elementare Binäroperation"
 
 #: fortran/arith.c:1914
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Arithmetic OK converting %s to %s at %L"
-msgstr "Fehler beim Konvertieren von %s in %s"
+msgstr "Arithmetik OK beim Konvertieren von %s in %s bei %L"
 
 #: fortran/arith.c:1918
 #, no-c-format
 msgid "Arithmetic overflow converting %s to %s at %L"
-msgstr ""
+msgstr "Arithmetischer Überlauf beim Konvertieren von %s in %s bei %L"
 
 #: fortran/arith.c:1922
 #, no-c-format
 msgid "Arithmetic underflow converting %s to %s at %L"
-msgstr ""
+msgstr "Arithmetischer Unterlauf beim Konvertieren von %s in %s bei %L"
 
 #: fortran/arith.c:1926
 #, no-c-format
 msgid "Arithmetic NaN converting %s to %s at %L"
-msgstr ""
+msgstr "Arithmetisches NaN bei Konvertieren von %s in %s bei %L"
 
 #: fortran/arith.c:1930
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Division by zero converting %s to %s at %L"
-msgstr "Division durch Null in %<%E / 0%>"
+msgstr "Division durch Null beim Konvertieren von %s in %s bei %L"
 
 #: fortran/arith.c:1934
 #, no-c-format
 msgid "Array operands are incommensurate converting %s to %s at %L"
-msgstr ""
+msgstr "Feldoperanden sind unzureichend beim Konvertieren von %s in %s bei %L"
 
 #: fortran/arith.c:1938
 #, no-c-format
 msgid "Integer outside symmetric range implied by Standard Fortran converting %s to %s at %L"
-msgstr ""
+msgstr "Ganzzahl außerhalb des symmetrischen Bereiches wegen Standard-Fortran-Konvertierung von %s in %s bei %L"
 
 #: fortran/arith.c:2271 fortran/arith.c:2306 fortran/arith.c:2343
 #: fortran/arith.c:2393
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "The Hollerith constant at %L is too long to convert to %s"
-msgstr "Zeichenkonstante bei %0 hat kein schließendes Hochkomma bei %1"
+msgstr "Hollerith-Konstante bei %L ist zu lang zum Konvertieren in %s"
 
 #: fortran/arith.c:2439
 #, no-c-format
 msgid "Enumerator exceeds the C integer type at %C"
-msgstr ""
+msgstr "Zähler übersteigt den C-Ganzzahltyp bei %C"
 
 #: fortran/array.c:97
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Expected array subscript at %C"
-msgstr "Feldindex hat Typ %<char%>"
+msgstr "Feldindex erwartet bei %C"
 
 #: fortran/array.c:124
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Expected array subscript stride at %C"
-msgstr "Feldindex hat Typ %<char%>"
+msgstr "Feldindexsprung erwartet bei %C"
 
 #: fortran/array.c:167
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Invalid form of array reference at %C"
-msgstr "Nullelement bei %0 für Feldreferenz bei %1"
+msgstr "Ungültige Form der Feldreferenz bei %C"
 
 #: fortran/array.c:172
 #, no-c-format
 msgid "Array reference at %C cannot have more than %d dimensions"
-msgstr ""
+msgstr "Feldreferenz bei %C kann nicht mehr als %d Dimensionen haben"
 
 #: fortran/array.c:224
 #, no-c-format
 msgid "Variable '%s' at %L in this context must be constant"
-msgstr ""
+msgstr "Variable »%s« bei %L muss in diesem Kontext eine Konstante sein"
 
 #: fortran/array.c:300
 #, no-c-format
 msgid "Expected expression in array specification at %C"
-msgstr ""
+msgstr "Erwarteter Ausdruck in Feldspezifikation bei %C"
 
 #: fortran/array.c:379
 #, no-c-format
 msgid "Bad array specification for an explicitly shaped array at %C"
-msgstr ""
+msgstr "Falsche Feldangabe für Feld mit explizit gebildeter Form bei %C"
 
 #: fortran/array.c:390
 #, no-c-format
 msgid "Bad array specification for assumed shape array at %C"
-msgstr ""
+msgstr "Falsche Feldangabe für Feld mit implizit gebildeter Form bei %C"
 
 #: fortran/array.c:403
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Bad specification for deferred shape array at %C"
-msgstr "Keine Spezifikation für implizierten DO-Iterator »%A« bei %0"
+msgstr "Falsche Spezifikation für Feld mit zurückgestellter Form bei %C"
 
 #: fortran/array.c:407
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Bad specification for assumed size array at %C"
-msgstr "Keine Spezifikation für implizierten DO-Iterator »%A« bei %0"
+msgstr "Falsche Spezifikation für Feld mit impliziter Größe bei %C"
 
 #: fortran/array.c:416
 #, no-c-format
 msgid "Expected another dimension in array declaration at %C"
-msgstr ""
+msgstr "Andere Dimension in Felddeklaration bei %C erwartet"
 
 #: fortran/array.c:422
 #, no-c-format
 msgid "Array specification at %C has more than %d dimensions"
-msgstr ""
+msgstr "Feldspezifikation bei %C hat mehr als %d Dimensionen"
 
 #: fortran/array.c:627
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "duplicated initializer"
 msgstr "ungültige Initialisierung"
 
 #: fortran/array.c:720
 #, no-c-format
 msgid "DO-iterator '%s' at %L is inside iterator of the same name"
-msgstr ""
+msgstr "DO-Iterator »%s« bei %L ist innerhalb eines Iterators mit gleichem Namen"
 
 #: fortran/array.c:822 fortran/array.c:931
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Syntax error in array constructor at %C"
-msgstr "Syntaxfehler in Makroparameterliste"
+msgstr "Syntaxfehler in Feldkonstruktor bei %C"
 
 #: fortran/array.c:877
 #, no-c-format
 msgid "New in Fortran 2003: [...] style array constructors at %C"
-msgstr ""
+msgstr "Neu in Fortran 2003: Feldkonstruktoren im [...]-Stil bei %C"
 
 #: fortran/array.c:891
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Empty array constructor at %C is not allowed"
-msgstr "Min/Max-Befehle nicht erlaubt"
+msgstr "Leerer Feldkonstruktor bei %C ist nicht erlaubt"
 
 #: fortran/array.c:976
 #, no-c-format
 msgid "Element in %s array constructor at %L is %s"
-msgstr ""
+msgstr "Element in Feldkonstruktor %s bei %L ist %s"
 
 #: fortran/array.c:1305
 #, no-c-format
 msgid "Iterator step at %L cannot be zero"
-msgstr ""
+msgstr "Iteratorschritt bei %L kann nicht Null sein"
 
 #: fortran/check.c:44
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be %s"
-msgstr "Argument von %<__builtin_args_info%> muss konstant sein"
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss %s sein"
 
 #: fortran/check.c:60
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be a numeric type"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss ein numerischer Typ sein"
 
 #: fortran/check.c:75 fortran/check.c:640 fortran/check.c:650
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be INTEGER or REAL"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss INTEGER oder REAL sein"
 
 #: fortran/check.c:92
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be REAL or COMPLEX"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss REAL oder COMPLEX sein"
 
 #: fortran/check.c:118
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be a constant"
-msgstr "Argument 1 von __builtin_spe_predicate muss eine Konstante sein"
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss eine Konstante sein"
 
 #: fortran/check.c:126
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Invalid kind for %s at %L"
-msgstr "Ungültige Umwandlung von %qs in %qs"
+msgstr "Ungültige Art für %s bei %L"
 
 #: fortran/check.c:146
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be double precision"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss doppelte Genauigkeit haben"
 
 #: fortran/check.c:163
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be a logical array"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss ein logisches Feld sein"
 
 #: fortran/check.c:180
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be an array"
-msgstr "Argument 1 von __builtin_spe_predicate muss eine Konstante sein"
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss ein Feld sein"
 
 #: fortran/check.c:195
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be a scalar"
-msgstr "Argument 1 von __builtin_spe_predicate muss eine Konstante sein"
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss ein Skalar sein"
 
 #: fortran/check.c:210
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be the same type and kind as '%s'"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss vom gleichen Typ und gleicher Art wie »%s« sein"
 
 #: fortran/check.c:225
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be of rank %d"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss vom Rang %d sein"
 
 #: fortran/check.c:239
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must not be OPTIONAL"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L darf nicht OPTIONAL sein"
 
 #: fortran/check.c:259
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be of kind %d"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss von der Art %d sein"
 
 #: fortran/check.c:280
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L cannot be INTENT(IN)"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L kann nicht INTENT(IN) sein"
 
 #: fortran/check.c:286
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be a variable"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss eine Variable sein"
 
 #: fortran/check.c:311
 #, no-c-format
 msgid "Missing DIM parameter in intrinsic '%s' at %L"
-msgstr ""
+msgstr "Fehlender Parameter DIM in intrinsischem »%s« bei %L"
 
 #: fortran/check.c:348
 #, no-c-format
 msgid "'dim' argument of '%s' intrinsic at %L is not a valid dimension index"
-msgstr ""
+msgstr "Argument »dim« des intrinsischen »%s« bei %L ist kein gültiger Dimensionsindex"
 
 #: fortran/check.c:434
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be ALLOCATABLE"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss ALLOCATABLE sein"
 
 #: fortran/check.c:473 fortran/check.c:1619
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be a POINTER"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss ein POINTER sein"
 
 #: fortran/check.c:485
 #, no-c-format
 msgid "NULL pointer at %L is not permitted as actual argument of '%s' intrinsic function"
-msgstr ""
+msgstr "NULL-Zeiger bei %L ist nicht als effektives Argument der intrinsischen Funktion »%s« erlaubt"
 
 #: fortran/check.c:494
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be a POINTER or a TARGET"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss ein POINTER oder ein TARGET sein"
 
 #: fortran/check.c:510
 #, no-c-format
 msgid "Array section with a vector subscript at %L shall not be the target of a pointer"
-msgstr ""
+msgstr "Feldabschnitt mit Vektorindex bei %L sollte nicht das Ziel eines Zeigers sein"
 
 #: fortran/check.c:620 fortran/check.c:722
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must not be present if 'x' is COMPLEX"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L darf nicht vorhanden sein, wenn »x« COMPLEX ist"
 
 #: fortran/check.c:771 fortran/check.c:1423 fortran/check.c:1431
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be numeric or LOGICAL"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss numerisch oder LOGICAL"
 
 #: fortran/check.c:920 fortran/check.c:1055 fortran/check.c:1118
 #: fortran/check.c:1343
 #, no-c-format
 msgid "Extension: Different type kinds at %L"
-msgstr ""
+msgstr "Erweiterung: Verschiedene Typ-Arten bei %L"
 
 #: fortran/check.c:1025
 #, no-c-format
 msgid "Argument of %s at %L must be of length one"
-msgstr ""
+msgstr "Argument von %s bei %L muss von der Länge eins sein"
 
 #: fortran/check.c:1077
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be the same kind as '%s'"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss von der selben Art wie »%s« sein"
 
 #: fortran/check.c:1192
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be a non-derived type"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L darf kein abgeleiteter Typ sein"
 
 #: fortran/check.c:1315
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Intrinsic '%s' at %L must have at least two arguments"
-msgstr "%qD muss genau zwei Argumente nehmen"
+msgstr "Das intrinsische »%s« bei %L muss mindestens zwei Argumente haben"
 
 #: fortran/check.c:1349
 #, no-c-format
 msgid "'a%d' argument of '%s' intrinsic at %L must be %s(%d)"
-msgstr ""
+msgstr "Argument »a%d« des intrinsischen »%s« bei %L muss %s(%d) sein"
 
 #: fortran/check.c:1374
 #, no-c-format
 msgid "'a1' argument of '%s' intrinsic at %L must be INTEGER or REAL"
-msgstr ""
+msgstr "Argument »a1« des intrinsischen »%s« bei %L muss INTEGER oder REAL sein"
 
 #: fortran/check.c:1452
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be of rank 1 or 2"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss vom Rang 1 oder 2 sein"
 
 #: fortran/check.c:1640
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be conformable with '%s' argument"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss zu Argument »%s« passen"
 
 #: fortran/check.c:1667
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be of type REAL or COMPLEX"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss vom Typ REAL oder COMPLEX sein"
 
 #: fortran/check.c:1688
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be of a dummy variable"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss eine Scheinvariable sein"
 
 #: fortran/check.c:1696
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be of an OPTIONAL dummy variable"
-msgstr ""
+msgstr "Argument »%s« des intrinsischen »%s« bei %L muss eine OPTIONALe Scheinvariable sein"
 
 #: fortran/check.c:1812
 #, no-c-format
 msgid "'shape' argument of 'reshape' intrinsic at %L must be an array of constant size"
-msgstr ""
+msgstr "Argument »shape« des intrinsischen »reshape« bei %L muss ein Feld konstanter Größe sein"
 
 #: fortran/check.c:1822
 #, no-c-format
 msgid "'shape' argument of 'reshape' intrinsic at %L has more than %d elements"
-msgstr ""
+msgstr "Argument »shape« des intrinsischen »reshape« bei %L hat mehr als %d Elemente"
 
 #: fortran/check.c:1910
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Missing arguments to %s intrinsic at %L"
-msgstr "fehlendes Argument für »%s«-Option"
+msgstr "Fehlende Argumente für intrinsisches %s bei %L"
 
 #: fortran/check.c:1951
 #, no-c-format
 msgid "'source' argument of 'shape' intrinsic at %L must not be an assumed size array"
-msgstr ""
+msgstr "Argument »source« des intrinsischen »shape« bei %L darf kein Feld impliziter Größe sein"
 
 #: fortran/check.c:2013
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be less than rank %d"
-msgstr "Argument für Attribut %qs ist größer als %d"
+msgstr "Argument »%s« für intrinsisches »%s« bei %L muss geringer als Rang %d sein"
 
 #: fortran/check.c:2470 fortran/check.c:2490
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Too many arguments to %s at %L"
-msgstr "zu viele Argumente für %s %q+#D"
+msgstr "Zu viele Argumente für %s bei %L"
 
 #: fortran/check.c:2618 fortran/check.c:2980 fortran/check.c:3004
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be INTEGER or PROCEDURE"
-msgstr ""
+msgstr "Argument »%s« für intrinsisches »%s« bei %L muss INTEGER oder PROCEDURE sein"
 
 #: fortran/check.c:3051 fortran/check.c:3059
 #, no-c-format
 msgid "'%s' argument of '%s' intrinsic at %L must be INTEGER or LOGICAL"
-msgstr ""
+msgstr "Argument »%s« für intrinsisches »%s« bei %L muss INTEGER oder LOGICAL sein"
 
 #: fortran/check.c:3066
 #, no-c-format
 msgid "'%s' and '%s' arguments of '%s' intrinsic at %L must have the same type"
-msgstr ""
+msgstr "Argumente »%s« und »%s« des intrinsischen »%s« bei %L müssen den selben Typ haben"
 
 #: fortran/data.c:63
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "non-constant array in DATA statement %L."
-msgstr "nichtkonstanter Feldindex in Initialisierung"
+msgstr "nichtkonstantes Feld in DATA-Anweisung %L."
 
 #: fortran/data.c:327
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Extension: re-initialization of '%s' at %L"
-msgstr "%s: Definition von »%s« bei %s(%d) gefunden\n"
+msgstr "Erweiterung: Reinitialisierung von »%s« bei %L"
 
 #: fortran/decl.c:208
 #, no-c-format
 msgid "Host associated variable '%s' may not be in the DATA statement at %C."
-msgstr ""
+msgstr "Mit Host verbundene Variable »%s« darf nicht in DATA-Anweisung bei %C stehen"
 
 #: fortran/decl.c:215
 #, no-c-format
 msgid "Extension: initialization of common block variable '%s' in DATA statement at %C"
-msgstr ""
+msgstr "Erweiterung: Initialisierung der allgemeinen Blockvariable »%s« in DATA-Anweisung bei %C"
 
 #: fortran/decl.c:301
 #, no-c-format
 msgid "Symbol '%s' must be a PARAMETER in DATA statement at %C"
-msgstr ""
+msgstr "Symbol »%s« muss ein PARAMETER in DATA-Anweisung bei %C sein"
 
 #: fortran/decl.c:408
 #, no-c-format
 msgid "Initialization at %C is not allowed in a PURE procedure"
-msgstr ""
+msgstr "Initialisierung bei %C ist in PURE-Prozedur nicht erlaubt"
 
 #: fortran/decl.c:455
 #, no-c-format
 msgid "DATA statement at %C is not allowed in a PURE procedure"
-msgstr ""
+msgstr "DATA-Anweisung bei %C ist in PURE-Prozedur nicht erlaubt"
 
 #: fortran/decl.c:483
 #, no-c-format
 msgid "Bad INTENT specification at %C"
-msgstr ""
+msgstr "Falsche INTENT-Spezifikation bei %C"
 
 #: fortran/decl.c:547
 #, no-c-format
 msgid "Syntax error in character length specification at %C"
-msgstr ""
+msgstr "Syntaxfehler in Zeichenlängenangabe bei %C"
 
 #: fortran/decl.c:779
 #, no-c-format
 msgid "Initializer not allowed for PARAMETER '%s' at %C"
-msgstr ""
+msgstr "Initialisierung für PARAMETER »%s« bei %C nicht erlaubt"
 
 #: fortran/decl.c:788
 #, no-c-format
 msgid "Initializer not allowed for COMMON variable '%s' at %C"
-msgstr ""
+msgstr "Initialisierung für COMMON-Variable »%s« bei %C nicht erlaubt"
 
 #: fortran/decl.c:798
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "PARAMETER at %L is missing an initializer"
-msgstr "fehlende Initialisierung"
+msgstr "fehlende Initialisierung für PARAMETER bei %L"
 
 #: fortran/decl.c:809
 #, no-c-format
 msgid "Variable '%s' at %C with an initializer already appears in a DATA statement"
-msgstr ""
+msgstr "Variable »%s« bei %C mit Initialisierung tritt bereits in einer DATA-Anweisung auf"
 
 #: fortran/decl.c:887
 #, no-c-format
 msgid "Component at %C must have the POINTER attribute"
-msgstr ""
+msgstr "Komponente bei %C muss ein POINTER-Attribut haben"
 
 #: fortran/decl.c:896
 #, no-c-format
 msgid "Array component of structure at %C must have explicit or deferred shape"
-msgstr ""
+msgstr "Feldkomponente der Struktur bei %C muss explizite oder aufgeschobene Form haben"
 
 #: fortran/decl.c:925
 #, no-c-format
 msgid "Pointer array component of structure at %C must have a deferred shape"
-msgstr ""
+msgstr "Zeigerfeld-Komponente der Struktur bei %C muss eine aufgeschobene Form haben"
 
 #: fortran/decl.c:935
 #, no-c-format
 msgid "Array component of structure at %C must have an explicit shape"
-msgstr ""
+msgstr "Feldkomponente der Struktur bei %C muss eine explizite Form haben"
 
 #: fortran/decl.c:961
 #, no-c-format
 msgid "NULL() initialization at %C is ambiguous"
-msgstr ""
+msgstr "NULL()-Initialisierung bei %C ist mehrdeutig"
 
 #: fortran/decl.c:1028
 #, no-c-format
 msgid "Enumerator cannot be array at %C"
-msgstr ""
+msgstr "Aufzählung kann kein Feld bei %C sein"
 
 #: fortran/decl.c:1089 fortran/decl.c:3297
 #, no-c-format
 msgid "Duplicate array spec for Cray pointee at %C."
-msgstr ""
+msgstr "Doppelte Feldspezifikation für Cray-Adresse bei %C."
 
 #: fortran/decl.c:1141
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Function name '%s' not allowed at %C"
-msgstr "%JAbschnitts-Attribut nicht erlaubt für %qD"
+msgstr "Funktionsname »%s« nicht erlaubt bei %C"
 
 #: fortran/decl.c:1157
 #, no-c-format
 msgid "Extension: Old-style initialization at %C"
-msgstr ""
+msgstr "Erweiterung: Initialisierung im alten Stil bei %C"
 
 #: fortran/decl.c:1173
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Initialization at %C isn't for a pointer variable"
-msgstr "Initialisierung erzeugt Ganzzahl von Zeiger ohne Typkonvertierung"
+msgstr "Initialisierung bei %C ist nicht für eine Zeigervariable"
 
 #: fortran/decl.c:1181
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Pointer initialization requires a NULL at %C"
-msgstr "(nahe der Initialisierung für %qs)"
+msgstr "Zeigerinitialisierung benötigt NULL bei %C"
 
 #: fortran/decl.c:1188
 #, no-c-format
 msgid "Initialization of pointer at %C is not allowed in a PURE procedure"
-msgstr ""
+msgstr "Initialisierung des Zeigers bei %C ist nicht in einer PURE-Prozedur erlaubt"
 
 #: fortran/decl.c:1204
 #, no-c-format
 msgid "Pointer initialization at %C requires '=>', not '='"
-msgstr ""
+msgstr "Zeigerinitialisierung bei %C benötigt »=>«, nicht »=«"
 
 #: fortran/decl.c:1212
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Expected an initialization expression at %C"
-msgstr "»]« erwartet, ungültiger Typausdruck"
+msgstr "Initialisierungsausdruck bei %C erwartet"
 
 #: fortran/decl.c:1219
 #, no-c-format
 msgid "Initialization of variable at %C is not allowed in a PURE procedure"
-msgstr ""
+msgstr "Initialisierung einer Variablen bei %C ist in einer PURE-Prozedur nicht erlaubt"
 
 #: fortran/decl.c:1241
 #, no-c-format
 msgid "ENUMERATOR %L not initialized with integer expression"
-msgstr ""
+msgstr "ENUMERATOR %L nicht mit Ganzzahlausdruck initialisiert"
 
 #: fortran/decl.c:1298
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Old-style kind %d not supported for type %s at %C"
-msgstr "-fdata-sections wird für dieses Ziel nicht unterstützt"
+msgstr "Die Art %d im alten Stil wird für Typ %s bei %C nicht unterstützt"
 
 #: fortran/decl.c:1334
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Expected initialization expression at %C"
-msgstr "»]« erwartet, ungültiger Typausdruck"
+msgstr "Initialisierungsausdruck bei %C erwartet"
 
 #: fortran/decl.c:1340
 #, no-c-format
 msgid "Expected scalar initialization expression at %C"
-msgstr ""
+msgstr "Skalaren Initialisierungsausdruck bei %C erwartet"
 
 #: fortran/decl.c:1358
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Kind %d not supported for type %s at %C"
-msgstr "Rundungsmodus für VAX-Floats nicht unterstützt"
+msgstr "Die Art %d wird für Typ %s bei %C nicht unterstützt"
 
 #: fortran/decl.c:1367
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Missing right paren at %C"
-msgstr "fehlendes Argument für »%s«"
+msgstr "Fehlende rechte Klammer bei %C"
 
 #: fortran/decl.c:1456 fortran/decl.c:1499
 #, no-c-format
 msgid "Kind %d is not a CHARACTER kind at %C"
-msgstr ""
+msgstr "Die Art %d ist kein CHARACTER bei %C"
 
 #: fortran/decl.c:1493
 #, no-c-format
 msgid "Syntax error in CHARACTER declaration at %C"
-msgstr ""
+msgstr "Syntaxfehler in CHARACTER-Deklaration bei %C"
 
 #: fortran/decl.c:1554
 #, no-c-format
 msgid "Extension: BYTE type at %C"
-msgstr ""
+msgstr "Erweiterung: BYTE-Typ bei %C"
 
 #: fortran/decl.c:1560
 #, no-c-format
 msgid "BYTE type used at %C is not available on the target machine"
-msgstr ""
+msgstr "Bei %C verwendeter BYTE-Typ ist auf der Zielmaschine nicht verfügbar"
 
 #: fortran/decl.c:1628
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Type name '%s' at %C is ambiguous"
-msgstr "Referenz auf %qD ist mehrdeutig"
+msgstr "Typname »%s« bei %C ist mehrdeutig"
 
 #: fortran/decl.c:1694
 #, no-c-format
 msgid "Missing character range in IMPLICIT at %C"
-msgstr ""
+msgstr "Fehlender Zeichenbereich in IMPLICIT bei %C"
 
 #: fortran/decl.c:1740
 #, no-c-format
 msgid "Letters must be in alphabetic order in IMPLICIT statement at %C"
-msgstr ""
+msgstr "Buchstaben in IMPLICIT-Anweisung bei %C müssen in alphabetischer Reihenfolge sein"
 
 #: fortran/decl.c:1794
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Empty IMPLICIT statement at %C"
-msgstr "Nicht unterstützte VXT-Anweisung bei %0"
+msgstr "Leere IMPLICIT-Anweisung bei %C"
 
 #: fortran/decl.c:1958
 #, no-c-format
 msgid "Enumerator cannot have attributes %C"
-msgstr ""
+msgstr "Zähler kann nicht Attribute %C haben"
 
 #: fortran/decl.c:1971
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Missing dimension specification at %C"
-msgstr "Fehlender Spezifizierer %A in Anweisung bei %0"
+msgstr "Fehlende Dimensionsangabe bei %C"
 
 #: fortran/decl.c:2053
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Duplicate %s attribute at %L"
-msgstr "Doppelte %s Deklaration %qs"
+msgstr "Doppeltes Attribut %s bei %L"
 
 #: fortran/decl.c:2070
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Attribute at %L is not allowed in a TYPE definition"
-msgstr "bei einer Funktionsdefinition sind keine Attribute erlaubt"
+msgstr "Attribut bei %L ist in TYPE-Definition nicht erlaubt"
 
 #: fortran/decl.c:2084
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "%s attribute at %L is not allowed outside of a MODULE"
-msgstr "%JAbschnitts-Attribut nicht erlaubt für %qD"
+msgstr "Attribut %s bei %L ist außerhalb eines MODULEs nicht erlaubt"
 
 #. Now we have an error, which we signal, and then fix up
 #. because the knock-on is plain and simple confusing.
 #: fortran/decl.c:2222
 #, no-c-format
 msgid "Derived type at %C has not been previously defined and so cannot appear in a derived type definition."
-msgstr ""
+msgstr "Abgeleiteter Typ bei %C wurde vorher nicht definiert und kann daher nicht in einer abgeleiteten Typdefinition auftreten."
 
 #: fortran/decl.c:2252
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Syntax error in data declaration at %C"
-msgstr "Syntaxfehler in Makroparameterliste"
+msgstr "Syntaxfehler in Daten-Deklaration bei %C"
 
 #: fortran/decl.c:2398
 #, no-c-format
 msgid "Name '%s' at %C is the name of the procedure"
-msgstr ""
+msgstr "Name »%s« bei %C ist der Name der Prozedur"
 
 #: fortran/decl.c:2410
 #, no-c-format
 msgid "Unexpected junk in formal argument list at %C"
-msgstr ""
+msgstr "Unerwartete Angaben in formaler Argumentliste bei %C"
 
 #: fortran/decl.c:2428
 #, no-c-format
 msgid "Duplicate symbol '%s' in formal argument list at %C"
-msgstr ""
+msgstr "Doppeltes Symbol »%s« in formaler Argumentliste bei %C"
 
 #: fortran/decl.c:2471
 #, no-c-format
 msgid "Unexpected junk following RESULT variable at %C"
-msgstr ""
+msgstr "Unerwartete Angaben nach RESULT-Variable bei %C"
 
 #: fortran/decl.c:2478
 #, no-c-format
 msgid "RESULT variable at %C must be different than function name"
-msgstr ""
+msgstr "RESULT-Variable bei %C muss vom Funktionsnamen verschieden sein"
 
 #: fortran/decl.c:2533
 #, no-c-format
 msgid "Expected formal argument list in function definition at %C"
-msgstr ""
+msgstr "Formale Argumentliste in Funktionsdefinition bei %C erwartet"
 
 #: fortran/decl.c:2544
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Unexpected junk after function declaration at %C"
-msgstr "steht mit Funktionsdeklaration %q#D in Konflikt"
+msgstr "Unerwartete Angaben hinter Funktionsdeklaration bei %C"
 
 #: fortran/decl.c:2565
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Function '%s' at %C already has a type of %s"
-msgstr "Funktionsanfänge werden zu dieser Zweierpotenz ausgerichtet"
+msgstr "Funktion »%s« bei %C hat bereits den Typ %s"
 
 #: fortran/decl.c:2613
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within a PROGRAM"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines PROGRAMmes auftreten"
 
 #: fortran/decl.c:2616
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within a MODULE"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines MODULEs auftreten"
 
 #: fortran/decl.c:2620
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within a BLOCK DATA"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb von BLOCK DATA auftreten"
 
 #: fortran/decl.c:2624
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within an INTERFACE"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb von INTERFACE auftreten"
 
 #: fortran/decl.c:2628
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within a DERIVED TYPE block"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines DERIVED TYPE Blockes auftreten"
 
 #: fortran/decl.c:2633
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within an IF-THEN block"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines IF-THEN-Blockes auftreten"
 
 #: fortran/decl.c:2637
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ENTRY statement at %C cannot appear within a DO block"
-msgstr "RETURN-Anweisung bei %0 ungültig innerhalb Hauptprogrammeinheit"
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines DO-Blockes auftreten"
 
 #: fortran/decl.c:2641
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within a SELECT block"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines SELECT-Blockes auftreten"
 
 #: fortran/decl.c:2645
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within a FORALL block"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines FORALL-Blockes auftreten"
 
 #: fortran/decl.c:2649
 #, no-c-format
 msgid "ENTRY statement at %C cannot appear within a WHERE block"
-msgstr ""
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines WHERE-Blockes auftreten"
 
 #: fortran/decl.c:2653
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ENTRY statement at %C cannot appear within a contained subprogram"
-msgstr "RETURN-Anweisung bei %0 ungültig innerhalb Hauptprogrammeinheit"
+msgstr "ENTRY-Anweisung bei %C kann nicht innerhalb eines enthaltenen Subprogrammes auftreten"
 
 #: fortran/decl.c:2666
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ENTRY statement at %C cannot appear in a contained procedure"
-msgstr "%s kann nicht in einem Konstanten-Ausdruck auftreten"
+msgstr "ENTRY-Anweisung bei %C kann nicht in einer enthaltenen Prozedur auftreten"
 
 #: fortran/decl.c:2741
 #, no-c-format
 msgid "RESULT attribute required in ENTRY statement at %C"
-msgstr ""
+msgstr "RESULT-Attribut in ENTRY-Anweisung bei %C benötigt"
 
 #: fortran/decl.c:2982
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Unexpected END statement at %C"
-msgstr "Nicht unterstützte VXT-Anweisung bei %0"
+msgstr "Unerwartete END-Anweisung bei %C"
 
 #. We would have required END [something]
 #: fortran/decl.c:2991
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "%s statement expected at %L"
-msgstr "%s %qs kann %s %qs nicht implementieren oder erweitern"
+msgstr "%s-Anweisung bei %L erwartet"
 
 #: fortran/decl.c:3002
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Expecting %s statement at %C"
-msgstr "Zusätzliches Komma in FORTRAN-Anweisung bei %0"
+msgstr "%s-Anweisung bei %C erwartet"
 
 #: fortran/decl.c:3016
 #, no-c-format
 msgid "Expected block name of '%s' in %s statement at %C"
-msgstr ""
+msgstr "Blocknamen von »%s« in %s-Anweisung bei %C erwartet"
 
 #: fortran/decl.c:3032
 #, no-c-format
 msgid "Expected terminating name at %C"
-msgstr ""
+msgstr "Beendenden Namen bei %C erwartet"
 
 #: fortran/decl.c:3041
 #, no-c-format
 msgid "Expected label '%s' for %s statement at %C"
-msgstr ""
+msgstr "Marke »%s« für %s-Anweisung bei %C erwartet"
 
 #: fortran/decl.c:3096
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Missing array specification at %L in DIMENSION statement"
-msgstr "Fehlender Spezifizierer %A in Anweisung bei %0"
+msgstr "Fehlende Feldspezifikation bei %L in DIMENSION-Anweisung"
 
 #: fortran/decl.c:3105
 #, no-c-format
 msgid "Array specification must be deferred at %L"
-msgstr ""
+msgstr "Feldspezifikation muss bei %L aufgeschoben werden"
 
 #: fortran/decl.c:3176
 #, no-c-format
 msgid "Unexpected character in variable list at %C"
-msgstr ""
+msgstr "Unerwartetes Zeichen in Variablenliste bei %C"
 
 #: fortran/decl.c:3213
 #, no-c-format
 msgid "Expected '(' at %C"
-msgstr ""
+msgstr "»(« bei %C erwartet"
 
 #: fortran/decl.c:3227 fortran/decl.c:3268
 #, no-c-format
 msgid "Expected variable name at %C"
-msgstr ""
+msgstr "Variablennamen bei %C erwartet"
 
 #: fortran/decl.c:3243
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Cray pointer at %C must be an integer."
-msgstr "Prädikat muss ein Bezeichner sein"
+msgstr "Cray-Zeiger bei %C muss eine Ganzzahl sein."
 
 #: fortran/decl.c:3247
 #, no-c-format
 msgid "Cray pointer at %C has %d bytes of precision; memory addresses require %d bytes."
-msgstr ""
+msgstr "Cray-Zeiger bei %C hat %d Bytes Genauigkeit; Speicheradressen benötigen %d Bytes."
 
 #: fortran/decl.c:3254
 #, no-c-format
 msgid "Expected \",\" at %C"
-msgstr ""
+msgstr "»,« bei %C erwartet"
 
 #: fortran/decl.c:3317
 #, no-c-format
 msgid "Expected \")\" at %C"
-msgstr ""
+msgstr "»)« bei %C erwartet"
 
 #: fortran/decl.c:3329
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Expected \",\" or end of statement at %C"
-msgstr "Nicht unterstützte VXT-Anweisung bei %0"
+msgstr "»,« oder Ende der Anweisung bei %C erwartet"
 
 #: fortran/decl.c:3394
 #, no-c-format
 msgid "Cray pointer declaration at %C requires -fcray-pointer flag."
-msgstr ""
+msgstr "Cray-Zeiger-Deklaration bei %C benötigt den Schalter -fcray-pointer."
 
 #: fortran/decl.c:3492
 #, no-c-format
 msgid "Access specification of the %s operator at %C has already been specified"
-msgstr ""
+msgstr "Zugriffsspezifikation des Operators %s bei %C wurde bereits spezifiziert"
 
 #: fortran/decl.c:3510
 #, no-c-format
 msgid "Access specification of the .%s. operator at %C has already been specified"
-msgstr ""
+msgstr "Zugriffsspezifikation des Operators .%s. bei %C wurde bereits spezifiziert"
 
 #: fortran/decl.c:3597
 #, no-c-format
 msgid "Expected variable name at %C in PARAMETER statement"
-msgstr ""
+msgstr "Variablennamen bei %C in PARAMETER-Anweisung erwartet"
 
 #: fortran/decl.c:3604
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Expected = sign in PARAMETER statement at %C"
-msgstr "Falsches Vorzeichen in FORMAT-Anweisung bei %0"
+msgstr "Zeichen »=« in PARAMATER-Anweisung bei %C erwartet"
 
 #: fortran/decl.c:3610
 #, no-c-format
 msgid "Expected expression at %C in PARAMETER statement"
-msgstr ""
+msgstr "Ausdruck bei %C in PARAMETER-Anweisung erwartet"
 
 #: fortran/decl.c:3668
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Unexpected characters in PARAMETER statement at %C"
-msgstr "Zusätzliches Komma in FORTRAN-Anweisung bei %0"
+msgstr "Unerwartete Zeichen in PARAMETER-Anweisung bei %C"
 
 #: fortran/decl.c:3693
 #, no-c-format
 msgid "Blanket SAVE statement at %C follows previous SAVE statement"
-msgstr ""
+msgstr "Umfassende SAVE-Anweisung bei %C folgt vorheriger SAVE-Anweisung"
 
 #: fortran/decl.c:3706
 #, no-c-format
 msgid "SAVE statement at %C follows blanket SAVE statement"
-msgstr ""
+msgstr "SAVE-Anweisung bei %C folgt umfassender SAVE-Anweisung"
 
 #: fortran/decl.c:3752
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Syntax error in SAVE statement at %C"
-msgstr "Falsche Zahl in FORMAT-Anweisung bei %0"
+msgstr "Syntaxfehler in SAVE-Anweisung bei %C"
 
 #: fortran/decl.c:3773
 #, no-c-format
 msgid "MODULE PROCEDURE at %C must be in a generic module interface"
-msgstr ""
+msgstr "MODULE PROCEDURE bei %C muss in einer generischen Modulschnittstelle sein"
 
 #: fortran/decl.c:3833
 #, no-c-format
 msgid "Derived type at %C can only be PRIVATE within a MODULE"
-msgstr ""
+msgstr "Abgeleiteter Typ bei %C kann nur PRIVATE innerhalb eines MODULEs sein"
 
 #: fortran/decl.c:3846
 #, no-c-format
 msgid "Derived type at %C can only be PUBLIC within a MODULE"
-msgstr ""
+msgstr "Abgeleiteter Typ bei %C kann nur PUBLIC innerhalb eines MODULEs sein"
 
 #: fortran/decl.c:3857
 #, no-c-format
 msgid "Expected :: in TYPE definition at %C"
-msgstr ""
+msgstr "»::« in TYPE-Definition bei %C erwartet"
 
 #: fortran/decl.c:3874
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Type name '%s' at %C cannot be the same as an intrinsic type"
-msgstr "Typname bei %0 ist nicht der gleiche wie Name bei %1"
+msgstr "Typname »%s« bei %C kann nicht der gleiche wie ein intrinsischer Typ sein"
 
 #: fortran/decl.c:3884
 #, no-c-format
 msgid "Derived type name '%s' at %C already has a basic type of %s"
-msgstr ""
+msgstr "Abgeleiteter Typname bei »%s« bei %C hat bereits einen Basistypen von %s"
 
 #: fortran/decl.c:3901
 #, no-c-format
 msgid "Derived type definition of '%s' at %C has already been defined"
-msgstr ""
+msgstr "Abgeleitete Typdefinition von »%s« bei %C wurde bereits definiert"
 
 #: fortran/decl.c:3935
 #, no-c-format
 msgid "Cray Pointee at %C cannot be assumed shape array"
-msgstr ""
+msgstr "Cray-Zeigerende bei %C kann nicht Feld mit impliziter Form sein"
 
 #: fortran/decl.c:3956
 #, no-c-format
 msgid "New in Fortran 2003: ENUM AND ENUMERATOR at %C"
-msgstr ""
+msgstr "Neu in Fortran 2003: ENUM AND ENUMERATOR bei %C"
 
 #: fortran/decl.c:3980
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ENUM definition statement expected before %C"
-msgstr "Typnamen vor »*« erwartet"
+msgstr "Anweisung zur ENUM-Definition vor %C erwartet"
 
 #: fortran/decl.c:4013
 #, no-c-format
 msgid "Syntax error in ENUMERATOR definition at %C"
-msgstr ""
+msgstr "Syntaxfehler in ENUMERATOR-Definition bei %C"
 
 #: fortran/dump-parse-tree.c:53
 #, c-format
 msgid "%-5d "
-msgstr ""
+msgstr "%-5d"
 
 #: fortran/dump-parse-tree.c:55
-#, fuzzy, c-format
+#, c-format
 msgid "      "
-msgstr "        %qD"
+msgstr "      "
 
 #: fortran/dump-parse-tree.c:79 fortran/dump-parse-tree.c:594
-#, fuzzy, c-format
+#, c-format
 msgid "(%s "
-msgstr "%s "
+msgstr "(%s "
 
 #: fortran/dump-parse-tree.c:92 fortran/dump-parse-tree.c:841
 #: fortran/dump-parse-tree.c:878 fortran/dump-parse-tree.c:888
 #, c-format
 msgid "%d"
-msgstr ""
+msgstr "%d"
 
 #: fortran/dump-parse-tree.c:96 fortran/dump-parse-tree.c:123
 #: fortran/dump-parse-tree.c:166 fortran/dump-parse-tree.c:403
@@ -4574,365 +4524,365 @@ msgstr ""
 #: fortran/dump-parse-tree.c:602
 #, c-format
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #: fortran/dump-parse-tree.c:106 fortran/dump-parse-tree.c:421
 #, c-format
 msgid "("
-msgstr ""
+msgstr "("
 
 #: fortran/dump-parse-tree.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "%s = "
-msgstr "%s "
+msgstr "%s = "
 
 #: fortran/dump-parse-tree.c:116
 #, c-format
 msgid "(arg not-present)"
-msgstr ""
+msgstr "(Argument nicht vorhanden)"
 
 #: fortran/dump-parse-tree.c:120 fortran/dump-parse-tree.c:397
 #: fortran/dump-parse-tree.c:491
 #, c-format
 msgid " "
-msgstr ""
+msgstr " "
 
 #: fortran/dump-parse-tree.c:137 fortran/dump-parse-tree.c:312
-#, fuzzy, c-format
+#, c-format
 msgid "()"
-msgstr "(C)"
+msgstr "()"
 
 #: fortran/dump-parse-tree.c:141
 #, c-format
 msgid "(%d"
-msgstr ""
+msgstr "(%d"
 
 #: fortran/dump-parse-tree.c:155
-#, fuzzy, c-format
+#, c-format
 msgid " %s "
-msgstr " %s"
+msgstr " %s "
 
 #: fortran/dump-parse-tree.c:182
 #, c-format
 msgid "FULL"
-msgstr ""
+msgstr "VOLL"
 
 #: fortran/dump-parse-tree.c:213 fortran/dump-parse-tree.c:222
 #: fortran/dump-parse-tree.c:297
 #, c-format
 msgid " , "
-msgstr ""
+msgstr " , "
 
 #: fortran/dump-parse-tree.c:227
 #, c-format
 msgid "UNKNOWN"
-msgstr ""
+msgstr "UNBEKANNT"
 
 #: fortran/dump-parse-tree.c:252
-#, fuzzy, c-format
+#, c-format
 msgid " %% %s"
-msgstr "%J%s: %qs"
+msgstr " %% %s"
 
 #: fortran/dump-parse-tree.c:324 fortran/dump-parse-tree.c:381
-#, fuzzy, c-format
+#, c-format
 msgid "''"
-msgstr "«"
+msgstr "''"
 
 #: fortran/dump-parse-tree.c:326
 #, c-format
 msgid "%c"
-msgstr ""
+msgstr "%c"
 
 #: fortran/dump-parse-tree.c:333
-#, fuzzy, c-format
+#, c-format
 msgid "%s("
-msgstr "%s"
+msgstr "%s("
 
 #: fortran/dump-parse-tree.c:339
 #, c-format
 msgid "(/ "
-msgstr ""
+msgstr "(/ "
 
 #: fortran/dump-parse-tree.c:341
 #, c-format
 msgid " /)"
-msgstr ""
+msgstr " /)"
 
 #: fortran/dump-parse-tree.c:347
 #, c-format
 msgid "NULL()"
-msgstr ""
+msgstr "NULL()"
 
 #: fortran/dump-parse-tree.c:357 fortran/dump-parse-tree.c:370
 #: fortran/dump-parse-tree.c:395 fortran/dump-parse-tree.c:401
 #, c-format
 msgid "_%d"
-msgstr ""
+msgstr "_%d"
 
 #: fortran/dump-parse-tree.c:362
 #, c-format
 msgid ".true."
-msgstr ""
+msgstr ".wahr."
 
 #: fortran/dump-parse-tree.c:364
-#, fuzzy, c-format
+#, c-format
 msgid ".false."
-msgstr "fclose"
+msgstr ".falsch."
 
 #: fortran/dump-parse-tree.c:391
 #, c-format
 msgid "(complex "
-msgstr ""
+msgstr "(komplex "
 
 #: fortran/dump-parse-tree.c:407
 #, c-format
 msgid "???"
-msgstr ""
+msgstr "???"
 
 #: fortran/dump-parse-tree.c:415 fortran/dump-parse-tree.c:698
-#, fuzzy, c-format
+#, c-format
 msgid "%s:"
-msgstr "%s"
+msgstr "%s:"
 
 #: fortran/dump-parse-tree.c:425
 #, c-format
 msgid "U+ "
-msgstr ""
+msgstr "U+ "
 
 #: fortran/dump-parse-tree.c:428
 #, c-format
 msgid "U- "
-msgstr ""
+msgstr "U- "
 
 #: fortran/dump-parse-tree.c:431
 #, c-format
 msgid "+ "
-msgstr ""
+msgstr "+ "
 
 #: fortran/dump-parse-tree.c:434
 #, c-format
 msgid "- "
-msgstr ""
+msgstr "- "
 
 #: fortran/dump-parse-tree.c:437
 #, c-format
 msgid "* "
-msgstr ""
+msgstr "* "
 
 #: fortran/dump-parse-tree.c:440
 #, c-format
 msgid "/ "
-msgstr ""
+msgstr "/ "
 
 #: fortran/dump-parse-tree.c:443
 #, c-format
 msgid "** "
-msgstr ""
+msgstr "** "
 
 #: fortran/dump-parse-tree.c:446
 #, c-format
 msgid "// "
-msgstr ""
+msgstr "// "
 
 #: fortran/dump-parse-tree.c:449
 #, c-format
 msgid "AND "
-msgstr ""
+msgstr "UND "
 
 #: fortran/dump-parse-tree.c:452
 #, c-format
 msgid "OR "
-msgstr ""
+msgstr "ODER "
 
 #: fortran/dump-parse-tree.c:455
 #, c-format
 msgid "EQV "
-msgstr ""
+msgstr "ÄQV"
 
 #: fortran/dump-parse-tree.c:458
 #, c-format
 msgid "NEQV "
-msgstr ""
+msgstr "NÄQV"
 
 #: fortran/dump-parse-tree.c:461
 #, c-format
 msgid "= "
-msgstr ""
+msgstr "= "
 
 #: fortran/dump-parse-tree.c:464
 #, c-format
 msgid "<> "
-msgstr ""
+msgstr "<> "
 
 #: fortran/dump-parse-tree.c:467
 #, c-format
 msgid "> "
-msgstr ""
+msgstr "> "
 
 #: fortran/dump-parse-tree.c:470
 #, c-format
 msgid ">= "
-msgstr ""
+msgstr ">= "
 
 #: fortran/dump-parse-tree.c:473
 #, c-format
 msgid "< "
-msgstr ""
+msgstr "< "
 
 #: fortran/dump-parse-tree.c:476
 #, c-format
 msgid "<= "
-msgstr ""
+msgstr "<= "
 
 #: fortran/dump-parse-tree.c:479
 #, c-format
 msgid "NOT "
-msgstr ""
+msgstr "NICHT "
 
 #: fortran/dump-parse-tree.c:501
-#, fuzzy, c-format
+#, c-format
 msgid "%s["
-msgstr "%s"
+msgstr "%s["
 
 #: fortran/dump-parse-tree.c:507
-#, fuzzy, c-format
+#, c-format
 msgid "%s[["
-msgstr "%s"
+msgstr "%s[["
 
 #: fortran/dump-parse-tree.c:528
-#, fuzzy, c-format
+#, c-format
 msgid "(%s %s %s %s"
-msgstr "%s %s %p %d\n"
+msgstr "(%s %s %s %s"
 
 #: fortran/dump-parse-tree.c:534
 #, c-format
 msgid " ALLOCATABLE"
-msgstr ""
+msgstr " BESTIMMBAR"
 
 #: fortran/dump-parse-tree.c:536 fortran/dump-parse-tree.c:599
 #, c-format
 msgid " DIMENSION"
-msgstr ""
+msgstr " DIMENSION"
 
 #: fortran/dump-parse-tree.c:538
 #, c-format
 msgid " EXTERNAL"
-msgstr ""
+msgstr " EXTERN"
 
 #: fortran/dump-parse-tree.c:540
 #, c-format
 msgid " INTRINSIC"
-msgstr ""
+msgstr " INTRINSISCH"
 
 #: fortran/dump-parse-tree.c:542
 #, c-format
 msgid " OPTIONAL"
-msgstr ""
+msgstr " OPTIONAL"
 
 #: fortran/dump-parse-tree.c:544 fortran/dump-parse-tree.c:597
 #, c-format
 msgid " POINTER"
-msgstr ""
+msgstr " ZEIGER"
 
 #: fortran/dump-parse-tree.c:546
 #, c-format
 msgid " SAVE"
-msgstr ""
+msgstr " SICHERN"
 
 #: fortran/dump-parse-tree.c:548
 #, c-format
 msgid " TARGET"
-msgstr ""
+msgstr " ZIEL"
 
 #: fortran/dump-parse-tree.c:550
 #, c-format
 msgid " DUMMY"
-msgstr ""
+msgstr " DUMMY"
 
 #: fortran/dump-parse-tree.c:552
 #, c-format
 msgid " RESULT"
-msgstr ""
+msgstr " ERGEBNIS"
 
 #: fortran/dump-parse-tree.c:554
 #, c-format
 msgid " ENTRY"
-msgstr ""
+msgstr " EINTRAG"
 
 #: fortran/dump-parse-tree.c:557
 #, c-format
 msgid " DATA"
-msgstr ""
+msgstr " DATEN"
 
 #: fortran/dump-parse-tree.c:559
 #, c-format
 msgid " USE-ASSOC"
-msgstr ""
+msgstr " USE-ASSOC"
 
 #: fortran/dump-parse-tree.c:561
 #, c-format
 msgid " IN-NAMELIST"
-msgstr ""
+msgstr " IN-NAMENSLISTE"
 
 #: fortran/dump-parse-tree.c:563
 #, c-format
 msgid " IN-COMMON"
-msgstr ""
+msgstr " IN-COMMON"
 
 #: fortran/dump-parse-tree.c:566
 #, c-format
 msgid " FUNCTION"
-msgstr ""
+msgstr " FUNKTION"
 
 #: fortran/dump-parse-tree.c:568
 #, c-format
 msgid " SUBROUTINE"
-msgstr ""
+msgstr " SUBROUTINE"
 
 #: fortran/dump-parse-tree.c:570
 #, c-format
 msgid " IMPLICIT-TYPE"
-msgstr ""
+msgstr " IMPLIZIT-TYP"
 
 #: fortran/dump-parse-tree.c:573
 #, c-format
 msgid " SEQUENCE"
-msgstr ""
+msgstr " SEQUENZ"
 
 #: fortran/dump-parse-tree.c:575
 #, c-format
 msgid " ELEMENTAL"
-msgstr ""
+msgstr " ELEMENTAR"
 
 #: fortran/dump-parse-tree.c:577
 #, c-format
 msgid " PURE"
-msgstr ""
+msgstr " REIN"
 
 #: fortran/dump-parse-tree.c:579
 #, c-format
 msgid " RECURSIVE"
-msgstr ""
+msgstr " REKURSIV"
 
 #: fortran/dump-parse-tree.c:625
 #, c-format
 msgid "symbol %s "
-msgstr ""
+msgstr "Symbol %s "
 
 #: fortran/dump-parse-tree.c:632
 #, c-format
 msgid "value: "
-msgstr ""
+msgstr "Wert: "
 
 #: fortran/dump-parse-tree.c:639
 #, c-format
 msgid "Array spec:"
-msgstr ""
+msgstr "Feld-Spezifikation:"
 
 #: fortran/dump-parse-tree.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "Generic interfaces:"
-msgstr "Cygwin-Schnittstelle verwenden"
+msgstr "Generische Schnittstellen:"
 
 #: fortran/dump-parse-tree.c:648 fortran/dump-parse-tree.c:672
 #: fortran/dump-parse-tree.c:701 fortran/dump-parse-tree.c:1041
@@ -4942,332 +4892,332 @@ msgid " %s"
 msgstr " %s"
 
 #: fortran/dump-parse-tree.c:654
-#, fuzzy, c-format
+#, c-format
 msgid "result: %s"
-msgstr "Ziel: %s\n"
+msgstr "Ergebnis: %s"
 
 #: fortran/dump-parse-tree.c:660
 #, c-format
 msgid "components: "
-msgstr ""
+msgstr "Komponenten: "
 
 #: fortran/dump-parse-tree.c:667
 #, c-format
 msgid "Formal arglist:"
-msgstr ""
+msgstr "Formale Argumentliste:"
 
 #: fortran/dump-parse-tree.c:674
 #, c-format
 msgid " [Alt Return]"
-msgstr ""
+msgstr " [Alt Enter]"
 
 #: fortran/dump-parse-tree.c:681
-#, fuzzy, c-format
+#, c-format
 msgid "Formal namespace"
-msgstr "%qD ist ein Namensbereich"
+msgstr "Formaler Namensbereich"
 
 #: fortran/dump-parse-tree.c:739
 #, c-format
 msgid "common: /%s/ "
-msgstr ""
+msgstr "gemeinsam: /%s/ "
 
 #: fortran/dump-parse-tree.c:747 fortran/dump-parse-tree.c:1453
 #, c-format
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #: fortran/dump-parse-tree.c:760
 #, c-format
 msgid "symtree: %s  Ambig %d"
-msgstr ""
+msgstr "Symbaum: %s  Mehrdeut %d"
 
 #: fortran/dump-parse-tree.c:763
-#, fuzzy, c-format
+#, c-format
 msgid " from namespace %s"
-msgstr "unbekannter Namensbereich %qD"
+msgstr " aus Namensbereich %s"
 
 #: fortran/dump-parse-tree.c:807
 #, c-format
 msgid "NOP"
-msgstr ""
+msgstr "NOP"
 
 #: fortran/dump-parse-tree.c:811
 #, c-format
 msgid "CONTINUE"
-msgstr ""
+msgstr "FORTFAHREN"
 
 #: fortran/dump-parse-tree.c:815
 #, c-format
 msgid "ENTRY %s"
-msgstr ""
+msgstr "EINTRAG %s"
 
 #: fortran/dump-parse-tree.c:819
 #, c-format
 msgid "ASSIGN "
-msgstr ""
+msgstr "ZUORDNEN "
 
 #: fortran/dump-parse-tree.c:826
 #, c-format
 msgid "LABEL ASSIGN "
-msgstr ""
+msgstr "MARKE ZUORDNEN "
 
 #: fortran/dump-parse-tree.c:828
-#, fuzzy, c-format
+#, c-format
 msgid " %d"
-msgstr " %s"
+msgstr " %d"
 
 #: fortran/dump-parse-tree.c:832
 #, c-format
 msgid "POINTER ASSIGN "
-msgstr ""
+msgstr "ZEIGER ZUORDNEN "
 
 #: fortran/dump-parse-tree.c:839
 #, c-format
 msgid "GOTO "
-msgstr ""
+msgstr "GOTO "
 
 #: fortran/dump-parse-tree.c:848
 #, c-format
 msgid ", ("
-msgstr ""
+msgstr ", ("
 
 #: fortran/dump-parse-tree.c:862
 #, c-format
 msgid "CALL %s "
-msgstr ""
+msgstr "AUFRUFEN: %s "
 
 #: fortran/dump-parse-tree.c:867
 #, c-format
 msgid "RETURN "
-msgstr ""
+msgstr "RÜCKKEHREN "
 
 #: fortran/dump-parse-tree.c:873
 #, c-format
 msgid "PAUSE "
-msgstr ""
+msgstr "PAUSE "
 
 #: fortran/dump-parse-tree.c:883
 #, c-format
 msgid "STOP "
-msgstr ""
+msgstr "STOPP "
 
 #: fortran/dump-parse-tree.c:893 fortran/dump-parse-tree.c:901
 #, c-format
 msgid "IF "
-msgstr ""
+msgstr "WENN "
 
 #: fortran/dump-parse-tree.c:895
-#, fuzzy, c-format
+#, c-format
 msgid " %d, %d, %d"
-msgstr "%s %s %p %d\n"
+msgstr " %d, %d, %d"
 
 #: fortran/dump-parse-tree.c:912
 #, c-format
 msgid "ELSE\n"
-msgstr ""
+msgstr "SONST\n"
 
 #: fortran/dump-parse-tree.c:915
 #, c-format
 msgid "ELSE IF "
-msgstr ""
+msgstr "SONST WENN "
 
 #: fortran/dump-parse-tree.c:925
 #, c-format
 msgid "ENDIF"
-msgstr ""
+msgstr "ENDEWENN"
 
 #: fortran/dump-parse-tree.c:930
 #, c-format
 msgid "SELECT CASE "
-msgstr ""
+msgstr "FALLUNTERSCHEIDUNG "
 
 #: fortran/dump-parse-tree.c:938
 #, c-format
 msgid "CASE "
-msgstr ""
+msgstr "FALL "
 
 #: fortran/dump-parse-tree.c:954
 #, c-format
 msgid "END SELECT"
-msgstr ""
+msgstr "ENDE FALLUNTERSCHEIDUNG"
 
 #: fortran/dump-parse-tree.c:958
 #, c-format
 msgid "WHERE "
-msgstr ""
+msgstr "WO "
 
 #: fortran/dump-parse-tree.c:969
 #, c-format
 msgid "ELSE WHERE "
-msgstr ""
+msgstr "SONST WO "
 
 #: fortran/dump-parse-tree.c:976
 #, c-format
 msgid "END WHERE"
-msgstr ""
+msgstr "ENDE WO"
 
 #: fortran/dump-parse-tree.c:981
 #, c-format
 msgid "FORALL "
-msgstr ""
+msgstr "FÜRALLE "
 
 #: fortran/dump-parse-tree.c:1006
 #, c-format
 msgid "END FORALL"
-msgstr ""
+msgstr "ENDE FÜRALLE"
 
 #: fortran/dump-parse-tree.c:1010
 #, c-format
 msgid "DO "
-msgstr ""
+msgstr "TUE "
 
 #: fortran/dump-parse-tree.c:1024 fortran/dump-parse-tree.c:1035
 #, c-format
 msgid "END DO"
-msgstr ""
+msgstr "ENDE TUE"
 
 #: fortran/dump-parse-tree.c:1028
 #, c-format
 msgid "DO WHILE "
-msgstr ""
+msgstr "TUE SOLANGE "
 
 #: fortran/dump-parse-tree.c:1039
 #, c-format
 msgid "CYCLE"
-msgstr ""
+msgstr "ZYKLUS"
 
 #: fortran/dump-parse-tree.c:1045
 #, c-format
 msgid "EXIT"
-msgstr ""
+msgstr "ENDE"
 
 #: fortran/dump-parse-tree.c:1051
 #, c-format
 msgid "ALLOCATE "
-msgstr ""
+msgstr "ZUTEILEN "
 
 #: fortran/dump-parse-tree.c:1054 fortran/dump-parse-tree.c:1070
 #, c-format
 msgid " STAT="
-msgstr ""
+msgstr " STAT="
 
 #: fortran/dump-parse-tree.c:1067
 #, c-format
 msgid "DEALLOCATE "
-msgstr ""
+msgstr "ZURÜCKGEWINNEN "
 
 #: fortran/dump-parse-tree.c:1083
 #, c-format
 msgid "OPEN"
-msgstr ""
+msgstr "ÖFFNEN"
 
 #: fortran/dump-parse-tree.c:1088 fortran/dump-parse-tree.c:1162
 #: fortran/dump-parse-tree.c:1204 fortran/dump-parse-tree.c:1227
 #: fortran/dump-parse-tree.c:1373
 #, c-format
 msgid " UNIT="
-msgstr ""
+msgstr " EINHEIT="
 
 #: fortran/dump-parse-tree.c:1093 fortran/dump-parse-tree.c:1167
 #: fortran/dump-parse-tree.c:1209 fortran/dump-parse-tree.c:1238
 #: fortran/dump-parse-tree.c:1390
 #, c-format
 msgid " IOMSG="
-msgstr ""
+msgstr " IOMSG="
 
 #: fortran/dump-parse-tree.c:1098 fortran/dump-parse-tree.c:1172
 #: fortran/dump-parse-tree.c:1214 fortran/dump-parse-tree.c:1243
 #: fortran/dump-parse-tree.c:1395
 #, c-format
 msgid " IOSTAT="
-msgstr ""
+msgstr " IOSTAT="
 
 #: fortran/dump-parse-tree.c:1103 fortran/dump-parse-tree.c:1232
 #, c-format
 msgid " FILE="
-msgstr ""
+msgstr " DATEI="
 
 #: fortran/dump-parse-tree.c:1108 fortran/dump-parse-tree.c:1177
 #, c-format
 msgid " STATUS="
-msgstr ""
+msgstr " STATUS="
 
 #: fortran/dump-parse-tree.c:1113 fortran/dump-parse-tree.c:1273
 #, c-format
 msgid " ACCESS="
-msgstr ""
+msgstr " ZUGRIFF="
 
 #: fortran/dump-parse-tree.c:1118 fortran/dump-parse-tree.c:1289
 #, c-format
 msgid " FORM="
-msgstr ""
+msgstr " FORM="
 
 #: fortran/dump-parse-tree.c:1123 fortran/dump-parse-tree.c:1304
 #, c-format
 msgid " RECL="
-msgstr ""
+msgstr " RECL="
 
 #: fortran/dump-parse-tree.c:1128 fortran/dump-parse-tree.c:1314
 #, c-format
 msgid " BLANK="
-msgstr ""
+msgstr " LEER="
 
 #: fortran/dump-parse-tree.c:1133 fortran/dump-parse-tree.c:1319
 #, c-format
 msgid " POSITION="
-msgstr ""
+msgstr " POSITION="
 
 #: fortran/dump-parse-tree.c:1138 fortran/dump-parse-tree.c:1324
 #, c-format
 msgid " ACTION="
-msgstr ""
+msgstr " AKTION="
 
 #: fortran/dump-parse-tree.c:1143 fortran/dump-parse-tree.c:1344
 #, c-format
 msgid " DELIM="
-msgstr ""
+msgstr " TRENNZ="
 
 #: fortran/dump-parse-tree.c:1148 fortran/dump-parse-tree.c:1349
 #, c-format
 msgid " PAD="
-msgstr ""
+msgstr " FÜLL="
 
 #: fortran/dump-parse-tree.c:1152 fortran/dump-parse-tree.c:1181
 #: fortran/dump-parse-tree.c:1218 fortran/dump-parse-tree.c:1354
 #: fortran/dump-parse-tree.c:1426
 #, c-format
 msgid " ERR=%d"
-msgstr ""
+msgstr " FEHL=%d"
 
 #: fortran/dump-parse-tree.c:1157
 #, c-format
 msgid "CLOSE"
-msgstr ""
+msgstr "SCHLIESSEN"
 
 #: fortran/dump-parse-tree.c:1185
 #, c-format
 msgid "BACKSPACE"
-msgstr ""
+msgstr "RÜCKWÄRTSSCHRITT"
 
 #: fortran/dump-parse-tree.c:1189
 #, c-format
 msgid "ENDFILE"
-msgstr ""
+msgstr "DATEIENDE"
 
 #: fortran/dump-parse-tree.c:1193
 #, c-format
 msgid "REWIND"
-msgstr ""
+msgstr "RÜCKSPULEN"
 
 #: fortran/dump-parse-tree.c:1197
 #, c-format
 msgid "FLUSH"
-msgstr ""
+msgstr "LEEREN"
 
 #: fortran/dump-parse-tree.c:1222
 #, c-format
 msgid "INQUIRE"
-msgstr ""
+msgstr "ABFRAGEN"
 
 #: fortran/dump-parse-tree.c:1248
 #, c-format
diff --git a/gcc/target-def.h b/gcc/target-def.h
index 7e8837451f3..5161f2d258a 100644
--- a/gcc/target-def.h
+++ b/gcc/target-def.h
@@ -336,6 +336,10 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #define TARGET_SHIFT_TRUNCATION_MASK default_shift_truncation_mask
 #endif
 
+#ifndef TARGET_MIN_DIVISIONS_FOR_RECIP_MUL
+#define TARGET_MIN_DIVISIONS_FOR_RECIP_MUL default_min_divisions_for_recip_mul
+#endif
+
 #ifndef TARGET_VALID_POINTER_MODE
 #define TARGET_VALID_POINTER_MODE default_valid_pointer_mode
 #endif
@@ -579,6 +583,7 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   TARGET_ENCODE_SECTION_INFO,			\
   TARGET_STRIP_NAME_ENCODING,			\
   TARGET_SHIFT_TRUNCATION_MASK,			\
+  TARGET_MIN_DIVISIONS_FOR_RECIP_MUL,		\
   TARGET_VALID_POINTER_MODE,                    \
   TARGET_SCALAR_MODE_SUPPORTED_P,		\
   TARGET_VECTOR_MODE_SUPPORTED_P,               \
diff --git a/gcc/target.h b/gcc/target.h
index 0f775f1de15..1a1d2b8c9e4 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -422,6 +422,11 @@ struct gcc_target
      return the mask that they apply.  Return 0 otherwise.  */
   unsigned HOST_WIDE_INT (* shift_truncation_mask) (enum machine_mode mode);
 
+  /* Return the number of divisions in the given MODE that should be present,
+     so that it is profitable to turn the division into a multiplication by
+     the reciprocal.  */
+  unsigned int (* min_divisions_for_recip_mul) (enum machine_mode mode);
+
   /* True if MODE is valid for a pointer in __attribute__((mode("MODE"))).  */
   bool (* valid_pointer_mode) (enum machine_mode mode);
 
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 94469a76b0f..9650ea82944 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -145,6 +145,14 @@ default_shift_truncation_mask (enum machine_mode mode)
   return SHIFT_COUNT_TRUNCATED ? GET_MODE_BITSIZE (mode) - 1 : 0;
 }
 
+/* The default implementation of TARGET_MIN_DIVISIONS_FOR_RECIP_MUL.  */
+
+unsigned int
+default_min_divisions_for_recip_mul (enum machine_mode mode ATTRIBUTE_UNUSED)
+{
+  return have_insn_for (DIV, mode) ? 3 : 2;
+}
+
 /* Generic hook that takes a CUMULATIVE_ARGS pointer and returns true.  */
 
 bool
diff --git a/gcc/targhooks.h b/gcc/targhooks.h
index 24e3b6d38be..78b6fab8c45 100644
--- a/gcc/targhooks.h
+++ b/gcc/targhooks.h
@@ -33,6 +33,7 @@ extern bool default_pretend_outgoing_varargs_named (CUMULATIVE_ARGS *);
 extern enum machine_mode default_eh_return_filter_mode (void);
 extern unsigned HOST_WIDE_INT default_shift_truncation_mask
   (enum machine_mode);
+extern unsigned int default_min_divisions_for_recip_mul (enum machine_mode);
 
 extern tree default_stack_protect_guard (void);
 extern tree default_external_stack_protect_fail (void);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d628c0a5913..dd77c98a0eb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,166 @@
+2006-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/25682
+	* gcc.dg/pr25682.c: New test.
+	* g++.dg/parse/array-size2.C: New test.
+
+2006-01-16  Ian Lance Taylor  <ian@airs.com>
+
+	* consistency.vlad: Remove entire directory, 1652 files.
+
+2006-01-16  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+        PR testsuite/25777
+        * ada/acats/run_acats (LD_LIBRARY_PATH): Add BASE
+        to LD_LIBRARY_PATH.
+
+2006-01-16  Steven Bosscher  <stevenb.gcc@gmail.com>
+	Richard Guenther  <rguenther@suse.de>
+
+	PR rtl-optimization/24257
+	* gcc.dg/torture/pr24257.c: New testcase.
+
+2006-01-15  Andreas Jaeger  <aj@suse.de>
+
+	* g++.dg/abi/mangle25.C: Only run on 64-bit systems since 32-bit
+	x86 does not have __float128.
+
+2006-01-14  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/25663
+	* g++.dg/template/ctor6.C: New test.
+
+2006-01-14  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/22146
+	* gfortran.dg/elemental_subroutine_1.f90: New test.
+	* gfortran.dg/elemental_subroutine_2.f90: New test.
+
+	PR fortran/25029
+	PR fortran/21256
+	* gfortran.dg/assumed_size_refs_1.f90: New test.
+
+	PR fortran/20868
+	PR fortran/20870
+	* gfortran.dg/assumed_size_refs_2.f90: New test.
+	* gfortran.dg/initialization_1.f90: Change warning message.
+	* gfortran.dg/pr15140.f90: Add bound to assumed size reference.
+
+2006-01-13  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* gcc.c-torture/compile/pr25310.c: Disable test on 16-bit targets.
+
+2006-01-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR tree-opt/24365
+	* g++.dg/opt/complex5.C: New test.
+
+2006-01-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/24824
+	* g++.dg/debug/dwarf2-1.C: New.
+
+2006-01-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR testsuite/25728
+	* lib/gcov.exp (verify-lines): Add "close $fd".
+
+2006-01-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/25386
+	* g++.dg/ext/packed3.C: Add expected packed error.
+
+2006-01-10  Bernhard Fischer  <rep.nop@aon.at>
+
+	PR fortran/25486
+	* gfortran.dg/literal_character_constant_1_x.F: New test.
+	* gfortran.dg/literal_character_constant_1_y.F: Ditto.
+	* gfortran.dg/literal_character_constant_1_z.F: Ditto.
+	* gfortran.dg/literal_character_constant_1.inc: Helper for new tests.
+
+2006-01-11  Paolo Bonzini  <bonzini@gnu.org>
+        
+        PR tree-optimization/23109
+        PR tree-optimization/23948
+        PR tree-optimization/24123
+
+        * gcc.dg/tree-ssa/recip-3.c, gcc.dg/tree-ssa/recip-4.c,
+        gcc.dg/tree-ssa/recip-5.c, gcc.dg/tree-ssa/recip-6.c,
+        gcc.dg/tree-ssa/recip-7.c, gcc.dg/tree-ssa/pr23109.c,
+        g++.dg/tree-ssa/pr23948.C: New testcases.
+        * gcc.dg/tree-ssa/recip-2.c, gcc.dg/tree-ssa/pr23234.c: Provide
+	three divisions in order to do the optimization.
+
+2006-01-11  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/25730
+	* gfortran.dg/used_types_1.f90: New test.
+
+2006-01-10  Jan Beulich  <jbeulich@novell.com>
+
+	* lib/target-supports.exp (check_visibility_available): Simplify test
+	for *-*-netware*.
+	(check_profiling_available): Fail for *-*-netware*.
+	* g++.old-deja/g++.law/profile1.C: Remove dg-bogus for *-*-netware*.
+	* gcc.dg/20021014-1.c: Likewise.
+	* gcc.dg/nest.c: Likewise.
+
+2006-01-10   David Billinghurst  (David.Billinghurst@riotinto.com)
+
+	* lib/fortran-torture.exp: Catch remaining uses of
+	remote_file build delete.
+	
+2006-01-09  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	fortran/24936
+	* gfortran.dg/forall_3.f90: New test.
+
+2006-01-09  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR fortran/21977
+	* gfortran.dg/nesting_2.f90: New test.
+	* gfortran.dg/nesting_3.f90: New test.
+
+2005-01-09  Erik Edelmann  <eedelman@gcc.gnu.org>
+
+	PR fortran/25093
+	* gfortran.dg/private_type_4.f90: New.
+
+2006-01-09  Kazu Hirata  <kazu@codesourcery.com>
+
+	PR tree-optimization/25125
+	* gcc.dg/vect/vect-7.c, gcc.dg/vect/vect-reduc-2char.c,
+	gcc.dg/vect/vect-reduc-2short.c: XFAIL.
+	* gcc.c-torture/execute/pr25125.c: New.
+
+2006-01-09  Feng Wang  <fengwang@nudt.edu.cn>
+
+	PR fortran/12456
+	* gfortran.dg/single_char_string.f90: New test.
+
+2006-01-09  Feng Wang  <fengwang@nudt.edu.cn>
+
+	* gfortran.dg/ichar2.f90: New test.
+
+2005-01-07  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/25598
+	* gfortran.dg/backspace_3.f: New test.
+	* gfortran.dg/backspace_4.f: New test.
+
+2005-01-07  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/24268
+	* gfortran.dg/fmt_white.f: Update test.
+
+2006-01-06  Steven G. Kargl  <kargls@comcast.net>
+
+	PR fortran/25101
+	* gfortran.dg/forall_2.f90: New test.
+
+	PR fortran/24640
+	* gfortran.dg/label_2.f90: New test.
+
 2006-01-05  Erik Edelmann  <eedelman@gcc.gnu.org>
 
 	PR fortran/23675
diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats
index b2c62550be7..f2b7872b10f 100755
--- a/gcc/testsuite/ada/acats/run_acats
+++ b/gcc/testsuite/ada/acats/run_acats
@@ -14,7 +14,7 @@ BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`
 
 PATH=$BASE:$ROOT:$PATH
 ADA_INCLUDE_PATH=$BASE/ada/rts
-LD_LIBRARY_PATH=$ADA_INCLUDE_PATH:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$ADA_INCLUDE_PATH:$BASE:$LD_LIBRARY_PATH
 ADA_OBJECTS_PATH=$ADA_INCLUDE_PATH
 
 if [ ! -d $ADA_INCLUDE_PATH ]; then
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 f53377e0135..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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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/mangle25.C b/gcc/testsuite/g++.dg/abi/mangle25.C
index b57b7dac83a..2d4d5a3ec82 100644
--- a/gcc/testsuite/g++.dg/abi/mangle25.C
+++ b/gcc/testsuite/g++.dg/abi/mangle25.C
@@ -4,9 +4,8 @@
 // ia64-hpux where "long double" is "e" and __float128 is synonymous with
 // "long double".
 // Origin: Joseph Myers <joseph@codesourcery.com>
-// { dg-do compile { target i?86-*-* x86_64-*-* ia64-*-* } } */
+// { dg-do compile { target { { i?86-*-* x86_64-*-* ia64-*-* } && lp64 } } }
 // { dg-options "" } */
-// { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 // { dg-final { scan-assembler "_Z1fg" { target i?86-*-* x86_64-*-* } } } */
 // { dg-final { scan-assembler "_Z1fg" { target { ia64-*-* && { ! "ia64-*-hpux*" } } } } } */
 // { dg-final { scan-assembler "_Z1fe" { target ia64-*-hpux* } } } */
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2-1.C b/gcc/testsuite/g++.dg/debug/dwarf2-1.C
new file mode 100644
index 00000000000..e90d51030c8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/debug/dwarf2-1.C
@@ -0,0 +1,22 @@
+// Copyright (C) 2006 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 6 Jan 2006 <nathan@codesourcery.com>
+
+// PR 24824
+// Origin:   	 wanderer@rsu.ru
+
+// { dg-options "-feliminate-dwarf2-dups" }
+
+namespace N
+{
+  struct Base
+  {
+    int m;
+  };
+
+  struct Derived : Base
+  {
+    using Base::m;
+  };
+}
+
+N::Derived thing;
diff --git a/gcc/testsuite/g++.dg/ext/packed3.C b/gcc/testsuite/g++.dg/ext/packed3.C
index 3494ff4c31e..880b5d9b469 100644
--- a/gcc/testsuite/g++.dg/ext/packed3.C
+++ b/gcc/testsuite/g++.dg/ext/packed3.C
@@ -20,6 +20,6 @@ struct  __attribute__ ((packed)) Packed
 void Foo (Packed &p)
 {
   Ref (p.i); // { dg-error "cannot bind packed field" "" { target { ! default_packed } } }
-  Ref (p.u.i);
+  Ref (p.u.i); // { dg-error "cannot bind packed field" "" { target { ! default_packed } } }
   Ref (p.u); // { dg-error "cannot bind packed field" "" { target { ! default_packed } } }
 }
diff --git a/gcc/testsuite/g++.dg/opt/complex5.C b/gcc/testsuite/g++.dg/opt/complex5.C
new file mode 100644
index 00000000000..0da0738b327
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/complex5.C
@@ -0,0 +1,16 @@
+// PR 24365
+// { dg-do compile }
+// { dg-options "-O2" }
+
+typedef __complex__ double cdouble;
+inline cdouble to_complex(double r) {
+  cdouble z;
+  __real__ z = r;
+  return z;
+}
+cdouble elt_zero() {
+  cdouble a = to_complex(0.0);
+  a+=1.0;
+  return a;
+}
+
diff --git a/gcc/testsuite/g++.dg/parse/array-size2.C b/gcc/testsuite/g++.dg/parse/array-size2.C
new file mode 100644
index 00000000000..22a57b2dc0b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/array-size2.C
@@ -0,0 +1,19 @@
+// PR c/25682
+// { dg-do compile }
+// Test whether we don't ICE on invalid array sizes.
+
+struct S
+{
+  char a[4];
+  int b;
+};
+
+extern void bar (char *, char *);
+
+void
+foo (void)
+{
+  char g[(char *) &((struct S *) 0)->b - (char *) 0];	// { dg-error "not an integral constant-expression" }
+  char h[(__SIZE_TYPE__) &((struct S *) 8)->b];		// { dg-error "not an integral constant-expression" }
+  bar (g, h);
+}
diff --git a/gcc/testsuite/g++.dg/template/ctor6.C b/gcc/testsuite/g++.dg/template/ctor6.C
new file mode 100644
index 00000000000..4f21dc9ebf8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ctor6.C
@@ -0,0 +1,11 @@
+// PR c++/25663
+
+template<int> struct A
+{
+  A(int);
+};
+
+void foo()
+{
+  A<0>(A<0>(0));
+}
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr23948.C b/gcc/testsuite/g++.dg/tree-ssa/pr23948.C
new file mode 100644
index 00000000000..c34161409c1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr23948.C
@@ -0,0 +1,19 @@
+/* { dg-options "-O1 -ffast-math -fdump-tree-recip" } */
+/* { dg-do compile } */
+
+struct MIOFILE {
+  ~MIOFILE();
+};
+double potentially_runnable_resource_share();
+void f1(double);
+int make_scheduler_request(double a, double b)
+{
+  MIOFILE mf;
+  double prrs = potentially_runnable_resource_share();
+  f1(a/prrs);
+  f1(1/prrs);
+  f1(b/prrs);
+}
+
+/* { dg-final { scan-tree-dump-times " / " 1 "recip" } } */
+/* { dg-final { cleanup-tree-dump "recip" } } */
diff --git a/gcc/testsuite/g++.old-deja/g++.law/profile1.C b/gcc/testsuite/g++.old-deja/g++.law/profile1.C
index acc20d0ad92..7f17a15de9f 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/profile1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/profile1.C
@@ -2,7 +2,6 @@
 // { dg-require-profiling "-pg" }
 // { dg-options "-pg" }
 // { dg-options "-pg -static" { target hppa*-*-hpux* } }
-// { dg-bogus "\[Uu\]nresolved symbol ._mcount" "Profiling unsupported" { xfail *-*-netware* } 0 }
 // GROUPS passed profiling
 #include <stdio.h>
 main()
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr25310.c b/gcc/testsuite/gcc.c-torture/compile/pr25310.c
index 4cd3087fddc..71081d82111 100644
--- a/gcc/testsuite/gcc.c-torture/compile/pr25310.c
+++ b/gcc/testsuite/gcc.c-torture/compile/pr25310.c
@@ -1,4 +1,7 @@
 
+/* Prevent spurious test failures on 16-bit targets.  */
+#if __INT_MAX__ >= 2147483647L
+
 extern int f (char *, int);
 
 void test (void)
@@ -15,3 +18,5 @@ void test (void)
     bufptr += bytes;
 }
 
+#endif
+
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr25125.c b/gcc/testsuite/gcc.c-torture/execute/pr25125.c
new file mode 100644
index 00000000000..f08ebe74a48
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr25125.c
@@ -0,0 +1,27 @@
+extern void exit (int);
+extern void abort (void);
+extern unsigned short f (short a) __attribute__((__noinline__));
+
+unsigned short
+f (short a)
+{
+  short b;
+
+  if (a > 0)
+    return 0;
+  b = ((int) a) + - (int) 32768;
+  return b;
+}
+
+int
+main (void)
+{
+  if (sizeof (short) < 2
+      || sizeof (short) >= sizeof (int))
+    exit (0);
+
+  if (f (-32767) != 1)
+    abort ();
+
+  exit (0);
+}
diff --git a/gcc/testsuite/gcc.dg/20021014-1.c b/gcc/testsuite/gcc.dg/20021014-1.c
index 6ce62c34666..dd8614c9f09 100644
--- a/gcc/testsuite/gcc.dg/20021014-1.c
+++ b/gcc/testsuite/gcc.dg/20021014-1.c
@@ -4,7 +4,6 @@
 /* { dg-options "-O2 -p -static" { target hppa*-*-hpux* } } */
 /* { dg-error "profiler" "No profiler support" { target xstormy16-*-* } 0 } */
 /* { dg-error "" "consider using `-pg' instead of `-p' with gprof(1)" { target *-*-freebsd* } 0 } */
-/* { dg-bogus "\[Uu\]nresolved symbol ._mcount" "Profiling unsupported" { xfail *-*-netware* } 0 } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/nest.c b/gcc/testsuite/gcc.dg/nest.c
index b9476600ae2..7178bd82045 100644
--- a/gcc/testsuite/gcc.dg/nest.c
+++ b/gcc/testsuite/gcc.dg/nest.c
@@ -4,7 +4,6 @@
 /* { dg-options "-O2 -pg" } */
 /* { dg-options "-O2 -pg -static" { target hppa*-*-hpux* } } */
 /* { dg-error "profiler" "No profiler support" { target xstormy16-*-* } 0 } */
-/* { dg-bogus "\[Uu\]nresolved symbol ._mcount" "Profiling unsupported" { xfail *-*-netware* } 0 } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.dg/pr25682.c b/gcc/testsuite/gcc.dg/pr25682.c
new file mode 100644
index 00000000000..3a1d7c2ba59
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr25682.c
@@ -0,0 +1,27 @@
+/* PR c/25682 */
+/* { dg-do compile } */
+/* Test whether we don't ICE on questionable constructs where offsetof
+   should have been used instead.  */
+
+struct S
+{
+  char a[4];
+  int b;
+};
+
+char c[(char *) &((struct S *) 0)->b - (char *) 0];
+char d[(__SIZE_TYPE__) &((struct S *) 8)->b];
+char e[sizeof (c) == __builtin_offsetof (struct S, b) ? 1 : -1];
+char f[sizeof (d) == __builtin_offsetof (struct S, b) + 8 ? 1 : -1];
+
+extern void bar (char *, char *);
+
+void
+foo (void)
+{
+  char g[(char *) &((struct S *) 0)->b - (char *) 0];
+  char h[(__SIZE_TYPE__) &((struct S *) 8)->b];
+  char i[sizeof (g) == __builtin_offsetof (struct S, b) ? 1 : -1];
+  char j[sizeof (h) == __builtin_offsetof (struct S, b) + 8 ? 1 : -1];
+  bar (g, h);
+}
diff --git a/gcc/testsuite/gcc.dg/torture/pr24257.c b/gcc/testsuite/gcc.dg/torture/pr24257.c
new file mode 100644
index 00000000000..200bd18832c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr24257.c
@@ -0,0 +1,26 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fgcse -fgcse-sm" } */
+
+typedef struct A {
+    int buf, left;
+} A;
+
+static void flush(A *s, int n)
+{
+    s->buf <<= n;
+
+    while (s->left < 32) {
+        s->buf <<= 8;
+        s->left += 8;
+    }
+
+    s->buf=0;
+}
+
+void oof(A *s, int n)
+{
+    s->buf = n;
+    s->left = n;
+
+    flush(s, n);
+}
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c
new file mode 100644
index 00000000000..e121a553833
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c
@@ -0,0 +1,34 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -funsafe-math-optimizations -fdump-tree-recip -fdump-tree-lim" } */
+
+double F[2] = { 0., 0. }, e = 0.;
+
+int main()
+{
+	int i;
+	double E, W, P, d;
+
+        /* make sure the program crashes on FP exception */
+        unsigned short int Mask;
+
+	W = 1.;
+	d = 2.*e;
+	E = 1. - d;
+
+	for( i=0; i < 2; i++ )
+		if( d > 0.01 )
+		{
+			P = ( W < E ) ? (W - E)/d : (E - W)/d;
+			F[i] += P;
+		}
+
+	return 0;
+}
+
+/* LIM only performs the transformation in the no-trapping-math case.  In
+   the future we will do it for trapping-math as well in recip, check that
+   this is not wrongly optimized.  */
+/* { dg-final { scan-tree-dump-not "reciptmp" "lim" } } */
+/* { dg-final { scan-tree-dump-not "reciptmp" "recip" } } */
+/* { dg-final { cleanup-tree-dump "recip" } } */
+
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23234.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23234.c
index bd0b62b558f..3a3869815c8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23234.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23234.c
@@ -9,6 +9,7 @@ double
 f1 (double a, double b, double c)
 {
   double y0;
+  double y1;
 
   if (a == 0.0)
     {
@@ -16,7 +17,8 @@ f1 (double a, double b, double c)
       return y0;
     }
   y0 = c / b;
-  return y0;
+  y1 = a / b;
+  return y0 * y1;
 }
 
 /* Labels may end up in the middle of a block.  Also bad.  */
@@ -24,6 +26,7 @@ double
 f2 (double a, double b, double c)
 {
   double y0;
+  double y1;
 
 a_label:
 another_label:
@@ -33,7 +36,8 @@ another_label:
       return y0;
     }
   y0 = c / b;
-  return y0;
+  y1 = a / b;
+  return y0 * y1;
 }
 
 /* Uses must still be dominated by their defs.  */
@@ -41,6 +45,7 @@ double
 f3 (double a, double b, double c)
 {
   double y0;
+  double y1;
 
   y0 = -c / b;
   if (a == 0.0)
@@ -48,5 +53,6 @@ f3 (double a, double b, double c)
       return y0;
     }
   y0 = c / b;
-  return y0;
+  y1 = a / b;
+  return y0 * y1;
 }
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-2.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-2.c
index 7d0e97ae371..af628053ad5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/recip-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-2.c
@@ -10,14 +10,19 @@ float e(float a, float b, float c, float d, float e, float f)
     }
 
   /* The PHI nodes for these divisions should be combined.  */
+  d = d / a;
   e = e / a;
   f = f / a;
   
   a = a / c;
   b = b / c;
 
-  return a + b + e + f;
+  /* This should not be left as a multiplication.  */
+  c = 1 / c;
+
+  return a + b + c + d + e + f;
 }
 
 /* { dg-final { scan-tree-dump-times " / " 2 "recip" } } */
+/* { dg-final { scan-tree-dump-times " \\* " 5 "recip" } } */
 /* { dg-final { cleanup-tree-dump "recip" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-3.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-3.c
new file mode 100644
index 00000000000..45c8db148ac
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-3.c
@@ -0,0 +1,27 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -fno-trapping-math -funsafe-math-optimizations -fdump-tree-recip" } */
+
+double F[2] = { 0.0, 0.0 }, e;
+
+/* In this case the optimization is interesting.  */
+float h ()
+{
+	int i;
+	double E, W, P, d;
+
+	W = 1.;
+	d = 2.*e;
+	E = 1. - d;
+
+	for( i=0; i < 2; i++ )
+		if( d > 0.01 )
+		{
+			P = ( W < E ) ? (W - E)/d : (E - W)/d;
+			F[i] += P;
+		}
+
+	F[0] += E / d;
+}
+
+/* { dg-final { scan-tree-dump-times " / " 1 "recip" } } */
+/* { dg-final { cleanup-tree-dump "recip" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-4.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-4.c
new file mode 100644
index 00000000000..20d7681d28d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-4.c
@@ -0,0 +1,45 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -fno-trapping-math -funsafe-math-optimizations -fdump-tree-recip" } */
+
+/* based on the test case in pr23109 */
+
+double F[2] = { 0., 0. }, e = 0.;
+
+/* Nope, we cannot prove the optimization is worthwhile in this case.  */
+void f ()
+{
+	int i;
+	double E, W, P, d;
+
+	W = 1.;
+	d = 2.*e;
+	E = 1. - d;
+
+	if( d > 0.01 )
+	{
+		P = ( W < E ) ? (W - E)/d : (E - W)/d;
+		F[i] += P;
+	}
+}
+
+/* We also cannot prove the optimization is worthwhile in this case.  */
+float g ()
+{
+	int i;
+	double E, W, P, d;
+
+	W = 1.;
+	d = 2.*e;
+	E = 1. - d;
+
+	if( d > 0.01 )
+	{
+		P = ( W < E ) ? (W - E)/d : (E - W)/d;
+		F[i] += P;
+	}
+
+	return 1.0 / d;
+}
+
+/* { dg-final { scan-tree-dump-not "reciptmp" "recip" } } */
+/* { dg-final { cleanup-tree-dump "recip" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-5.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-5.c
new file mode 100644
index 00000000000..bcbd1839cbc
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-5.c
@@ -0,0 +1,31 @@
+/* { dg-options "-O1 -funsafe-math-optimizations -ftrapping-math -fdump-tree-recip -fdump-tree-optimized" } */
+/* { dg-do compile } */
+
+/* Test the reciprocal optimizations together with trapping math.  */
+
+extern int f2();
+
+double f1(double y, double z, double w, double j, double k)
+{
+  double b, c, d, e, f, g;
+
+  if (f2 ())
+    /* inserts one division here */
+    b = 1 / y, c = z / y, d = j / y;
+  else
+    /* one division here */
+    b = 3 / y, c = w / y, d = k / y;
+
+  /* and one here, that should be removed afterwards but is not right now */
+  e = b / y;
+  f = c / y;
+  g = d / y;
+
+  return e + f + g;
+}
+
+/* { dg-final { scan-tree-dump-times " / " 3 "recip" } } */
+/* { dg-final { scan-tree-dump-times " / " 2 "optimized" { xfail *-*-* } } } */
+/* { dg-final { cleanup-tree-dump "recip" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
+
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-6.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-6.c
new file mode 100644
index 00000000000..60fefd01da5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-6.c
@@ -0,0 +1,26 @@
+/* { dg-options "-O1 -funsafe-math-optimizations -fno-trapping-math -fdump-tree-recip" } */
+/* { dg-do compile } */
+
+/* Test inserting in a block that does not contain a division.  */
+
+extern int f2();
+
+double f1(double y, double z, double w)
+{
+  double b, c, d, e, f;
+
+  if (g ())
+    b = 1 / y, c = z / y;
+  else
+    b = 3 / y, c = w / y;
+
+  d = b / y;
+  e = c / y;
+  f = 1 / y;
+
+  return d + e + f;
+}
+
+/* { dg-final { scan-tree-dump-times " / " 1 "recip" } } */
+/* { dg-final { cleanup-tree-dump "recip" } } */
+
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-7.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-7.c
new file mode 100644
index 00000000000..af1bf3c008b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-7.c
@@ -0,0 +1,27 @@
+/* { dg-options "-O1 -funsafe-math-optimizations -fno-trapping-math -fdump-tree-recip" } */
+/* { dg-do compile } */
+
+/* Test inserting in a block that does not contain a division.  */
+
+extern double h();
+
+double f(int x, double z, double w)
+{
+  double b, c, d, e, f;
+  double y = h ();
+
+  if (x)
+    b = 1 / y, c = z / y;
+  else
+    b = 3 / y, c = w / y;
+
+  d = b / y;
+  e = c / y;
+  f = 1 / y;
+
+  return d + e + f;
+}
+
+/* { dg-final { scan-tree-dump-times " / " 1 "recip" } } */
+/* { dg-final { cleanup-tree-dump "recip" } } */
+
diff --git a/gcc/testsuite/gcc.dg/vect/vect-7.c b/gcc/testsuite/gcc.dg/vect/vect-7.c
index e359bbe2c56..10cff365cb9 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-7.c
@@ -46,6 +46,6 @@ int main (void)
 }
 
 /* Fails for 32-bit targets that don't vectorize PLUS.  */
-/* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
+/* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
index aecf8a512e1..e664fda9660 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
@@ -45,5 +45,5 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
index 4476c83d0e7..9f312fbc3f5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
@@ -44,5 +44,5 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gfortran.dg/assumed_size_refs_1.f90 b/gcc/testsuite/gfortran.dg/assumed_size_refs_1.f90
new file mode 100644
index 00000000000..ff42c02a623
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assumed_size_refs_1.f90
@@ -0,0 +1,64 @@
+!==================assumed_size_refs_1.f90==================
+! { dg-do compile }
+! Test the fix for PR25029, PR21256 in which references to
+! assumed size arrays without an upper bound to the last
+! dimension were generating no error. The first version of
+! the patch failed in DHSEQR, as pointed out by Toon Moene
+! in http://gcc.gnu.org/ml/fortran/2005-12/msg00466.html
+!
+! Contributed by Paul Thomas  <pault@gcc.gnu.org>
+!
+program assumed_size_test_1
+  implicit none
+  real a(2, 4)
+
+  a = 1.0
+  call foo (a)
+
+contains
+  subroutine foo(m)
+    real, target :: m(1:2, *)
+    real x(2,2,2)
+    real, external :: bar
+    real, pointer :: p(:,:), q(:,:)
+    allocate (q(2,2))
+
+! PR25029
+    p => m                     ! { dg-error "upper bound in the last dimension" }
+    q = m                      ! { dg-error "upper bound in the last dimension" }
+
+! PR21256( and PR25060)
+    m = 1                      ! { dg-error "upper bound in the last dimension" }
+
+    m(1,1) = 2.0
+    x = bar (m)
+    x = fcn (m)                ! { dg-error "upper bound in the last dimension" }
+    m(:, 1:2) = fcn (q)
+    call sub (m, x)            ! { dg-error "upper bound in the last dimension" }
+    call sub (m(1:2, 1:2), x)
+    print *, p
+
+    call DHSEQR(x)
+
+  end subroutine foo
+
+  elemental function fcn (a) result (b)
+    real, intent(in) :: a
+    real :: b
+    b = 2.0 * a
+  end function fcn
+
+  elemental subroutine sub (a, b)
+    real, intent(inout) :: a, b
+    b = 2.0 * a
+  end subroutine sub
+  
+  SUBROUTINE DHSEQR( WORK )
+    REAL WORK( * )
+    EXTERNAL           DLARFX
+    INTRINSIC          MIN
+    WORK( 1 ) = 1.0
+    CALL DLARFX( MIN( 1, 8 ), WORK )
+  END SUBROUTINE DHSEQR
+
+end program assumed_size_test_1
diff --git a/gcc/testsuite/gfortran.dg/assumed_size_refs_2.f90 b/gcc/testsuite/gfortran.dg/assumed_size_refs_2.f90
new file mode 100644
index 00000000000..8eb708d4989
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assumed_size_refs_2.f90
@@ -0,0 +1,44 @@
+!==================assumed_size_refs_1.f90==================
+! { dg-do compile }
+! Test the fix for PR20868 & PR20870 in which references to
+! assumed size arrays without an upper bound to the last
+! dimension were generating no error.
+!
+! Contributed by Paul Thomas  <pault@gcc.gnu.org>
+!
+program assumed_size_test_2
+  implicit none
+  real a(2, 4)
+
+  a = 1.0
+  call foo (a)
+
+contains
+  subroutine foo(m)
+    real, target :: m(1:2, *)
+    real x(2,2,2)
+    real, pointer :: q(:,:)
+    integer :: i
+    allocate (q(2,2))
+
+    q = cos (1.0 + abs(m))     ! { dg-error "upper bound in the last dimension" }
+
+    x = reshape (m, (/2,2,2/)) ! { dg-error "upper bound in the last dimension" }
+
+! PR20868
+    print *, ubound (m)        ! { dg-error "upper bound in the last dimension" }
+    print *, lbound (m)
+
+! PR20870
+    print *, size (m)          ! { dg-error "upper bound in the last dimension" }
+
+! Check non-array valued intrinsics
+    print *, ubound (m, 1)
+    print *, ubound (m, 2)     ! { dg-error "not a valid dimension index" }
+    
+    i = 2
+    print *, size (m, i)
+
+  end subroutine foo
+
+end program assumed_size_test_2
diff --git a/gcc/testsuite/gfortran.dg/backspace_3.f b/gcc/testsuite/gfortran.dg/backspace_3.f
new file mode 100644
index 00000000000..419063b94a2
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/backspace_3.f
@@ -0,0 +1,20 @@
+! { dg-do run }
+! PR25598 Error on repeated backspaces.
+! Derived from example given in PR by Dale Ranta
+! Contributed by Jerry DeLisle  <jvdelisle@gcc.gnu.org> 
+       integer data
+       data=-1
+       open(unit=11,status='scratch',form='unformatted')
+       write(11)data
+       read(11,end=        1000 )data
+       call abort()
+ 1000  continue
+       backspace 11
+       backspace 11
+       backspace 11
+       read(11,end=        1001 )data
+ 1001  continue
+       if (data.ne.-1) call abort
+       close(11)
+       end
+
diff --git a/gcc/testsuite/gfortran.dg/backspace_4.f b/gcc/testsuite/gfortran.dg/backspace_4.f
new file mode 100644
index 00000000000..69e0f40c7a1
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/backspace_4.f
@@ -0,0 +1,18 @@
+! { dg-do run }
+! PR25598 Error on repeated backspaces.
+! Derived from example given in PR by Dale Ranta
+! Contributed by Jerry DeLisle  <jvdelisle@gcc.gnu.org> 
+       integer data
+       data=-1
+       open(unit=11,status='scratch',form='unformatted')
+       write(11)data
+       read(11,end=        1000 )data
+       call abort()
+ 1000  continue
+       backspace 11
+       backspace 11
+       read(11,end=        1001 )data
+ 1001  continue
+       if (data.ne.-1) call abort
+       close(11)
+       end
diff --git a/gcc/testsuite/gfortran.dg/elemental_subroutine_1.f90 b/gcc/testsuite/gfortran.dg/elemental_subroutine_1.f90
new file mode 100644
index 00000000000..450dd059e09
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/elemental_subroutine_1.f90
@@ -0,0 +1,58 @@
+! { dg-do run }
+! Test the fix for pr22146, where and elemental subroutine with
+! array actual arguments would cause an ICE in gfc_conv_function_call.
+! The module is the original test case and the rest is a basic
+! functional test of the scalarization of the function call.
+!
+! Contributed by Erik Edelmann  <erik.edelmann@iki.fi>
+!             and Paul Thomas   <pault@gcc.gnu.org>
+
+  module pr22146
+
+contains
+
+    elemental subroutine foo(a)
+      integer, intent(out) :: a
+      a = 0
+    end subroutine foo
+
+    subroutine bar()
+      integer :: a(10)
+      call foo(a)
+    end subroutine bar
+
+end module pr22146
+
+  use pr22146
+  real, dimension (2)  :: x, y
+  real :: u, v
+  x = (/1.0, 2.0/)
+  u = 42.0
+
+  call bar ()
+
+! Check the various combinations of scalar and array.
+  call foobar (x, y)
+  if (any(y.ne.-x)) call abort ()
+
+  call foobar (u, y)
+  if (any(y.ne.-42.0)) call abort ()
+
+  call foobar (u, v)
+  if (v.ne.-42.0) call abort ()
+
+  call foobar (x, v)
+  if (v.ne.-2.0) call abort ()
+
+! Test an expression in the INTENT(IN) argument
+  call foobar (cos (x) + u, y)
+  if (any(abs (y + cos (x) + u) .gt. 2.0e-6)) call abort ()
+
+contains
+
+  elemental subroutine foobar (a, b)
+    real, intent(IN) :: a
+    real, intent(out) :: b
+    b = -a
+  end subroutine foobar
+end
\ No newline at end of file
diff --git a/gcc/testsuite/gfortran.dg/elemental_subroutine_2.f90 b/gcc/testsuite/gfortran.dg/elemental_subroutine_2.f90
new file mode 100644
index 00000000000..5683de89d37
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/elemental_subroutine_2.f90
@@ -0,0 +1,64 @@
+! { dg-do run }
+! Test the fix for pr22146, where and elemental subroutine with
+! array actual arguments would cause an ICE in gfc_conv_function_call.
+! This test checks that the main uses for elemental subroutines work
+! correctly; namely, as module procedures and as procedures called
+! from elemental functions. The compiler would ICE on the former with
+! the first version of the patch.
+!
+! Contributed by Paul Thomas   <pault@gcc.gnu.org>
+
+module type
+  type itype
+    integer :: i
+    character(1) :: ch
+  end type itype
+end module type
+
+module assign
+  interface assignment (=)
+    module procedure itype_to_int
+  end interface
+contains
+  elemental subroutine itype_to_int (i, it)
+    use type
+    type(itype), intent(in) :: it
+    integer, intent(out) :: i
+    i = it%i
+  end subroutine itype_to_int
+
+  elemental function i_from_itype (it) result (i)
+    use type
+    type(itype), intent(in) :: it
+    integer :: i
+    i = it
+  end function i_from_itype
+
+end module assign
+
+program test_assign
+  use type
+  use assign
+  type(itype) :: x(2, 2)
+  integer :: i(2, 2)
+
+! Test an elemental subroutine call from an elementary function.
+  x = reshape ((/(itype (j, "a"), j = 1,4)/), (/2,2/))
+  forall (j = 1:2, k = 1:2)
+    i(j, k) = i_from_itype (x (j, k))
+  end forall
+  if (any(reshape (i, (/4/)).ne.(/1,2,3,4/))) call abort ()
+
+! Check the interface assignment (not part of the patch).
+  x = reshape ((/(itype (j**2, "b"), j = 1,4)/), (/2,2/))
+  i = x
+  if (any(reshape (i, (/4/)).ne.(/1,4,9,16/))) call abort ()
+
+! Use the interface assignment within a forall block.
+  x = reshape ((/(itype (j**3, "c"), j = 1,4)/), (/2,2/))
+  forall (j = 1:2, k = 1:2)
+    i(j, k) = x (j, k)
+  end forall
+  if (any(reshape (i, (/4/)).ne.(/1,8,27,64/))) call abort ()
+
+end program test_assign
\ No newline at end of file
diff --git a/gcc/testsuite/gfortran.dg/fmt_white.f b/gcc/testsuite/gfortran.dg/fmt_white.f
index 21a0d871dde..bcd056f7fb9 100644
--- a/gcc/testsuite/gfortran.dg/fmt_white.f
+++ b/gcc/testsuite/gfortran.dg/fmt_white.f
@@ -1,13 +1,18 @@
 ! { dg-do run }
 ! PR24268 Test case derived from example given by Iwan Kawrakow
+! Embedded spaces in format strings should be ignored.
 ! Prepared by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
       program pr24268
       real x
-      character*11 line
+      character*13 line
       line = "12.34"
       read(line,*) x
       write(line,10) x
  10                                                            format(g1
      *      1.4)
       if (line.ne."  12.34") call abort()
+      line = ""
+      write(line,20) x
+ 20   format(t r 2 , g 1 1 . 4)
+      if (line.ne."    12.34") call abort()
       end
diff --git a/gcc/testsuite/gfortran.dg/forall_2.f90 b/gcc/testsuite/gfortran.dg/forall_2.f90
new file mode 100644
index 00000000000..223c2cea79e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/forall_2.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! PR fortran/25101  -- Stride must be nonzero.
+program forall_2
+   integer :: a(10),j(2),i
+   forall(i=1:2:0)  ! { dg-error "stride expression at" }
+     a(i)=1
+   end forall
+end program forall_2
+
diff --git a/gcc/testsuite/gfortran.dg/forall_3.f90 b/gcc/testsuite/gfortran.dg/forall_3.f90
new file mode 100644
index 00000000000..bc5e58c8077
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/forall_3.f90
@@ -0,0 +1,18 @@
+! the problem here was that we had forgot to call
+! fold_convert in gfc_trans_pointer_assign_need_temp
+! so that we got a pointer to char instead of a 
+! pointer to an array
+! we really don't need a temp here.
+! { dg-do compile }
+
+      program test_forall
+         type element
+            character(32), pointer :: name
+         end type element
+         type(element)     :: charts(50)
+         character(32), target :: names(50)
+         forall(i=1:50)
+            charts(i)%name => names(i)
+         end forall
+      end
+
diff --git a/gcc/testsuite/gfortran.dg/ichar_2.f90 b/gcc/testsuite/gfortran.dg/ichar_2.f90
new file mode 100644
index 00000000000..27b9ffcc401
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/ichar_2.f90
@@ -0,0 +1,16 @@
+! { dg-do run }
+! Test char and ichar intrinsic functions
+Program test
+integer i
+
+if (ichar (char (0)) .ne. 0) call abort ()
+if (ichar (char (255)) .ne. 255) call abort ()
+if (ichar (char (127)) .ne. 127) call abort ()
+
+i = 0
+if (ichar (char (i)) .ne. i) call abort ()
+i = 255
+if (ichar (char (i)) .ne. i) call abort ()
+i = 127
+if (ichar (char (i)) .ne. i) call abort ()
+end
diff --git a/gcc/testsuite/gfortran.dg/initialization_1.f90 b/gcc/testsuite/gfortran.dg/initialization_1.f90
index 8ec34c0f4c1..4f8cdf1cc7b 100644
--- a/gcc/testsuite/gfortran.dg/initialization_1.f90
+++ b/gcc/testsuite/gfortran.dg/initialization_1.f90
@@ -29,7 +29,7 @@ contains
     integer :: m2(2) = shape (x)  ! { dg-error "assumed size array" }
 
 ! These are warnings because they are gfortran extensions.
-    integer :: m3 = size (x, 1)   ! { dg-warning "Evaluation of nonstandard initialization" }
+    integer :: m3 = size (x, 1)   ! { dg-warning "upper bound in the last dimension" }
     integer :: m4(2) = shape (z)  ! { dg-warning "Evaluation of nonstandard initialization" }
 
 ! This does not depend on non-constant properties.
diff --git a/gcc/testsuite/gfortran.dg/label_2.f90 b/gcc/testsuite/gfortran.dg/label_2.f90
new file mode 100644
index 00000000000..7b87f6c240b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/label_2.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! PR fortran/24640.  We needed to check that whitespace follows
+! a statement label in free form.
+!
+program pr24640
+
+10: a=10   ! { dg-error "character in statement" }
+
+end program
+
diff --git a/gcc/testsuite/gfortran.dg/literal_character_constant_1.inc b/gcc/testsuite/gfortran.dg/literal_character_constant_1.inc
new file mode 100644
index 00000000000..ba24966b72a
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/literal_character_constant_1.inc
@@ -0,0 +1,20 @@
+C     fixed-form literal character constant with continuation line padding test
+C     PR fortran/25486
+      program a
+      character(len=90) c
+      character(90) :: fil
+c A tab is between 8 and 9.
+      c = '1234567
+     &8	9'
+      write(fil,'(a)') c
+#ifdef LL_NONE
+      if(fil.ne. "12345678	9")
+     &  call abort
+#else
+      if(fil.ne.
+     &"1234567                                                      8	9"
+     &)
+     &  call abort
+#endif
+      end
+
diff --git a/gcc/testsuite/gfortran.dg/literal_character_constant_1_x.F b/gcc/testsuite/gfortran.dg/literal_character_constant_1_x.F
new file mode 100644
index 00000000000..ceb2bd98d04
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/literal_character_constant_1_x.F
@@ -0,0 +1,5 @@
+! { dg-do run }
+C     fixed-form literal character constant with continuation line padding test
+C     PR fortran/25486
+! { dg-options "" }
+#include "literal_character_constant_1.inc"
diff --git a/gcc/testsuite/gfortran.dg/literal_character_constant_1_y.F b/gcc/testsuite/gfortran.dg/literal_character_constant_1_y.F
new file mode 100644
index 00000000000..015d1d8d109
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/literal_character_constant_1_y.F
@@ -0,0 +1,5 @@
+! { dg-do run }
+C     fixed-form literal character constant with continuation line padding test
+C     PR fortran/25486
+! { dg-options "-ffixed-line-length-72" }
+#include "literal_character_constant_1.inc"
diff --git a/gcc/testsuite/gfortran.dg/literal_character_constant_1_z.F b/gcc/testsuite/gfortran.dg/literal_character_constant_1_z.F
new file mode 100644
index 00000000000..3f2ac2a427b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/literal_character_constant_1_z.F
@@ -0,0 +1,5 @@
+! { dg-do run }
+C     fixed-form literal character constant with continuation line padding test
+C     PR fortran/25486
+! { dg-options "-ffixed-line-length-none -DLL_NONE" }
+#include "literal_character_constant_1.inc"
diff --git a/gcc/testsuite/gfortran.dg/nesting_2.f90 b/gcc/testsuite/gfortran.dg/nesting_2.f90
new file mode 100644
index 00000000000..a260c04c732
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/nesting_2.f90
@@ -0,0 +1,16 @@
+! check to make the nested function dawsonseries_v gets the correct
+! fake return decl and that the outer (dawson_v) has an assignment of
+! just the fake return decl for real and not the inner's return decl.
+! { dg-do compile }
+FUNCTION dawson_v()
+  IMPLICIT NONE
+  REAL  :: dawson_v
+  dawson_v = 1.0
+
+  CONTAINS
+    FUNCTION dawsonseries_v()
+      IMPLICIT NONE
+      REAL, DIMENSION(1) :: dawsonseries_v
+      dawsonseries_v=1.0
+    END FUNCTION dawsonseries_v
+END FUNCTION dawson_v
diff --git a/gcc/testsuite/gfortran.dg/nesting_3.f90 b/gcc/testsuite/gfortran.dg/nesting_3.f90
new file mode 100644
index 00000000000..234f50e2083
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/nesting_3.f90
@@ -0,0 +1,15 @@
+! check to make the nested function dawsonseries_v gets the correct
+! fake return decl and that the outer (dawson_v) has an assignment of
+! just the fake return decl for real and not the inner's return decl.
+! { dg-do compile }
+FUNCTION dawson_v()
+  IMPLICIT NONE
+  REAL,DIMENSION(1)  :: dawson_v
+  dawson_v = 1.0
+  CONTAINS
+    FUNCTION dawsonseries_v()
+      IMPLICIT NONE
+      REAL, DIMENSION(1) :: dawsonseries_v
+      dawsonseries_v=1.0
+    END FUNCTION dawsonseries_v
+END FUNCTION dawson_v
diff --git a/gcc/testsuite/gfortran.dg/pr15140.f90 b/gcc/testsuite/gfortran.dg/pr15140.f90
index 393badcd4ea..0f566dcd1d4 100644
--- a/gcc/testsuite/gfortran.dg/pr15140.f90
+++ b/gcc/testsuite/gfortran.dg/pr15140.f90
@@ -3,7 +3,7 @@
 ! argument of the subroutine directly, but instead use a copy of it.
 function M(NAMES)
   CHARACTER*(*) NAMES(*)
-  if (any(names.ne."asdfg")) call abort
+  if (any(names(1:2).ne."asdfg")) call abort
   m = LEN(NAMES(1))
 END function M
 
diff --git a/gcc/testsuite/gfortran.dg/private_type_4.f90 b/gcc/testsuite/gfortran.dg/private_type_4.f90
new file mode 100644
index 00000000000..a5b5578c45a
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/private_type_4.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+! PR 25093: Check that a PUBLIC function can't be of PRIVATE type
+module m1
+
+    type :: t1
+        integer :: i
+    end type t1
+
+    private :: t1
+    public :: f1     ! { dg-error "cannot be of PRIVATE type" }
+
+contains
+
+    type(t1) function f1()
+    end function
+
+end module
diff --git a/gcc/testsuite/gfortran.dg/single_char_string.f90 b/gcc/testsuite/gfortran.dg/single_char_string.f90
new file mode 100644
index 00000000000..479456cfea8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/single_char_string.f90
@@ -0,0 +1,36 @@
+! { dg-do run }
+! { dg-options "-fdump-tree-original" }
+! PR12456 - Optimize string(k:k) as single character.
+
+Program pr12456
+character a
+character b
+character (len=5) :: c
+integer i
+
+b = 'a'
+a = b
+if (a .ne. 'a') call abort()
+if (a .ne. b) call abort()
+c (3:3) = 'a'
+if (c (3:3) .ne. b) call abort ()
+if (c (3:3) .ne. 'a') call abort ()
+if (LGT (a, c (3:3))) call abort ()
+if (LGT (a, 'a')) call abort ()
+
+i = 3
+c (i:i) = 'a'
+if (c (i:i) .ne. b) call abort ()
+if (c (i:i) .ne. 'a') call abort ()
+if (LGT (a, c (i:i))) call abort ()
+
+if (a .gt. char (255)) call abort ()
+end
+
+! There should not be _gfortran_compare_string and _gfortran_copy_string in
+! the dumped file.
+
+! { dg-final { scan-tree-dump-times "_gfortran_compare_string" 0 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_copy_string" 0 "original" } }
+
+! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/used_types_1.f90 b/gcc/testsuite/gfortran.dg/used_types_1.f90
new file mode 100644
index 00000000000..61356ab2c56
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/used_types_1.f90
@@ -0,0 +1,21 @@
+! { dg-do compile }
+! This checks that the fix for PR25730, which was a regression
+! caused by the fix for PR19362.
+!
+! Contributed by Andrea Bedini <andrea.bedini@gmail.com>
+!==============
+MODULE testcase
+  TYPE orbit_elem
+     CHARACTER(4) :: coo
+  END TYPE orbit_elem
+END MODULE
+MODULE tp_trace
+  USE testcase
+  TYPE(orbit_elem) :: tp_store
+CONTAINS
+  SUBROUTINE str_clan()
+    USE testcase
+    TYPE(orbit_elem) :: mtpcar
+    mtpcar%coo='a'             !ICE was here
+  END SUBROUTINE str_clan
+END MODULE
diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index 48f13bfe7ef..2f05ba55c46 100644
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -77,13 +77,13 @@ proc fortran-torture-compile { src option } {
  
     if [string match "$fatal_signal 6" $comp_output] then {
 	gfortran_fail $testcase "Got Signal 6, $option"
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
     if [string match "$fatal_signal 11" $comp_output] then {
 	gfortran_fail $testcase "Got Signal 11, $option"
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
@@ -92,7 +92,7 @@ proc fortran-torture-compile { src option } {
 	warning "$testcase: (with warnings) $option"
 	send_log "$comp_output\n"
 	unresolved "$testcase, $option"
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
@@ -103,7 +103,7 @@ proc fortran-torture-compile { src option } {
     set unsupported_message [gfortran_check_unsupported_p $comp_output]
     if { $unsupported_message != "" } {
 	unsupported "$testcase: $unsupported_message"
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
@@ -113,12 +113,12 @@ proc fortran-torture-compile { src option } {
     # If any message remains, we fail.
     if ![string match "" $comp_output] then {
 	gfortran_fail $testcase $option
-	remote_file build delete $output
+	catch { remote_file build delete $output }
 	return
     }
 
     gfortran_pass $testcase $option
-    remote_file build delete $output
+    catch { remote_file build delete $output }
 }
 
 
@@ -195,13 +195,13 @@ proc fortran-torture-execute { src } {
 	
 	if [string match "$fatal_signal 6" $comp_output] then {
 	    gfortran_fail $testcase "Got Signal 6, $option"
-	    remote_file build delete $executable
+	    catch { remote_file build delete $executable }
 	    continue
 	}
 	
 	if [string match "$fatal_signal 11" $comp_output] then {
 	    gfortran_fail $testcase "Got Signal 11, $option"
-	    remote_file build delete $executable
+	    catch { remote_file build delete $executable }
 	    continue
 	}
 	
@@ -210,7 +210,7 @@ proc fortran-torture-execute { src } {
 	    warning "$testcase: (with warnings) $option"
 	    send_log "$comp_output\n"
 	    unresolved "$testcase, $option"
-	    remote_file build delete $executable
+	    catch { remote_file build delete $executable }
 	    continue
 	}
 	
@@ -265,7 +265,7 @@ proc fortran-torture-execute { src } {
 	set status [lindex $result 0]
 	set output [lindex $result 1]
         if { $status == "pass" } {
-	    remote_file build delete $executable
+	    catch { remote_file build delete $executable }
         }
 	$status "$testcase execution, $option"
     }
diff --git a/gcc/testsuite/lib/gcov.exp b/gcc/testsuite/lib/gcov.exp
index 9488db34f87..40931761797 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.exp b/gcc/testsuite/lib/target-supports.exp
index 7779e0ebe04..8c1fd5a0c4f 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -131,7 +131,7 @@ proc check_visibility_available { what_kind } {
     global target_triplet
 
     # On NetWare, support makes no sense.
-    if { [string match "*-*-netware*" $target_triplet] } {
+    if { [istarget *-*-netware*] } {
         return 0
     }
 
@@ -279,6 +279,11 @@ proc check_profiling_available { test_what } {
 	return 0
     }
 
+    # At present, there is no profiling support on NetWare.
+    if { [istarget *-*-netware*] } {
+	return 0
+    }
+
     # Now examine the cache variable.
     if {![info exists profiling_available_saved]} {
 	# Some targets don't have any implementation of __bb_init_func or are
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 64f009d63e7..91dda4d3620 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1383,6 +1383,30 @@ tree_merge_blocks (basic_block a, basic_block b)
 }
 
 
+/* Return the one of two successors of BB that is not reachable by a
+   reached by a complex edge, if there is one.  Else, return BB.  We use
+   this in optimizations that use post-dominators for their heuristics,
+   to catch the cases in C++ where function calls are involved.  */
+    
+basic_block
+single_noncomplex_succ (basic_block bb)  
+{
+  edge e0, e1;
+  if (EDGE_COUNT (bb->succs) != 2)
+    return bb;
+   
+  e0 = EDGE_SUCC (bb, 0);
+  e1 = EDGE_SUCC (bb, 1);
+  if (e0->flags & EDGE_COMPLEX)
+    return e1->dest;
+  if (e1->flags & EDGE_COMPLEX)
+    return e0->dest;
+   
+  return bb;
+}       
+        
+
+
 /* Walk the function tree removing unnecessary statements.
 
      * Empty statement nodes are removed
diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h
index 4271d99009f..a6740b328fc 100644
--- a/gcc/tree-flow.h
+++ b/gcc/tree-flow.h
@@ -514,6 +514,7 @@ extern bool is_ctrl_stmt (tree);
 extern bool is_ctrl_altering_stmt (tree);
 extern bool computed_goto_p (tree);
 extern bool simple_goto_p (tree);
+extern basic_block single_noncomplex_succ (basic_block bb);
 extern void tree_dump_bb (basic_block, FILE *, int);
 extern void debug_tree_bb (basic_block);
 extern basic_block debug_tree_bb_n (int);
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 6bb3fdebb64..01b7cfc50fc 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1200,6 +1200,10 @@ declare_return_variable (copy_body_data *id, tree return_slot_addr,
 	var = return_slot_addr;
       else
 	var = build_fold_indirect_ref (return_slot_addr);
+      if (TREE_CODE (TREE_TYPE (result)) == COMPLEX_TYPE
+	  && !DECL_COMPLEX_GIMPLE_REG_P (result)
+	  && DECL_P (var))
+	DECL_COMPLEX_GIMPLE_REG_P (var) = 0;
       use = NULL;
       goto done;
     }
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index 456043fc3f4..825c0bdec61 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -35,7 +35,55 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 	z = z * rmodulus;
 
    We do this for loop invariant divisors, and with this pass whenever
-   we notice that a division has the same divisor multiple times.  */
+   we notice that a division has the same divisor multiple times.
+
+   Of course, like in PRE, we don't insert a division if a dominator
+   already has one.  However, this cannot be done as an extension of
+   PRE for several reasons.
+
+   First of all, with some experiments it was found out that the
+   transformation is not always useful if there are only two divisions
+   hy the same divisor.  This is probably because modern processors
+   can pipeline the divisions; on older, in-order processors it should
+   still be effective to optimize two divisions by the same number.
+   We make this a param, and it shall be called N in the remainder of
+   this comment.
+
+   Second, if trapping math is active, we have less freedom on where
+   to insert divisions: we can only do so in basic blocks that already
+   contain one.  (If divisions don't trap, instead, we can insert
+   divisions elsewhere, which will be in blocks that are common dominators
+   of those that have the division).
+
+   We really don't want to compute the reciprocal unless a division will
+   be found.  To do this, we won't insert the division in a basic block
+   that has less than N divisions *post-dominating* it.
+
+   The algorithm constructs a subset of the dominator tree, holding the
+   blocks containing the divisions and the common dominators to them,
+   and walk it twice.  The first walk is in post-order, and it annotates
+   each block with the number of divisions that post-dominate it: this
+   gives information on where divisions can be inserted profitably.
+   The second walk is in pre-order, and it inserts divisions as explained
+   above, and replaces divisions by multiplications.
+
+   In the best case, the cost of the pass is O(n_statements).  In the
+   worst-case, the cost is due to creating the dominator tree subset,
+   with a cost of O(n_basic_blocks ^ 2); however this can only happen
+   for n_statements / n_basic_blocks statements.  So, the amortized cost
+   of creating the dominator tree subset is O(n_basic_blocks) and the
+   worst-case cost of the pass is O(n_statements * n_basic_blocks).
+
+   More practically, the cost will be small because there are few
+   divisions, and they tend to be in the same basic block, so insert_bb
+   is called very few times.
+
+   If we did this using domwalk.c, an efficient implementation would have
+   to work on all the variables in a single pass, because we could not
+   work on just a subset of the dominator tree, as we do now, and the
+   cost would also be something like O(n_statements * n_basic_blocks).
+   The data structures would be more complex in order to work on all the
+   variables in a single pass.  */
 
 #include "config.h"
 #include "system.h"
@@ -47,142 +95,407 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "real.h"
 #include "timevar.h"
 #include "tree-pass.h"
+#include "alloc-pool.h"
+#include "basic-block.h"
+#include "target.h"
 
-static bool
-gate_cse_reciprocals (void)
+
+/* This structure represents one basic block that either computes a
+   division, or is a common dominator for basic block that compute a
+   division.  */
+struct occurrence {
+  /* The basic block represented by this structure.  */
+  basic_block bb;
+
+  /* If non-NULL, the SSA_NAME holding the definition for a reciprocal
+     inserted in BB.  */
+  tree recip_def;
+
+  /* If non-NULL, the MODIFY_EXPR for a reciprocal computation that
+     was inserted in BB.  */
+  tree recip_def_stmt;
+
+  /* Pointer to a list of "struct occurrence"s for blocks dominated
+     by BB.  */
+  struct occurrence *children;
+
+  /* Pointer to the next "struct occurrence"s in the list of blocks
+     sharing a common dominator.  */
+  struct occurrence *next;
+
+  /* The number of divisions that are in BB before compute_merit.  The
+     number of divisions that are in BB or post-dominate it after
+     compute_merit.  */
+  int num_divisions;
+
+  /* True if the basic block has a division, false if it is a common
+     dominator for basic blocks that do.  If it is false and trapping
+     math is active, BB is not a candidate for inserting a reciprocal.  */
+  bool bb_has_division;
+};
+
+
+/* The instance of "struct occurrence" representing the highest
+   interesting block in the dominator tree.  */
+static struct occurrence *occ_head;
+
+/* Allocation pool for getting instances of "struct occurrence".  */
+static alloc_pool occ_pool;
+
+
+
+/* Allocate and return a new struct occurrence for basic block BB, and
+   whose children list is headed by CHILDREN.  */
+static struct occurrence *
+occ_new (basic_block bb, struct occurrence *children)
 {
-  return optimize && !optimize_size && flag_unsafe_math_optimizations;
+  struct occurrence *occ;
+
+  occ = bb->aux = pool_alloc (occ_pool);
+  memset (occ, 0, sizeof (struct occurrence));
+
+  occ->bb = bb;
+  occ->children = children;
+  return occ;
 }
 
-/* Where to put the statement computing a reciprocal.  */
-enum place_reciprocal
+
+/* Insert NEW_OCC into our subset of the dominator tree.  P_HEAD points to a
+   list of "struct occurrence"s, one per basic block, having IDOM as
+   their common dominator.
+
+   We try to insert NEW_OCC as deep as possible in the tree, and we also
+   insert any other block that is a common dominator for BB and one
+   block already in the tree.  */
+
+static void
+insert_bb (struct occurrence *new_occ, basic_block idom,
+	   struct occurrence **p_head)
 {
-  PR_BEFORE_BSI,	/* Put it using bsi_insert_before.  */
-  PR_AFTER_BSI,		/* Put it using bsi_insert_after.  */
-  PR_ON_ENTRY_EDGE	/* Put it on the edge between the entry
-			   and the first basic block.  */
-};
+  struct occurrence *occ, **p_occ;
 
-/* Check if DEF's uses include more than one floating-point division,
-   and if so replace them by multiplications with the reciprocal.  Add
-   the statement computing the reciprocal according to WHERE.
+  for (p_occ = p_head; (occ = *p_occ) != NULL; )
+    {
+      basic_block bb = new_occ->bb, occ_bb = occ->bb;
+      basic_block dom = nearest_common_dominator (CDI_DOMINATORS, occ_bb, bb);
+      if (dom == bb)
+	{
+	  /* BB dominates OCC_BB.  OCC becomes NEW_OCC's child: remove OCC
+	     from its list.  */
+	  *p_occ = occ->next;
+	  occ->next = new_occ->children;
+	  new_occ->children = occ;
+
+	  /* Try the next block (it may as well be dominated by BB).  */
+	}
+
+      else if (dom == occ_bb)
+	{
+	  /* OCC_BB dominates BB.  Tail recurse to look deeper.  */
+	  insert_bb (new_occ, dom, &occ->children);
+	  return;
+	}
+
+      else if (dom != idom)
+	{
+	  gcc_assert (!dom->aux);
+
+	  /* There is a dominator between IDOM and BB, add it and make
+	     two children out of NEW_OCC and OCC.  First, remove OCC from
+	     its list.	*/
+	  *p_occ = occ->next;
+	  new_occ->next = occ;
+	  occ->next = NULL;
+
+	  /* None of the previous blocks has DOM as a dominator: if we tail
+	     recursed, we would reexamine them uselessly. Just switch BB with
+	     DOM, and go on looking for blocks dominated by DOM.  */
+          new_occ = occ_new (dom, new_occ);
+	}
+
+      else
+	{
+	  /* Nothing special, go on with the next element.  */
+	  p_occ = &occ->next;
+	}
+    }
+
+  /* No place was found as a child of IDOM.  Make BB a sibling of IDOM.  */
+  new_occ->next = *p_head;
+  *p_head = new_occ;
+}
+
+/* Register that we found a division in BB.  */
+
+static inline void
+register_division_in (basic_block bb)
+{
+  struct occurrence *occ;
+
+  occ = (struct occurrence *) bb->aux;
+  if (!occ)
+    {
+      occ = occ_new (bb, NULL);
+      insert_bb (occ, ENTRY_BLOCK_PTR, &occ_head);
+    }
+
+  occ->bb_has_division = true;
+  occ->num_divisions++;
+}
+
+
+/* Compute the number of divisions that postdominate each block in OCC and
+   its children.  */
 
-   Does not check the type of DEF, nor that DEF is a GIMPLE register.
-   This is done in the caller for speed, because otherwise this routine
-   would be called for every definition and phi node.  */
 static void
-execute_cse_reciprocals_1 (block_stmt_iterator *bsi, tree def,
-			   enum place_reciprocal where)
+compute_merit (struct occurrence *occ)
 {
-  use_operand_p use_p;
-  imm_use_iterator use_iter;
-  tree t, new_stmt, type;
-  int count = 0;
-  bool ok = !flag_trapping_math;
+  struct occurrence *occ_child;
+  basic_block dom = occ->bb;
 
-  /* Find uses.  */
-  FOR_EACH_IMM_USE_FAST (use_p, use_iter, def)
+  for (occ_child = occ->children; occ_child; occ_child = occ_child->next)
     {
-      tree use_stmt = USE_STMT (use_p);
-      if (TREE_CODE (use_stmt) == MODIFY_EXPR
-	  && TREE_CODE (TREE_OPERAND (use_stmt, 1)) == RDIV_EXPR
-	  && TREE_OPERAND (TREE_OPERAND (use_stmt, 1), 1) == def)
+      basic_block bb;
+      if (occ_child->children)
+        compute_merit (occ_child);
+
+      if (flag_exceptions)
+	bb = single_noncomplex_succ (dom);
+      else
+	bb = dom;
+
+      if (dominated_by_p (CDI_POST_DOMINATORS, bb, occ_child->bb))
+        occ->num_divisions += occ_child->num_divisions;
+    }
+}
+
+
+/* Return whether USE_STMT is a floating-point division by DEF.  */
+static inline bool
+is_division_by (tree use_stmt, tree def)
+{
+  return TREE_CODE (use_stmt) == MODIFY_EXPR
+	 && TREE_CODE (TREE_OPERAND (use_stmt, 1)) == RDIV_EXPR
+	 && TREE_OPERAND (TREE_OPERAND (use_stmt, 1), 1) == def;
+}
+
+/* Walk the subset of the dominator tree rooted at OCC, setting the
+   RECIP_DEF field to a definition of 1.0 / DEF that can be used in
+   the given basic block.  The field may be left NULL, of course,
+   if it is not possible or profitable to do the optimization.
+
+   DEF_BSI is an iterator pointing at the statement defining DEF.
+   If RECIP_DEF is set, a dominator already has a computation that can
+   be used.  */
+
+static void
+insert_reciprocals (block_stmt_iterator *def_bsi, struct occurrence *occ,
+		    tree def, tree recip_def, int threshold)
+{
+  tree type, new_stmt;
+  block_stmt_iterator bsi;
+  struct occurrence *occ_child;
+
+  if (!recip_def
+      && (occ->bb_has_division || !flag_trapping_math)
+      && occ->num_divisions >= threshold)
+    {
+      /* Make a variable with the replacement and substitute it.  */
+      type = TREE_TYPE (def);
+      recip_def = make_rename_temp (type, "reciptmp");
+      new_stmt = build2 (MODIFY_EXPR, void_type_node, recip_def,
+		         fold_build2 (RDIV_EXPR, type,
+				      build_real (type, dconst1), def));
+  
+  
+      if (occ->bb_has_division)
+        {
+          /* Case 1: insert before an existing division.  */
+          bsi = bsi_after_labels (occ->bb);
+          while (!bsi_end_p (bsi) && !is_division_by (bsi_stmt (bsi), def))
+	    bsi_next (&bsi);
+
+          bsi_insert_before (&bsi, new_stmt, BSI_SAME_STMT);
+        }
+      else if (def_bsi && occ->bb == def_bsi->bb)
         {
-          ++count;
-          /* Check if this use post-dominates the insertion point.  */
-          if (ok || dominated_by_p (CDI_POST_DOMINATORS, bsi->bb,
-				    bb_for_stmt (use_stmt)))
-	    ok = true;
+          /* Case 2: insert right after the definition.  Note that this will
+	     never happen if the definition statement can throw, because in
+	     that case the sole successor of the statement's basic block will
+	     dominate all the uses as well.  */
+          bsi_insert_after (def_bsi, new_stmt, BSI_NEW_STMT);
         }
-      if (count >= 2 && ok)
-        break;
+      else
+        {
+          /* Case 3: insert in a basic block not containing defs/uses.  */
+          bsi = bsi_after_labels (occ->bb);
+          bsi_insert_before (&bsi, new_stmt, BSI_SAME_STMT);
+        }
+
+      occ->recip_def_stmt = new_stmt;
     }
 
-  if (count < 2 || !ok)
-    return;
-
-  /* Make a variable with the replacement and substitute it.  */
-  type = TREE_TYPE (def);
-  t = make_rename_temp (type, "reciptmp");
-  new_stmt = build2 (MODIFY_EXPR, void_type_node, t,
-		     fold_build2 (RDIV_EXPR, type, build_real (type, dconst1),
-				  def));
-
-  if (where == PR_BEFORE_BSI)
-    bsi_insert_before (bsi, new_stmt, BSI_SAME_STMT);
-  else if (where == PR_AFTER_BSI)
-    bsi_insert_after (bsi, new_stmt, BSI_NEW_STMT);
-  else if (where == PR_ON_ENTRY_EDGE)
-    bsi_insert_on_edge (single_succ_edge (ENTRY_BLOCK_PTR), new_stmt);
+  occ->recip_def = recip_def;
+  for (occ_child = occ->children; occ_child; occ_child = occ_child->next)
+    insert_reciprocals (def_bsi, occ_child, def, recip_def, threshold);
+}
+
+
+/* Replace the division at USE_P with a multiplication by the reciprocal, if
+   possible.  */
+
+static inline void
+replace_reciprocal (use_operand_p use_p)
+{
+  tree use_stmt = USE_STMT (use_p);
+  basic_block bb = bb_for_stmt (use_stmt);
+  struct occurrence *occ = (struct occurrence *) bb->aux;
+
+  if (occ->recip_def && use_stmt != occ->recip_def_stmt)
+    {
+      TREE_SET_CODE (TREE_OPERAND (use_stmt, 1), MULT_EXPR);
+      SET_USE (use_p, occ->recip_def);
+      fold_stmt_inplace (use_stmt);
+      update_stmt (use_stmt);
+    }
+}
+
+
+/* Free OCC and return one more "struct occurrence" to be freed.  */
+
+static struct occurrence *
+free_bb (struct occurrence *occ)
+{
+  struct occurrence *child, *next;
+
+  /* First get the two pointers hanging off OCC.  */
+  next = occ->next;
+  child = occ->children;
+  occ->bb->aux = NULL;
+  pool_free (occ_pool, occ);
+
+  /* Now ensure that we don't recurse unless it is necessary.  */
+  if (!child)
+    return next;
   else
-    gcc_unreachable ();
+    {
+      while (next)
+	next = free_bb (next);
+
+      return child;
+    }
+}
+
+
+/* Look for floating-point divisions among DEF's uses, and try to
+   replace them by multiplications with the reciprocal.  Add
+   as many statements computing the reciprocal as needed.
+
+   DEF must be a GIMPLE register of a floating-point type.  */
+
+static void
+execute_cse_reciprocals_1 (block_stmt_iterator *def_bsi, tree def)
+{
+  use_operand_p use_p;
+  imm_use_iterator use_iter;
+  struct occurrence *occ;
+  int count = 0, threshold;
 
-  FOR_EACH_IMM_USE_SAFE (use_p, use_iter, def)
+  gcc_assert (FLOAT_TYPE_P (TREE_TYPE (def)) && is_gimple_reg (def));
+
+  FOR_EACH_IMM_USE_FAST (use_p, use_iter, def)
     {
       tree use_stmt = USE_STMT (use_p);
-      if (use_stmt != new_stmt
-	  && TREE_CODE (use_stmt) == MODIFY_EXPR
-	  && TREE_CODE (TREE_OPERAND (use_stmt, 1)) == RDIV_EXPR
-	  && TREE_OPERAND (TREE_OPERAND (use_stmt, 1), 1) == def)
+      if (is_division_by (use_stmt, def))
 	{
-	  TREE_SET_CODE (TREE_OPERAND (use_stmt, 1), MULT_EXPR);
-	  SET_USE (use_p, t);
+	  register_division_in (bb_for_stmt (use_stmt));
+	  count++;
 	}
     }
+  
+  /* Do the expensive part only if we can hope to optimize something.  */
+  threshold = targetm.min_divisions_for_recip_mul (TYPE_MODE (TREE_TYPE (def)));
+  if (count >= threshold)
+    {
+      for (occ = occ_head; occ; occ = occ->next)
+	{
+	  compute_merit (occ);
+	  insert_reciprocals (def_bsi, occ, def, NULL, threshold);
+	}
+
+      FOR_EACH_IMM_USE_SAFE (use_p, use_iter, def)
+	{
+	  tree use_stmt = USE_STMT (use_p);
+	  if (is_division_by (use_stmt, def))
+	    replace_reciprocal (use_p);
+	}
+    }
+
+  for (occ = occ_head; occ; )
+    occ = free_bb (occ);
+
+  occ_head = NULL;
 }
 
+
+static bool
+gate_cse_reciprocals (void)
+{
+  return optimize && !optimize_size && flag_unsafe_math_optimizations;
+}
+
+
+/* Go through all the floating-point SSA_NAMEs, and call
+   execute_cse_reciprocals_1 on each of them.  */
 static void
 execute_cse_reciprocals (void)
 {
   basic_block bb;
   tree arg;
 
-  if (flag_trapping_math)
-    calculate_dominance_info (CDI_POST_DOMINATORS);
+  occ_pool = create_alloc_pool ("dominators for recip",
+				sizeof (struct occurrence),
+				n_basic_blocks / 3 + 1);
 
-  if (single_succ_p (ENTRY_BLOCK_PTR))
-    for (arg = DECL_ARGUMENTS (cfun->decl); arg; arg = TREE_CHAIN (arg))
-      if (default_def (arg))
-	{
-	  block_stmt_iterator bsi;
-	  bsi = bsi_start (single_succ (ENTRY_BLOCK_PTR));
-	  execute_cse_reciprocals_1 (&bsi, default_def (arg),
-				     PR_ON_ENTRY_EDGE);
-	}
+  calculate_dominance_info (CDI_DOMINATORS | CDI_POST_DOMINATORS);
+
+#ifdef ENABLE_CHECKING
+  FOR_EACH_BB (bb)
+    gcc_assert (!bb->aux);
+#endif
+
+  for (arg = DECL_ARGUMENTS (cfun->decl); arg; arg = TREE_CHAIN (arg))
+    if (default_def (arg)
+	&& FLOAT_TYPE_P (TREE_TYPE (arg))
+	&& is_gimple_reg (arg))
+      execute_cse_reciprocals_1 (NULL, default_def (arg));
 
   FOR_EACH_BB (bb)
     {
       block_stmt_iterator bsi;
       tree phi, def;
-      for (bsi = bsi_start (bb);
-	   !bsi_end_p (bsi) && TREE_CODE (bsi_stmt (bsi)) == LABEL_EXPR;
-	   bsi_next (&bsi))
-        ;
 
       for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi))
 	{
 	  def = PHI_RESULT (phi);
 	  if (FLOAT_TYPE_P (TREE_TYPE (def))
 	      && is_gimple_reg (def))
-	    execute_cse_reciprocals_1 (&bsi, def, PR_BEFORE_BSI);
+	    execute_cse_reciprocals_1 (NULL, def);
 	}
 
-      for (; !bsi_end_p (bsi); bsi_next (&bsi))
+      for (bsi = bsi_after_labels (bb); !bsi_end_p (bsi); bsi_next (&bsi))
         {
 	  tree stmt = bsi_stmt (bsi);
 	  if (TREE_CODE (stmt) == MODIFY_EXPR
 	      && (def = SINGLE_SSA_TREE_OPERAND (stmt, SSA_OP_DEF)) != NULL
 	      && FLOAT_TYPE_P (TREE_TYPE (def))
 	      && TREE_CODE (def) == SSA_NAME)
-	    execute_cse_reciprocals_1 (&bsi, def, PR_AFTER_BSI);
+	    execute_cse_reciprocals_1 (&bsi, def);
 	}
     }
 
-  if (flag_trapping_math)
-    free_dominance_info (CDI_POST_DOMINATORS);
-  
-  if (single_succ_p (ENTRY_BLOCK_PTR))
-    bsi_commit_one_edge_insert (single_succ_edge (ENTRY_BLOCK_PTR), NULL);
+  free_dominance_info (CDI_DOMINATORS | CDI_POST_DOMINATORS);
+  free_alloc_pool (occ_pool);
 }
 
 struct tree_opt_pass pass_cse_reciprocals =
diff --git a/gcc/tree.c b/gcc/tree.c
index f0436a78291..acfeb49c738 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -5934,7 +5934,26 @@ get_file_function_name_long (const char *type)
   char *q;
 
   if (first_global_object_name)
-    p = first_global_object_name;
+    {
+      p = first_global_object_name;
+
+      /* For type 'F', the generated name must be unique not only to this
+	 translation unit but also to any given link.  Since global names
+	 can be overloaded, we concatenate the first global object name
+	 with a string derived from the file name of this object.  */
+      if (!strcmp (type, "F"))
+	{
+	  const char *file = main_input_filename;
+
+	  if (! file)
+	    file = input_filename;
+
+	  q = alloca (strlen (p) + 10);
+	  sprintf (q, "%s_%08X", p, crc32_string (0, file));
+
+	  p = q;
+	}
+    }
   else
     {
       /* We don't have anything that we know to be unique to this translation
diff --git a/gcc/version.c b/gcc/version.c
index 680508ec153..d3b3bec5388 100644
--- a/gcc/version.c
+++ b/gcc/version.c
@@ -8,7 +8,7 @@
    in parentheses.  You may also wish to include a number indicating
    the revision of your modified compiler.  */
 
-#define VERSUFFIX " (Red Hat 4.1.0-0.14)"
+#define VERSUFFIX " (Red Hat 4.1.0-0.15)"
 
 /* This is the location of the online document giving instructions for
    reporting bugs.  If you distribute a modified version of GCC,
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 1e2ebbd934e..3c66b6f0bc0 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,26 @@
+2006-01-16  Roger Sayle  <roger@eyesopen.com>
+
+	* intrinsics/c99_functions.c: Add function prototypes to avoid
+	warnings from -Wstrict-prototypes -Wmissing-prototypes.  On Tru64
+	work around a brain-dead libm by redirecting calls to cabs{,f,l}
+	to a local __gfc_cabs{,f,l}.
+
+2006-01-11  Janne Blomqvist  <jb@gcc.gnu.org>
+
+        * configure.ac: Remove check for sys/mman.h.
+        * configure: Regenerated.
+        * Makefile.in: Regenerated.
+        * config.h.in: Regenerated.
+        * aclocal.m4: Regenerated.
+
+2006-01-07  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libgfortran/25598
+	* io/file_pos.c (unformatted_backspace): Assure the new file position
+	to seek is not less than zero.
+	(st_backspace): Set unit bytes_left to zero.
+	* io/transfer.c (next_record_r): Fix line lengths, no functional change.
+
 2005-12-31  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/25594
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index c1aa83a9382..e6f965ad5a2 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = $(libgfortran_la_SOURCES) $(libgfortranbegin_la_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -47,8 +45,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \
 	$(top_srcdir)/configure ChangeLog
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/../config/acx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/acx.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/libgfortran/aclocal.m4 b/libgfortran/aclocal.m4
index 0bf3204f07c..a5338183f92 100644
--- a/libgfortran/aclocal.m4
+++ b/libgfortran/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.
@@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -244,27 +244,6 @@ AC_DEFUN([AM_PROG_INSTALL_SH],
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
@@ -659,4 +638,5 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../config/lead-dot.m4])
 m4_include([acinclude.m4])
diff --git a/libgfortran/config.h.in b/libgfortran/config.h.in
index 92f088672d7..1c50c77a966 100644
--- a/libgfortran/config.h.in
+++ b/libgfortran/config.h.in
@@ -567,9 +567,6 @@
 /* Define to 1 if the target supports __sync_fetch_and_add */
 #undef HAVE_SYNC_FETCH_AND_ADD
 
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
-
 /* Define to 1 if you have the <sys/params.h> header file. */
 #undef HAVE_SYS_PARAMS_H
 
diff --git a/libgfortran/configure b/libgfortran/configure
index 88564f22104..d888c8ca1bb 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -969,7 +969,7 @@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -2628,8 +2628,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2687,8 +2686,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2804,8 +2802,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2859,8 +2856,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2905,8 +2901,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2950,8 +2945,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4149,7 +4143,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4152 "configure"' > conftest.$ac_ext
+  echo '#line 4146 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4296,8 +4290,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4539,7 +4532,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:4542:" \
+echo "$as_me:4535:" \
      "checking for Fortran compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -4585,8 +4578,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_fc_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_fc_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4635,8 +4627,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_fc_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_fc_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4742,8 +4733,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4772,8 +4762,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4843,8 +4832,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4896,8 +4884,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4968,8 +4955,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5021,8 +5007,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5345,8 +5330,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5516,8 +5500,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5585,8 +5568,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5775,8 +5757,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6016,8 +5997,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6085,8 +6065,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6258,8 +6237,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6412,8 +6390,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6532,8 +6509,7 @@ done
 
 
 
-
-for ac_header in sys/mman.h sys/types.h sys/stat.h floatingpoint.h ieeefp.h
+for ac_header in sys/types.h sys/stat.h floatingpoint.h ieeefp.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -6566,8 +6542,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6718,8 +6693,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6864,8 +6838,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7012,8 +6985,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7056,8 +7028,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7122,8 +7093,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7166,8 +7136,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7232,8 +7201,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7276,8 +7244,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7394,8 +7361,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7508,8 +7474,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7620,8 +7585,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7698,8 +7662,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7775,8 +7738,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7852,8 +7814,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7932,8 +7893,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8009,8 +7969,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8086,8 +8045,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8163,8 +8121,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8240,8 +8197,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8317,8 +8273,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8394,8 +8349,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8471,8 +8425,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8548,8 +8501,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8625,8 +8577,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8702,8 +8653,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8779,8 +8729,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8856,8 +8805,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8933,8 +8881,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9010,8 +8957,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9087,8 +9033,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9164,8 +9109,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9241,8 +9185,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9318,8 +9261,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9395,8 +9337,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9472,8 +9413,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9549,8 +9489,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9626,8 +9565,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9703,8 +9641,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9780,8 +9717,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9857,8 +9793,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9934,8 +9869,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10011,8 +9945,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10088,8 +10021,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10165,8 +10097,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10242,8 +10173,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10319,8 +10249,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10396,8 +10325,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10473,8 +10401,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10550,8 +10477,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10627,8 +10553,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10704,8 +10629,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10781,8 +10705,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10858,8 +10781,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10935,8 +10857,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11012,8 +10933,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11089,8 +11009,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11166,8 +11085,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11243,8 +11161,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11320,8 +11237,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11397,8 +11313,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11474,8 +11389,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11551,8 +11465,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11628,8 +11541,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11705,8 +11617,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11782,8 +11693,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11859,8 +11769,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11936,8 +11845,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12013,8 +11921,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12090,8 +11997,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12167,8 +12073,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12244,8 +12149,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12321,8 +12225,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12398,8 +12301,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12475,8 +12377,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12552,8 +12453,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12629,8 +12529,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12706,8 +12605,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12783,8 +12681,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12860,8 +12757,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12937,8 +12833,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13014,8 +12909,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13091,8 +12985,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13168,8 +13061,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13245,8 +13137,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13322,8 +13213,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13399,8 +13289,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13476,8 +13365,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13553,8 +13441,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13630,8 +13517,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13707,8 +13593,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13784,8 +13669,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13861,8 +13745,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13938,8 +13821,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14015,8 +13897,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14092,8 +13973,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14169,8 +14049,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14246,8 +14125,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14323,8 +14201,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14400,8 +14277,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14477,8 +14353,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14554,8 +14429,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14631,8 +14505,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14708,8 +14581,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14785,8 +14657,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14862,8 +14733,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14939,8 +14809,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15016,8 +14885,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15093,8 +14961,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15170,8 +15037,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15247,8 +15113,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15324,8 +15189,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15401,8 +15265,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15478,8 +15341,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15555,8 +15417,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15632,8 +15493,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15709,8 +15569,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15786,8 +15645,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15863,8 +15721,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15940,8 +15797,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16017,8 +15873,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16094,8 +15949,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16171,8 +16025,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16248,8 +16101,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16325,8 +16177,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16402,8 +16253,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16479,8 +16329,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16556,8 +16405,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16633,8 +16481,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16710,8 +16557,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16787,8 +16633,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16864,8 +16709,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16941,8 +16785,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17018,8 +16861,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17095,8 +16937,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17172,8 +17013,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17249,8 +17089,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17326,8 +17165,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17403,8 +17241,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17480,8 +17317,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17557,8 +17393,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17634,8 +17469,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17711,8 +17545,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17788,8 +17621,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17865,8 +17697,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17942,8 +17773,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18019,8 +17849,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18096,8 +17925,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18173,8 +18001,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18250,8 +18077,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18327,8 +18153,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18404,8 +18229,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18481,8 +18305,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18558,8 +18381,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18635,8 +18457,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18712,8 +18533,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18789,8 +18609,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18866,8 +18685,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18943,8 +18761,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19020,8 +18837,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19097,8 +18913,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19174,8 +18989,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19253,8 +19067,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19653,8 +19466,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19732,8 +19544,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19810,8 +19621,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19916,8 +19726,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20019,8 +19828,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20098,8 +19906,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20205,8 +20012,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20268,8 +20074,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20407,8 +20212,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20486,8 +20290,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20555,8 +20358,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20620,8 +20422,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20693,8 +20494,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20765,8 +20565,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20854,8 +20653,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22003,11 +21801,6 @@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -22046,6 +21839,12 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index eebf7d87682..c22b9223530 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -157,7 +157,7 @@ AC_TYPE_OFF_T
 AC_STDC_HEADERS
 AC_HAVE_HEADERS(stdlib.h stdio.h string.h stddef.h math.h unistd.h signal.h)
 AC_CHECK_HEADERS(time.h sys/params.h sys/time.h sys/times.h sys/resource.h)
-AC_CHECK_HEADERS(sys/mman.h sys/types.h sys/stat.h floatingpoint.h ieeefp.h)
+AC_CHECK_HEADERS(sys/types.h sys/stat.h floatingpoint.h ieeefp.h)
 AC_CHECK_HEADERS(fenv.h fptrap.h float.h)
 AC_CHECK_HEADER([complex.h],[AC_DEFINE([HAVE_COMPLEX_H], [1], [complex.h exists])])
 
diff --git a/libgfortran/intrinsics/c99_functions.c b/libgfortran/intrinsics/c99_functions.c
index 5e93e4279b2..feb4c08b479 100644
--- a/libgfortran/intrinsics/c99_functions.c
+++ b/libgfortran/intrinsics/c99_functions.c
@@ -35,6 +35,33 @@ Boston, MA 02110-1301, USA.  */
 #define C99_PROTOS_H WE_DONT_WANT_PROTOS_NOW
 #include "libgfortran.h"
 
+/* Tru64's <math.h> declares a non-C99 compliant implementation of cabs,
+   which takes two floating point arguments instead of a single complex.
+   To work around this we redirect cabs{,f,l} calls to __gfc_cabs{,f,l}.  */
+
+#ifdef __osf__
+#undef HAVE_CABS
+#undef HAVE_CABSF
+#undef HAVE_CABSL
+#define cabs __gfc_cabs
+#define cabsf __gfc_cabsf
+#define cabsl __gfc_cabsl
+#endif
+
+/* Prototypes to silence -Wstrict-prototypes -Wmissing-prototypes.  */
+
+float cabsf(float complex);
+double cabs(double complex);
+long double cabsl(long double complex);
+
+float cargf(float complex);
+double carg(double complex);
+long double cargl(long double complex);
+
+float complex clog10f(float complex);
+double complex clog10(double complex);
+long double complex clog10l(long double complex);
+
 
 #ifndef HAVE_ACOSF
 #define HAVE_ACOSF 1
diff --git a/libgfortran/io/file_pos.c b/libgfortran/io/file_pos.c
index d9ac1e7f7ed..ba8f6317221 100644
--- a/libgfortran/io/file_pos.c
+++ b/libgfortran/io/file_pos.c
@@ -120,7 +120,9 @@ unformatted_backspace (st_parameter_filepos *fpp, gfc_unit *u)
   else
     reverse_memcpy (&m, p, sizeof (gfc_offset));
 
-  new = file_position (u->s) - m - 2*length;
+  if ((new = file_position (u->s) - m - 2*length) < 0)
+    new = 0;
+
   if (sseek (u->s, new) == FAILURE)
     goto io_error;
 
@@ -179,6 +181,7 @@ st_backspace (st_parameter_filepos *fpp)
 
       u->endfile = NO_ENDFILE;
       u->current_record = 0;
+      u->bytes_left = 0;
     }
 
  done:
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 2c12294398e..049ebb24771 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -1645,8 +1645,10 @@ next_record_r (st_parameter_dt *dtp)
   switch (current_mode (dtp))
     {
     case UNFORMATTED_SEQUENTIAL:
-      dtp->u.p.current_unit->bytes_left += sizeof (gfc_offset);	/* Skip over tail */
 
+      /* Skip over tail */
+      dtp->u.p.current_unit->bytes_left += sizeof (gfc_offset);
+      
       /* Fall through...  */
 
     case FORMATTED_DIRECT:
@@ -1656,7 +1658,8 @@ next_record_r (st_parameter_dt *dtp)
 
       if (is_seekable (dtp->u.p.current_unit->s))
 	{
-	  new = file_position (dtp->u.p.current_unit->s) + dtp->u.p.current_unit->bytes_left;
+	  new = file_position (dtp->u.p.current_unit->s)
+		+ dtp->u.p.current_unit->bytes_left;
 
 	  /* Direct access files do not generate END conditions,
 	     only I/O errors.  */
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5b9cec3f25d..eb0aa498c51 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,73 @@
+2006-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.ac (dbexecdir): New substituted var.
+	* configure: Rebuilt.
+	* Makefile.am (dbexecdir): Remove.
+	* Makefile.in: Rebuilt.
+
+2006-01-08  Chris Burdess  <dog@gnu.org>
+
+	* java/lang/Character.java (toChars,toCodePoint): Correct these
+	  methods to use algorithms from Unicode specification.
+
+2006-01-09  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/21637:
+	* gnu/java/net/protocol/jar/Connection.java (getInputStream):
+	Throw FileNotFoundException if jar entry not found.
+
+2006-01-08  Tom Tromey  <tromey@redhat.com>
+
+	* java/lang/StringBuilder.java (appendCodePoint): New method.
+	(insert): New overloads.
+	* java/lang/StringBuffer.java (StringBuffer): New constructor.
+	(charAt): Remerged javadoc.
+	(codePointAt, codePointBefore): New methods.
+	(appendCodePoint): New method.
+	(append): New overloads.
+	(insert): Likewise.
+	(trimToSize, codePointCount, offsetByCodePoints): New methods.
+	* java/lang/Float.java (SIZE): New field.
+	(valueOf): New method.
+	* java/lang/natDouble.cc (initIDs): Removed.
+	* java/lang/Double.java (static initializer): Removed.
+	(SIZE): New field.
+	(valueOf): New method.
+	(initIDs): Removed.
+
+2006-01-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libgcj/24940
+	* shlibpath.m4: Replace $SED with sed.
+	* configure: Rebuilt.
+
+2006-01-06  Tom Tromey  <tromey@redhat.com>
+
+	* java/lang/Character.java (SIZE, MAX_CACHE, charCache,
+	MIN_SURROGATE, MAX_SURROGATE): New fields from Classpath.
+	(MIN_HIGH_SURROGATE, MAX_HIGH_SURROGATE, MIN_LOW_SURROGATE,
+	MAX_LOW_SURROGATE): Javadoc fixes.
+	(valueOf, reverseBytes, isHighSurrogate, isLowSurrogate,
+	isSurrogatePair, toCodePoint, codePointAt, codePointBefore): New
+	methods from Classpath.
+	* java/lang/String.java (codePointAt, codePointBefore,
+	codePointCount, contains, replace): New methods from Classpath.
+	(contentEquals): Declare.
+	* java/lang/natString.cc (contentEquals): New method.
+
+2005-12-26  Anthony Green  <green@redhat.com>
+
+	* gnu/java/nio/SocketChannelImpl.java (read): Compute the right amount
+	of data to read (dst.remaining()).
+	* gnu/java/nio/DatagramChannelImpl.java (receive): Ditto.
+
+2005-11-11  Mark Wielaard  <mark@klomp.org>
+
+	Reported by john.zigman@anu.edu.au as bug #24608.
+	* gnu/java/nio/SocketChannelImpl.java (read): Put readBytes in
+	destination ByteBuffer when it doesn't have an array instead of len
+	bytes.
+
 2006-01-05  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/natThread.cc (finish_): Don't clear 'group'.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 7f20add2ee4..29a2db2b349 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -64,8 +64,6 @@ secdir = $(libdir)/security
 ## Where to install default logging property file.
 propdir = $(libdir)
 
-## Where the standard .db file is found.
-dbexecdir = $(libdir)/gcj-$(gcc_version)
 ## Name of the default .db.
 db_name = classmap.db
 ## Compiler specific component of the .db file
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index ce0b0b8c03e..f861bc76cdb 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -626,6 +626,7 @@ target_vendor = @target_vendor@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
 toolexecmainlibdir = @toolexecmainlibdir@
+dbexecdir = @dbexecdir@
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 
@@ -654,7 +655,6 @@ jar_DATA = libgcj-$(gcc_version).jar
 @JAVA_HOME_SET_TRUE@BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar
 secdir = $(libdir)/security
 propdir = $(libdir)
-dbexecdir = $(libdir)/gcj-$(gcc_version)
 db_name = classmap.db
 db_pathtail = gcj-$(gcc_version)/$(db_name)
 @NATIVE_TRUE@dbexec_DATA = $(db_name)
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 85df787cc4d..56627e35419 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,16 @@
+2006-01-16  Anthony Green  <green@redhat.com>
+
+	PR classpath/25803
+	* gnu/java/net/protocol/http/Request.java
+	  (createResponseBodyStream): Remove Content-Encoding for
+	  compressed streams.
+
+2006-01-14  Anthony Green  <green@redhat.com>
+
+        * java/net/ServerSocket.java (accept): Remove bogus
+        security check.
+	(implAccept): Add FIXME comment.
+
 2005-12-27  Tom Tromey  <tromey@redhat.com>
 
 	* gnu/java/nio/SelectorImpl.java: Added import.
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 655a935287f..346eee9f7bb 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2006-01-06  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/23499:
+	* lib/Makefile.in: Rebuilt.
+	* lib/Makefile.am (glibj_DATA): Commented out.
+
 2005-12-15  Caolan McNamara  <caolanm@redhat.com>
 
 	PR classpath/25426:
diff --git a/libjava/classpath/gnu/java/net/protocol/http/Request.java b/libjava/classpath/gnu/java/net/protocol/http/Request.java
index b9441b3f736..d70dd0c9d4d 100644
--- a/libjava/classpath/gnu/java/net/protocol/http/Request.java
+++ b/libjava/classpath/gnu/java/net/protocol/http/Request.java
@@ -528,6 +528,9 @@ public class Request
             throw new ProtocolException("Unsupported Content-Encoding: " +
                                         contentCoding);
           }
+	// Remove the Content-Encoding header because the content is
+	// no longer compressed.
+	responseHeaders.remove("Content-Encoding");
       }
     return in;
   }
diff --git a/libjava/classpath/java/net/ServerSocket.java b/libjava/classpath/java/net/ServerSocket.java
index afc861403a1..2b889531a7c 100644
--- a/libjava/classpath/java/net/ServerSocket.java
+++ b/libjava/classpath/java/net/ServerSocket.java
@@ -1,5 +1,5 @@
 /* ServerSocket.java -- Class for implementing server side sockets
-   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
+   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -314,11 +314,6 @@ public class ServerSocket
    */
   public Socket accept() throws IOException
   {
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null)
-      sm.checkAccept(impl.getInetAddress().getHostAddress(),
-                     impl.getLocalPort());
-
     Socket socket = new Socket();
 
     try
@@ -360,6 +355,9 @@ public class ServerSocket
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
 
+    // FIXME: Add a security check to make sure we're allowed to 
+    // connect to the remote host.
+
     // The Sun spec says that if we have an associated channel and
     // it is in non-blocking mode, we throw an IllegalBlockingModeException.
     // However, in our implementation if the channel itself initiated this
diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am
index 5a54a4d698a..1c215d187f2 100644
--- a/libjava/classpath/lib/Makefile.am
+++ b/libjava/classpath/lib/Makefile.am
@@ -40,7 +40,9 @@ JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
 
 if INSTALL_GLIBJ_ZIP
 
-glibj_DATA = glibj.zip
+## GCJ LOCAL: Comment this out so we don't make an empty
+## '$(glibjdir)' in the install tree.
+## glibj_DATA = glibj.zip
 
 endif # INSTALL_GLIBJ_ZIP
 
diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in
index 394af457db3..8817563b5eb 100644
--- a/libjava/classpath/lib/Makefile.in
+++ b/libjava/classpath/lib/Makefile.in
@@ -54,15 +54,7 @@ CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES = gen-classlist.sh copy-vmresources.sh
 SOURCES =
 DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(glibjdir)"
-glibjDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(glibj_DATA) $(noinst_DATA)
+DATA = $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -269,7 +261,6 @@ compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 @FOUND_GCJ_TRUE@JAVAC = exit 1
 JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
-@INSTALL_GLIBJ_ZIP_TRUE@glibj_DATA = glibj.zip
 @BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources
 EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
 CLEANFILES = compile-classes resources classes \
@@ -323,23 +314,6 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-glibjDATA: $(glibj_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(glibjdir)" || $(mkdir_p) "$(DESTDIR)$(glibjdir)"
-	@list='$(glibj_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(glibjDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(glibjdir)/$$f'"; \
-	  $(glibjDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(glibjdir)/$$f"; \
-	done
-
-uninstall-glibjDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glibj_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(glibjdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(glibjdir)/$$f"; \
-	done
 tags: TAGS
 TAGS:
 
@@ -381,9 +355,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(glibjdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -429,7 +400,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-glibjDATA
+install-data-am: install-data-local
 
 install-exec-am:
 
@@ -455,19 +426,18 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-glibjDATA uninstall-info-am uninstall-local
+uninstall-am: uninstall-info-am uninstall-local
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	clean-local dist-hook distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am \
-	install-glibjDATA install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-glibjDATA uninstall-info-am \
-	uninstall-local
+	install-data-local install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am uninstall-local
 
 
 sinclude $(JAVA_DEPEND)
diff --git a/libjava/configure b/libjava/configure
index 71c508433dd..c2537bf6526 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -310,7 +310,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -4031,15 +4031,15 @@ version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"`
   if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"`
   fi
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
@@ -4154,13 +4154,13 @@ cygwin* | mingw* | pw32*)
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"`
       if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH printed by
         # mingw gcc, but we are running on Cygwin. Gcc prints its search
@@ -4168,20 +4168,20 @@ cygwin* | mingw* | pw32*)
         # drive letters (cygwin fileutils understands them), so leave them,
         # especially as we might pass files found there to a mingw objdump,
         # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"`
       fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
     ;;
   esac
   dynamic_linker='Win32 ld.exe'
@@ -14848,6 +14848,14 @@ esac
 
 
 
+# Determine where the standard .db file is found.
+multi_os_directory=`$CC -print-multi-os-directory`
+case $multi_os_directory in
+  .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /.
+  *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;;
+esac
+
+
 # Determine gcj version number.
 gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`
 GCJVERSION=$gcjversion
@@ -17895,6 +17903,7 @@ s,@GCC_UNWIND_INCLUDE@,$GCC_UNWIND_INCLUDE,;t t
 s,@toolexecdir@,$toolexecdir,;t t
 s,@toolexecmainlibdir@,$toolexecmainlibdir,;t t
 s,@toolexeclibdir@,$toolexeclibdir,;t t
+s,@dbexecdir@,$dbexecdir,;t t
 s,@GCJVERSION@,$GCJVERSION,;t t
 s,@gxx_include_dir@,$gxx_include_dir,;t t
 s,@libstdcxx_incdir@,$libstdcxx_incdir,;t t
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 42ec21464da..54589cc0b43 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1269,6 +1269,14 @@ AC_SUBST(toolexecdir)
 AC_SUBST(toolexecmainlibdir)
 AC_SUBST(toolexeclibdir)
 
+# Determine where the standard .db file is found.
+multi_os_directory=`$CC -print-multi-os-directory`
+case $multi_os_directory in
+  .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /.
+  *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;;
+esac
+AC_SUBST(dbexecdir)
+
 # Determine gcj version number.
 gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'`
 GCJVERSION=$gcjversion
diff --git a/libjava/gnu/java/net/protocol/jar/Connection.java b/libjava/gnu/java/net/protocol/jar/Connection.java
index 34df18354e8..283bae19c44 100644
--- a/libjava/gnu/java/net/protocol/jar/Connection.java
+++ b/libjava/gnu/java/net/protocol/jar/Connection.java
@@ -41,9 +41,10 @@ package gnu.java.net.protocol.jar;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
+import java.io.IOException;
 import java.net.JarURLConnection;
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
@@ -156,8 +157,6 @@ public final class Connection extends JarURLConnection
         
 	if (entry != null)
 	  return jarfile.getInputStream (entry);
-	else
-	  return null;
       }
     else
       {
@@ -182,7 +181,10 @@ public final class Connection extends JarURLConnection
 	  }
       }
 
-    return null;
+    throw new FileNotFoundException("No entry for \"" + getEntryName()
+				    + "\" in \""
+				    + getJarFileURL()
+				    + "\"");
   }
 
   public synchronized JarFile getJarFile() throws IOException
diff --git a/libjava/gnu/java/nio/DatagramChannelImpl.java b/libjava/gnu/java/nio/DatagramChannelImpl.java
index cb2a607934e..de1d2e6a341 100644
--- a/libjava/gnu/java/nio/DatagramChannelImpl.java
+++ b/libjava/gnu/java/nio/DatagramChannelImpl.java
@@ -1,5 +1,5 @@
 /* DatagramChannelImpl.java -- 
-   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -206,7 +206,7 @@ public final class DatagramChannelImpl extends DatagramChannel
     try
       {
         DatagramPacket packet;
-        int len = dst.capacity() - dst.position();
+        int len = dst.remaining();
         
         if (dst.hasArray())
           {
diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java
index 8ca2b575b41..cda86e80723 100644
--- a/libjava/gnu/java/nio/SocketChannelImpl.java
+++ b/libjava/gnu/java/nio/SocketChannelImpl.java
@@ -1,5 +1,5 @@
 /* SocketChannelImpl.java -- 
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -225,7 +225,7 @@ public final class SocketChannelImpl extends SocketChannel
     int offset = 0;
     InputStream input = socket.getInputStream();
     int available = input.available();
-    int len = dst.capacity() - dst.position();
+    int len = dst.remaining();
 	
     if ((! isBlocking()) && available == 0)
       return 0;
@@ -263,7 +263,7 @@ public final class SocketChannelImpl extends SocketChannel
 	}
       else
         {
-          dst.put (data, offset, len);
+          dst.put (data, offset, readBytes);
         }
 
     return readBytes;
diff --git a/libjava/java/lang/Character.java b/libjava/java/lang/Character.java
index aa29e0bd523..f56117fdb31 100644
--- a/libjava/java/lang/Character.java
+++ b/libjava/java/lang/Character.java
@@ -1,5 +1,5 @@
 /* java.lang.Character -- Wrapper class for char, and Unicode subsets
-   Copyright (C) 1998, 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -1040,6 +1040,18 @@ public final class Character implements Serializable, Comparable
   public static final Class TYPE = VMClassLoader.getPrimitiveClass('C');
 
   /**
+   * The number of bits needed to represent a <code>char</code>.
+   * @since 1.5
+   */
+  public static final int SIZE = 16;
+
+  // This caches some Character values, and is used by boxing
+  // conversions via valueOf().  We must cache at least 0..127;
+  // this constant controls how much we actually cache.
+  private static final int MAX_CACHE = 127;
+  private static Character[] charCache = new Character[MAX_CACHE + 1];
+
+  /**
    * Lu = Letter, Uppercase (Informative).
    *
    * @since 1.1
@@ -1434,34 +1446,48 @@ public final class Character implements Serializable, Comparable
 
 
   /**
-   * Minimum high surrrogate code in UTF-16 encoding.
+   * Minimum high surrogate code in UTF-16 encoding.
    *
    * @since 1.5
    */
   public static final char MIN_HIGH_SURROGATE = '\ud800';
 
   /**
-   * Maximum high surrrogate code in UTF-16 encoding.
+   * Maximum high surrogate code in UTF-16 encoding.
    *
    * @since 1.5
    */
   public static final char MAX_HIGH_SURROGATE = '\udbff';
  
   /**
-   * Minimum low surrrogate code in UTF-16 encoding.
+   * Minimum low surrogate code in UTF-16 encoding.
    *
    * @since 1.5
    */
   public static final char MIN_LOW_SURROGATE = '\udc00';
 
   /**
-   * Maximum low surrrogate code in UTF-16 encoding.
+   * Maximum low surrogate code in UTF-16 encoding.
    *
    * @since 1.5
    */
   public static final char MAX_LOW_SURROGATE = '\udfff';
 
   /**
+   * Minimum surrogate code in UTF-16 encoding.
+   *
+   * @since 1.5
+   */
+  public static final char MIN_SURROGATE = MIN_HIGH_SURROGATE;
+
+  /**
+   * Maximum low surrogate code in UTF-16 encoding.
+   *
+   * @since 1.5
+   */
+  public static final char MAX_SURROGATE = MAX_LOW_SURROGATE;
+
+  /**
    * Grabs an attribute offset from the Unicode attribute database. The lower
    * 5 bits are the character type, the next 2 bits are flags, and the top
    * 9 bits are the offset into the attribute tables. Note that the top 9
@@ -2213,6 +2239,37 @@ public final class Character implements Serializable, Comparable
   }
 
   /**
+   * Returns an <code>Character</code> object wrapping the value.
+   * In contrast to the <code>Character</code> constructor, this method
+   * will cache some values.  It is used by boxing conversion.
+   *
+   * @param val the value to wrap
+   * @return the <code>Character</code>
+   * 
+   * @since 1.5
+   */
+  public static Character valueOf(char val)
+  {
+    if (val > MAX_CACHE)
+      return new Character(val);
+    synchronized (charCache)
+      {
+    if (charCache[val - MIN_VALUE] == null)
+      charCache[val - MIN_VALUE] = new Character(val);
+    return charCache[val - MIN_VALUE];
+      }
+  }
+
+  /**
+   * Reverse the bytes in val.
+   * @since 1.5
+   */
+  public static char reverseBytes(char val)
+  {
+    return (char) (((val >> 8) & 0xff) | ((val << 8) & 0xff00));
+  }
+
+  /**
    * Converts a unicode code point to a UTF-16 representation of that
    * code point.
    * 
@@ -2263,11 +2320,11 @@ public final class Character implements Serializable, Comparable
       {
         // Write second char first to cause IndexOutOfBoundsException
         // immediately.
-        dst[dstIndex + 1] = (char) ((codePoint & 0x3ff)
-                                    + (int) MIN_LOW_SURROGATE );
-        dst[dstIndex] = (char) ((codePoint >> 10) + (int) MIN_HIGH_SURROGATE);
+        final int cp2 = codePoint - 0x10000;
+        dst[dstIndex + 1] = (char) ((cp2 % 0x400) + (int) MIN_LOW_SURROGATE);
+        dst[dstIndex] = (char) ((cp2 / 0x400) + (int) MIN_HIGH_SURROGATE);
         result = 2;
-    }
+      }
     else
       {
         dst[dstIndex] = (char) codePoint;
@@ -2280,7 +2337,7 @@ public final class Character implements Serializable, Comparable
    * Return number of 16-bit characters required to represent the given
    * code point.
    *
-   * @param codePoint a uncode code point
+   * @param codePoint a unicode code point
    *
    * @return 2 if codePoint >= 0x10000, 1 otherwise.
    *
@@ -2325,4 +2382,211 @@ public final class Character implements Serializable, Comparable
   {
     return codePoint >= MIN_CODE_POINT && codePoint <= MAX_CODE_POINT;
   }
+
+  /**
+   * Return true if the given character is a high surrogate.
+   * @param ch the character
+   * @return true if the character is a high surrogate character
+   *
+   * @since 1.5
+   */
+  public static boolean isHighSurrogate(char ch)
+  {
+    return ch >= MIN_HIGH_SURROGATE && ch <= MAX_HIGH_SURROGATE;
+  }
+
+  /**
+   * Return true if the given character is a low surrogate.
+   * @param ch the character
+   * @return true if the character is a low surrogate character
+   *
+   * @since 1.5
+   */
+  public static boolean isLowSurrogate(char ch)
+  {
+    return ch >= MIN_LOW_SURROGATE && ch <= MAX_LOW_SURROGATE;
+  }
+
+  /**
+   * Return true if the given characters compose a surrogate pair.
+   * This is true if the first character is a high surrogate and the
+   * second character is a low surrogate.
+   * @param ch1 the first character
+   * @param ch2 the first character
+   * @return true if the characters compose a surrogate pair
+   *
+   * @since 1.5
+   */
+  public static boolean isSurrogatePair(char ch1, char ch2)
+  {
+    return isHighSurrogate(ch1) && isLowSurrogate(ch2);
+  }
+
+  /**
+   * Given a valid surrogate pair, this returns the corresponding
+   * code point.
+   * @param high the high character of the pair
+   * @param low the low character of the pair
+   * @return the corresponding code point
+   *
+   * @since 1.5
+   */
+  public static int toCodePoint(char high, char low)
+  {
+    return ((high - MIN_HIGH_SURROGATE) * 0x400) +
+      (low - MIN_LOW_SURROGATE) + 0x10000;
+  }
+
+  /**
+   * Get the code point at the specified index in the CharSequence.
+   * This is like CharSequence#charAt(int), but if the character is
+   * the start of a surrogate pair, and there is a following
+   * character, and this character completes the pair, then the
+   * corresponding supplementary code point is returned.  Otherwise,
+   * the character at the index is returned.
+   *
+   * @param sequence the CharSequence
+   * @param index the index of the codepoint to get, starting at 0
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
+   * @since 1.5
+   */
+  public static int codePointAt(CharSequence sequence, int index)
+  {
+    int len = sequence.length();
+    if (index < 0 || index >= len)
+      throw new IndexOutOfBoundsException();
+    char high = sequence.charAt(index);
+    if (! isHighSurrogate(high) || ++index >= len)
+      return high;
+    char low = sequence.charAt(index);
+    if (! isLowSurrogate(low))
+      return high;
+    return toCodePoint(high, low);
+  }
+
+  /**
+   * Get the code point at the specified index in the CharSequence.
+   * If the character is the start of a surrogate pair, and there is a
+   * following character, and this character completes the pair, then
+   * the corresponding supplementary code point is returned.
+   * Otherwise, the character at the index is returned.
+   *
+   * @param chars the character array in which to look
+   * @param index the index of the codepoint to get, starting at 0
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
+   * @since 1.5
+   */
+  public static int codePointAt(char[] chars, int index)
+  {
+    return codePointAt(chars, index, chars.length);
+  }
+
+  /**
+   * Get the code point at the specified index in the CharSequence.
+   * If the character is the start of a surrogate pair, and there is a
+   * following character within the specified range, and this
+   * character completes the pair, then the corresponding
+   * supplementary code point is returned.  Otherwise, the character
+   * at the index is returned.
+   *
+   * @param chars the character array in which to look
+   * @param index the index of the codepoint to get, starting at 0
+   * @param limit the limit past which characters should not be examined
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;=
+   * limit, or if limit is negative or &gt;= the length of the array
+   * @since 1.5
+   */
+  public static int codePointAt(char[] chars, int index, int limit)
+  {
+    if (index < 0 || index >= limit || limit < 0 || limit >= chars.length)
+      throw new IndexOutOfBoundsException();
+    char high = chars[index];
+    if (! isHighSurrogate(high) || ++index >= limit)
+      return high;
+    char low = chars[index];
+    if (! isLowSurrogate(low))
+      return high;
+    return toCodePoint(high, low);
+  }
+
+  /**
+   * Get the code point before the specified index.  This is like
+   * #codePointAt(char[], int), but checks the characters at
+   * <code>index-1</code> and <code>index-2</code> to see if they form
+   * a supplementary code point.  If they do not, the character at
+   * <code>index-1</code> is returned.
+   *
+   * @param chars the character array
+   * @param index the index just past the codepoint to get, starting at 0
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
+   * @since 1.5
+   */
+  public static int codePointBefore(char[] chars, int index)
+  {
+    return codePointBefore(chars, index, 1);
+  }
+
+  /**
+   * Get the code point before the specified index.  This is like
+   * #codePointAt(char[], int), but checks the characters at
+   * <code>index-1</code> and <code>index-2</code> to see if they form
+   * a supplementary code point.  If they do not, the character at
+   * <code>index-1</code> is returned.  The start parameter is used to
+   * limit the range of the array which may be examined.
+   *
+   * @param chars the character array
+   * @param index the index just past the codepoint to get, starting at 0
+   * @param start the index before which characters should not be examined
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is &gt; start or &gt;
+   * the length of the array, or if limit is negative or &gt;= the
+   * length of the array
+   * @since 1.5
+   */
+  public static int codePointBefore(char[] chars, int index, int start)
+  {
+    if (index < start || index > chars.length
+	|| start < 0 || start >= chars.length)
+      throw new IndexOutOfBoundsException();
+    --index;
+    char low = chars[index];
+    if (! isLowSurrogate(low) || --index < start)
+      return low;
+    char high = chars[index];
+    if (! isHighSurrogate(high))
+      return low;
+    return toCodePoint(high, low);
+  }
+
+  /**
+   * Get the code point before the specified index.  This is like
+   * #codePointAt(CharSequence, int), but checks the characters at
+   * <code>index-1</code> and <code>index-2</code> to see if they form
+   * a supplementary code point.  If they do not, the character at
+   * <code>index-1</code> is returned.
+   *
+   * @param sequence the CharSequence
+   * @param index the index just past the codepoint to get, starting at 0
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
+   * @since 1.5
+   */
+  public static int codePointBefore(CharSequence sequence, int index)
+  {
+    int len = sequence.length();
+    if (index < 1 || index > len)
+      throw new IndexOutOfBoundsException();
+    --index;
+    char low = sequence.charAt(index);
+    if (! isLowSurrogate(low) || --index < 0)
+      return low;
+    char high = sequence.charAt(index);
+    if (! isHighSurrogate(high))
+      return low;
+    return toCodePoint(high, low);
+  }
 } // class Character
diff --git a/libjava/java/lang/Double.java b/libjava/java/lang/Double.java
index f6235d5b65c..92f8a230822 100644
--- a/libjava/java/lang/Double.java
+++ b/libjava/java/lang/Double.java
@@ -1,5 +1,5 @@
 /* Double.java -- object wrapper for double
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package java.lang;
 
-import gnu.classpath.Configuration;
 
 /**
  * Instances of class <code>Double</code> represent primitive
@@ -89,6 +88,12 @@ public final class Double extends Number implements Comparable
   public static final double NaN = 0.0 / 0.0;
 
   /**
+   * The number of bits needed to represent a <code>double</code>.
+   * @since 1.5
+   */
+  public static final int SIZE = 64;
+
+  /**
    * The primitive type <code>double</code> is represented by this
    * <code>Class</code> object.
    * @since 1.1
@@ -103,18 +108,6 @@ public final class Double extends Number implements Comparable
   private final double value;
 
   /**
-   * Load native routines necessary for this class.
-   */
-  static
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-	System.loadLibrary("javalang");
-	initIDs();
-      }
-  }
-
-  /**
    * Create a <code>Double</code> from the primitive <code>double</code>
    * specified.
    *
@@ -180,6 +173,22 @@ public final class Double extends Number implements Comparable
   }
 
   /**
+   * Returns a <code>Double</code> object wrapping the value.
+   * In contrast to the <code>Double</code> constructor, this method
+   * may cache some values.  It is used by boxing conversion.
+   *
+   * @param val the value to wrap
+   * @return the <code>Double</code>
+   * 
+   * @since 1.5
+   */
+  public static Double valueOf(double val)
+  {
+    // We don't actually cache, but we could.
+    return new Double(val);
+  }
+
+  /**
    * Create a new <code>Double</code> object using the <code>String</code>.
    *
    * @param s the <code>String</code> to convert
@@ -534,10 +543,4 @@ public final class Double extends Number implements Comparable
    */
   // Package visible for use by Float.
   static native String toString(double d, boolean isFloat);
-
-  /**
-   * Initialize JNI cache.  This method is called only by the
-   * static initializer when using JNI.
-   */
-  private static native void initIDs();
 }
diff --git a/libjava/java/lang/Float.java b/libjava/java/lang/Float.java
index b2c84c75655..7677ca4132e 100644
--- a/libjava/java/lang/Float.java
+++ b/libjava/java/lang/Float.java
@@ -1,5 +1,5 @@
 /* Float.java -- object wrapper for float
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -94,6 +94,12 @@ public final class Float extends Number implements Comparable
   public static final Class TYPE = VMClassLoader.getPrimitiveClass('F');
 
   /**
+   * The number of bits needed to represent a <code>float</code>.
+   * @since 1.5
+   */
+  public static final int SIZE = 32;
+
+  /**
    * The immutable value of this Float.
    *
    * @serial the wrapped float
@@ -192,6 +198,22 @@ public final class Float extends Number implements Comparable
   }
 
   /**
+   * Returns a <code>Float</code> object wrapping the value.
+   * In contrast to the <code>Float</code> constructor, this method
+   * may cache some values.  It is used by boxing conversion.
+   *
+   * @param val the value to wrap
+   * @return the <code>Float</code>
+   * 
+   * @since 1.5
+   */
+  public static Float valueOf(float val)
+  {
+    // We don't actually cache, but we could.
+    return new Float(val);
+  }
+
+  /**
    * Parse the specified <code>String</code> as a <code>float</code>. The
    * extended BNF grammar is as follows:<br>
    * <pre>
diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java
index 95ad1fe578c..3e0bfbee89d 100644
--- a/libjava/java/lang/String.java
+++ b/libjava/java/lang/String.java
@@ -1,5 +1,5 @@
 /* String.java -- immutable character sequences; the object of string literals
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -455,6 +455,40 @@ public final class String implements Serializable, Comparable, CharSequence
   public native char charAt(int index);
 
   /**
+   * Get the code point at the specified index.  This is like #charAt(int),
+   * but if the character is the start of a surrogate pair, and the
+   * following character completes the pair, then the corresponding
+   * supplementary code point is returned.
+   * @param index the index of the codepoint to get, starting at 0
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
+   * @since 1.5
+   */
+  public synchronized int codePointAt(int index)
+  {
+    // Use the CharSequence overload as we get better range checking
+    // this way.
+    return Character.codePointAt(this, index);
+  }
+
+  /**
+   * Get the code point before the specified index.  This is like
+   * #codePointAt(int), but checks the characters at <code>index-1</code> and
+   * <code>index-2</code> to see if they form a supplementary code point.
+   * @param index the index just past the codepoint to get, starting at 0
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
+   *         (while unspecified, this is a StringIndexOutOfBoundsException)
+   * @since 1.5
+   */
+  public synchronized int codePointBefore(int index)
+  {
+    // Use the CharSequence overload as we get better range checking
+    // this way.
+    return Character.codePointBefore(this, index);
+  }
+
+  /**
    * Copies characters from this String starting at a specified start index,
    * ending at a specified stop index, to a character array starting at
    * a specified destination begin index.
@@ -566,6 +600,18 @@ public final class String implements Serializable, Comparable, CharSequence
   public native boolean contentEquals(StringBuffer buffer);
 
   /**
+   * Compares the given CharSequence to this String. This is true if
+   * the CharSequence has the same content as this String at this
+   * moment.
+   *
+   * @param seq the CharSequence to compare to
+   * @return true if CharSequence has the same character sequence
+   * @throws NullPointerException if the given CharSequence is null
+   * @since 1.5
+   */
+  public native boolean contentEquals(CharSequence seq);
+
+  /**
    * Compares a String to this String, ignoring case. This does not handle
    * multi-character capitalization exceptions; instead the comparison is
    * made on a character-by-character basis, and is true if:<br><ul>
@@ -1259,6 +1305,88 @@ public final class String implements Serializable, Comparable, CharSequence
    */
   public native String intern();
 
+  /**
+   * Return the number of code points between two indices in the
+   * <code>String</code>.  An unpaired surrogate counts as a
+   * code point for this purpose.  Characters outside the indicated
+   * range are not examined, even if the range ends in the middle of a
+   * surrogate pair.
+   *
+   * @param start the starting index
+   * @param end one past the ending index
+   * @return the number of code points
+   * @since 1.5
+   */
+  public synchronized int codePointCount(int start, int end)
+  {
+    if (start < 0 || end >= count || start > end)
+      throw new StringIndexOutOfBoundsException();
+
+    int count = 0;
+    while (start < end)
+      {
+	char base = charAt(start);
+	if (base < Character.MIN_HIGH_SURROGATE
+	    || base > Character.MAX_HIGH_SURROGATE
+	    || start == end
+	    || start == count
+	    || charAt(start + 1) < Character.MIN_LOW_SURROGATE
+	    || charAt(start + 1) > Character.MAX_LOW_SURROGATE)
+	  {
+	    // Nothing.
+	  }
+	else
+	  {
+	    // Surrogate pair.
+	    ++start;
+	  }
+	++start;
+	++count;
+      }
+    return count;
+  }
+
+  /**
+   * Returns true iff this String contains the sequence of Characters
+   * described in s.
+   * @param s the CharSequence
+   * @return true iff this String contains s
+   *
+   * @since 1.5
+   */
+  public boolean contains (CharSequence s)
+  {
+    return this.indexOf(s.toString()) != -1;
+  }
+
+  /**
+   * Returns a string that is this string with all instances of the sequence
+   * represented by <code>target</code> replaced by the sequence in 
+   * <code>replacement</code>.
+   * @param target the sequence to be replaced
+   * @param replacement the sequence used as the replacement
+   * @return the string constructed as above
+   */
+  public String replace (CharSequence target, CharSequence replacement)
+  {
+    String targetString = target.toString();
+    String replaceString = replacement.toString();
+    int targetLength = target.length();
+    int replaceLength = replacement.length();
+    
+    int startPos = this.indexOf(targetString);
+    StringBuilder result = new StringBuilder(this);    
+    while (startPos != -1)
+      {
+        // Replace the target with the replacement
+        result.replace(startPos, startPos + targetLength, replaceString);
+
+        // Search for a new occurrence of the target
+        startPos = result.indexOf(targetString, startPos + replaceLength);
+      }
+    return result.toString();
+  }
+
 
   private native void init(char[] chars, int offset, int count,
 			   boolean dont_copy);
diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java
index d93fed5fd40..c3f112967c4 100644
--- a/libjava/java/lang/StringBuffer.java
+++ b/libjava/java/lang/StringBuffer.java
@@ -1,5 +1,5 @@
 /* StringBuffer.java -- Growable strings
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -148,6 +148,24 @@ public final class StringBuffer implements Serializable, CharSequence
   }
 
   /**
+   * Create a new <code>StringBuffer</code> with the characters from the
+   * specified <code>CharSequence</code>. Initial capacity will be the
+   * size of the CharSequence plus 16.
+   *
+   * @param sequence the <code>String</code> to convert
+   * @throws NullPointerException if str is null
+   *
+   * @since 1.5
+   */
+  public StringBuffer(CharSequence sequence)
+  {
+    count = Math.max(0, sequence.length());
+    value = new char[count + DEFAULT_CAPACITY];
+    for (int i = 0; i < count; ++i)
+      value[i] = sequence.charAt(i);
+  }
+
+  /**
    * Get the length of the <code>String</code> this <code>StringBuffer</code>
    * would create. Not to be confused with the <em>capacity</em> of the
    * <code>StringBuffer</code>.
@@ -234,7 +252,6 @@ public final class StringBuffer implements Serializable, CharSequence
    * @param index the index of the character to get, starting at 0
    * @return the character at the specified index
    * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
-   *         (while unspecified, this is a StringIndexOutOfBoundsException)
    */
   public synchronized char charAt(int index)
   {
@@ -244,6 +261,39 @@ public final class StringBuffer implements Serializable, CharSequence
   }
 
   /**
+   * Get the code point at the specified index.  This is like #charAt(int),
+   * but if the character is the start of a surrogate pair, and the
+   * following character completes the pair, then the corresponding
+   * supplementary code point is returned.
+   * @param index the index of the codepoint to get, starting at 0
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
+   * @since 1.5
+   */
+  public synchronized int codePointAt(int index)
+  {
+    return Character.codePointAt(value, index, count);
+  }
+
+  /**
+   * Get the code point before the specified index.  This is like
+   * #codePointAt(int), but checks the characters at <code>index-1</code> and
+   * <code>index-2</code> to see if they form a supplementary code point.
+   * @param index the index just past the codepoint to get, starting at 0
+   * @return the codepoint at the specified index
+   * @throws IndexOutOfBoundsException if index is negative or &gt;= length()
+   * @since 1.5
+   */
+  public synchronized int codePointBefore(int index)
+  {
+    // Character.codePointBefore() doesn't perform this check.  We
+    // could use the CharSequence overload, but this is just as easy.
+    if (index >= count)
+      throw new IndexOutOfBoundsException();
+    return Character.codePointBefore(value, index, 1);
+  }
+
+  /**
    * Get the specified array of characters. <code>srcOffset - srcEnd</code>
    * characters will be copied into the array you pass in.
    *
@@ -341,6 +391,46 @@ public final class StringBuffer implements Serializable, CharSequence
   }
 
   /**
+   * Append the <code>CharSequence</code> value of the argument to this
+   * <code>StringBuffer</code>.
+   *
+   * @param sequence the <code>CharSequence</code> to append
+   * @return this <code>StringBuffer</code>
+   * @see #append(Object)
+   * @since 1.5
+   */
+  public synchronized StringBuffer append(CharSequence sequence)
+  {
+    if (sequence == null)
+      sequence = "null";
+    return append(sequence, 0, sequence.length());
+  }
+
+  /**
+   * Append the specified subsequence of the <code>CharSequence</code>
+   * argument to this <code>StringBuffer</code>.
+   *
+   * @param sequence the <code>CharSequence</code> to append
+   * @param start the starting index
+   * @param end one past the ending index
+   * @return this <code>StringBuffer</code>
+   * @see #append(Object)
+   * @since 1.5
+   */
+  public synchronized StringBuffer append(CharSequence sequence,
+					  int start, int end)
+  {
+    if (sequence == null)
+      sequence = "null";
+    if (start < 0 || end < 0 || start > end || end > sequence.length())
+      throw new IndexOutOfBoundsException();
+    ensureCapacity_unsynchronized(this.count + end - start);
+    for (int i = start; i < end; ++i)
+      value[count++] = sequence.charAt(i);
+    return this;
+  }
+
+  /**
    * Append the <code>char</code> array to this <code>StringBuffer</code>.
    * This is similar (but more efficient) than
    * <code>append(new String(data))</code>, except in the case of null.
@@ -407,6 +497,25 @@ public final class StringBuffer implements Serializable, CharSequence
   }
 
   /**
+   * Append the code point to this <code>StringBuffer</code>.
+   * This is like #append(char), but will append two characters
+   * if a supplementary code point is given.
+   *
+   * @param code the code point to append
+   * @return this <code>StringBuffer</code>
+   * @see Character#toChars(int, char[], int)
+   * @since 1.5
+   */
+  public synchronized StringBuffer appendCodePoint(int code)
+  {
+    int len = Character.charCount(code);
+    ensureCapacity_unsynchronized(count + len);
+    Character.toChars(code, value, count);
+    count += len;
+    return this;
+  }
+
+  /**
    * Append the <code>String</code> value of the argument to this
    * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
    * to <code>String</code>.
@@ -657,6 +766,54 @@ public final class StringBuffer implements Serializable, CharSequence
   }
 
   /**
+   * Insert the <code>CharSequence</code> argument into this
+   * <code>StringBuffer</code>.  If the sequence is null, the String
+   * "null" is used instead.
+   *
+   * @param offset the place to insert in this buffer
+   * @param sequence the <code>CharSequence</code> to insert
+   * @return this <code>StringBuffer</code>
+   * @throws IndexOutOfBoundsException if offset is out of bounds
+   * @since 1.5
+   */
+  public synchronized StringBuffer insert(int offset, CharSequence sequence)
+  {
+    if (sequence == null)
+      sequence = "null";
+    return insert(offset, sequence, 0, sequence.length());
+  }
+
+  /**
+   * Insert a subsequence of the <code>CharSequence</code> argument into this
+   * <code>StringBuffer</code>.  If the sequence is null, the String
+   * "null" is used instead.
+   *
+   * @param offset the place to insert in this buffer
+   * @param sequence the <code>CharSequence</code> to insert
+   * @param start the starting index of the subsequence
+   * @param end one past the ending index of the subsequence
+   * @return this <code>StringBuffer</code>
+   * @throws IndexOutOfBoundsException if offset, start,
+   * or end are out of bounds
+   * @since 1.5
+   */
+  public synchronized StringBuffer insert(int offset, CharSequence sequence,
+					  int start, int end)
+  {
+    if (sequence == null)
+      sequence = "null";
+    if (start < 0 || end < 0 || start > end || end > sequence.length())
+      throw new IndexOutOfBoundsException();
+    int len = end - start;
+    ensureCapacity_unsynchronized(count + len);
+    System.arraycopy(value, offset, value, offset + len, count - offset);
+    for (int i = start; i < end; ++i)
+      value[offset++] = sequence.charAt(i);
+    count += len;
+    return this;
+  }
+
+  /**
    * Insert the <code>char[]</code> argument into this
    * <code>StringBuffer</code>.
    *
@@ -877,6 +1034,106 @@ public final class StringBuffer implements Serializable, CharSequence
   }
 
   /**
+   * This may reduce the amount of memory used by the StringBuffer,
+   * by resizing the internal array to remove unused space.  However,
+   * this method is not required to resize, so this behavior cannot
+   * be relied upon.
+   * @since 1.5
+   */
+  public synchronized void trimToSize()
+  {
+    int wouldSave = value.length - count;
+    // Some random heuristics: if we save less than 20 characters, who
+    // cares.
+    if (wouldSave < 20)
+      return;
+    // If we save more than 200 characters, shrink.
+    // If we save more than 1/4 of the buffer, shrink.
+    if (wouldSave > 200 || wouldSave * 4 > value.length)
+      {
+	char[] newValue = new char[count];
+	System.arraycopy(value, 0, newValue, 0, count);
+	value = newValue;
+      }
+  }
+
+  /**
+   * Return the number of code points between two indices in the
+   * <code>StringBuffer</code>.  An unpaired surrogate counts as a
+   * code point for this purpose.  Characters outside the indicated
+   * range are not examined, even if the range ends in the middle of a
+   * surrogate pair.
+   *
+   * @param start the starting index
+   * @param end one past the ending index
+   * @return the number of code points
+   * @since 1.5
+   */
+  public synchronized int codePointCount(int start, int end)
+  {
+    if (start < 0 || end >= count || start > end)
+      throw new StringIndexOutOfBoundsException();
+
+    int count = 0;
+    while (start < end)
+      {
+	char base = value[start];
+	if (base < Character.MIN_HIGH_SURROGATE
+	    || base > Character.MAX_HIGH_SURROGATE
+	    || start == end
+	    || start == count
+	    || value[start + 1] < Character.MIN_LOW_SURROGATE
+	    || value[start + 1] > Character.MAX_LOW_SURROGATE)
+	  {
+	    // Nothing.
+	  }
+	else
+	  {
+	    // Surrogate pair.
+	    ++start;
+	  }
+	++start;
+	++count;
+      }
+    return count;
+  }
+
+  /**
+   * Starting at the given index, this counts forward by the indicated
+   * number of code points, and then returns the resulting index.  An
+   * unpaired surrogate counts as a single code point for this
+   * purpose.
+   *
+   * @param start the starting index
+   * @param codePoints the number of code points
+   * @return the resulting index
+   * @since 1.5
+   */
+  public synchronized int offsetByCodePoints(int start, int codePoints)
+  {
+    while (codePoints > 0)
+      {
+	char base = value[start];
+	if (base < Character.MIN_HIGH_SURROGATE
+	    || base > Character.MAX_HIGH_SURROGATE
+	    || start == count
+	    || value[start + 1] < Character.MIN_LOW_SURROGATE
+	    || value[start + 1] > Character.MAX_LOW_SURROGATE)
+	  {
+	    // Nothing.
+	  }
+	else
+	  {
+	    // Surrogate pair.
+	    ++start;
+	  }
+	++start;
+	--codePoints;
+      }
+    return start;
+  }
+
+  /**
    * An unsynchronized version of ensureCapacity, used internally to avoid
    * the cost of a second lock on the same object. This also has the side
    * effect of duplicating the array, if it was shared (to form copy-on-write
diff --git a/libjava/java/lang/StringBuilder.java b/libjava/java/lang/StringBuilder.java
index 51df8826416..5990a6d8dd5 100644
--- a/libjava/java/lang/StringBuilder.java
+++ b/libjava/java/lang/StringBuilder.java
@@ -1,5 +1,5 @@
 /* StringBuilder.java -- Unsynchronized growable strings
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -464,6 +464,25 @@ public final class StringBuilder
   }
 
   /**
+   * Append the code point to this <code>StringBuilder</code>.
+   * This is like #append(char), but will append two characters
+   * if a supplementary code point is given.
+   *
+   * @param code the code point to append
+   * @return this <code>StringBuilder</code>
+   * @see Character#toChars(int, char[], int)
+   * @since 1.5
+   */
+  public synchronized StringBuilder appendCodePoint(int code)
+  {
+    int len = Character.charCount(code);
+    ensureCapacity(count + len);
+    Character.toChars(code, value, count);
+    count += len;
+    return this;
+  }
+
+  /**
    * Append the <code>String</code> value of the argument to this
    * <code>StringBuilder</code>. Uses <code>String.valueOf()</code> to convert
    * to <code>String</code>.
@@ -705,6 +724,52 @@ public final class StringBuilder
   }
 
   /**
+   * Insert the <code>CharSequence</code> argument into this
+   * <code>StringBuilder</code>.  If the sequence is null, the String
+   * "null" is used instead.
+   *
+   * @param offset the place to insert in this buffer
+   * @param sequence the <code>CharSequence</code> to insert
+   * @return this <code>StringBuilder</code>
+   * @throws IndexOutOfBoundsException if offset is out of bounds
+   */
+  public synchronized StringBuilder insert(int offset, CharSequence sequence)
+  {
+    if (sequence == null)
+      sequence = "null";
+    return insert(offset, sequence, 0, sequence.length());
+  }
+
+  /**
+   * Insert a subsequence of the <code>CharSequence</code> argument into this
+   * <code>StringBuilder</code>.  If the sequence is null, the String
+   * "null" is used instead.
+   *
+   * @param offset the place to insert in this buffer
+   * @param sequence the <code>CharSequence</code> to insert
+   * @param start the starting index of the subsequence
+   * @param end one past the ending index of the subsequence
+   * @return this <code>StringBuilder</code>
+   * @throws IndexOutOfBoundsException if offset, start,
+   * or end are out of bounds
+   */
+  public synchronized StringBuilder insert(int offset, CharSequence sequence,
+                      int start, int end)
+  {
+    if (sequence == null)
+      sequence = "null";
+    if (start < 0 || end < 0 || start > end || end > sequence.length())
+      throw new IndexOutOfBoundsException();
+    int len = end - start;
+    ensureCapacity(count + len);
+    System.arraycopy(value, offset, value, offset + len, count - offset);
+    for (int i = start; i < end; ++i)
+      value[offset++] = sequence.charAt(i);
+    count += len;
+    return this;
+  }
+
+  /**
    * Insert the <code>char[]</code> argument into this
    * <code>StringBuilder</code>.
    *
diff --git a/libjava/java/lang/natDouble.cc b/libjava/java/lang/natDouble.cc
index 72fe5fbe1c6..24dad8a6318 100644
--- a/libjava/java/lang/natDouble.cc
+++ b/libjava/java/lang/natDouble.cc
@@ -1,6 +1,6 @@
 // natDouble.cc - Implementation of java.lang.Double native methods.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -211,9 +211,3 @@ java::lang::Double::parseDouble(jstring str)
     }
   throw new NumberFormatException(str);
 }
-
-void
-java::lang::Double::initIDs()
-{
-  // Not used in libgcj
-}
diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc
index c8f3129a212..3f630812d5e 100644
--- a/libjava/java/lang/natString.cc
+++ b/libjava/java/lang/natString.cc
@@ -1,6 +1,6 @@
 // natString.cc - Implementation of java.lang.String native methods.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -15,6 +15,7 @@ details.  */
 
 #include <gcj/cni.h>
 #include <java/lang/Character.h>
+#include <java/lang/CharSequence.h>
 #include <java/lang/String.h>
 #include <java/lang/IndexOutOfBoundsException.h>
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
@@ -564,6 +565,18 @@ java::lang::String::contentEquals(java::lang::StringBuffer* buffer)
   return true;
 }
 
+jboolean
+java::lang::String::contentEquals(java::lang::CharSequence *seq)
+{
+  if (seq->length() != count)
+    return false;
+  jchar *value = JvGetStringChars(this);
+  for (int i = 0; i < count; ++i)
+    if (value[i] != seq->charAt(i))
+      return false;
+  return true;
+}
+
 jchar
 java::lang::String::charAt(jint i)
 {
diff --git a/libjava/shlibpath.m4 b/libjava/shlibpath.m4
index 0a61c009876..e09531a6abc 100644
--- a/libjava/shlibpath.m4
+++ b/libjava/shlibpath.m4
@@ -41,15 +41,15 @@ version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"`
   if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"`
   fi
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
@@ -164,13 +164,13 @@ cygwin* | mingw* | pw32*)
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      soname_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"`
       if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
         # It is most probably a Windows format PATH printed by
         # mingw gcc, but we are running on Cygwin. Gcc prints its search
@@ -178,20 +178,20 @@ cygwin* | mingw* | pw32*)
         # drive letters (cygwin fileutils understands them), so leave them,
         # especially as we might pass files found there to a mingw objdump,
         # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"`
       fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
 
   *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
     ;;
   esac
   dynamic_linker='Win32 ld.exe'
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 43dc2a6f770..00f2da8295f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,109 @@
+2006-01-12  Jan Beulich  <jbeulich@novell.com>
+
+	* crossconfig.m4: Add AC_DEFINE-s for HAVE_HYPOT, HAVE_ISINF, and
+	HAVE_ISNAN for *-*-netware*.
+	* configure: Refresh.
+
+2006-01-10  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* include/bits/valarray_after.h (_Expr<>::operator[](slice)):
+	Don't assume the closure implements general indexing, as a matter
+	of fact, most of them don't.
+	(_Expr<>::operator[](const gslice&)): Likewise.
+	(_Expr<>::operator[](const valarray<bool>&)): Likewise.
+	(_Expr<>::operator[](const valarray<size_t>&)): Likewise.
+	(_Expr<>::shift): Fix thinko.
+	(_Expr<>::cshift): Likewise.
+	(_Expr<>::apply): Likewise.
+
+2006-01-10  Benjamin Kosnik  <bkoz@redhat.com>
+            Ulrich Drepper  <drepper@redhat.com>
+
+	PR libstdc++/23591
+	* scripts/create_testsuite_files: Support for "C" test files.
+	* testsuite/lib/libstdc++.exp: Same.
+	* testsuite/libstdc++-dg/normal.exp: Same.
+	* testsuite/ext/mt_allocator/22309_thread.cc: Update names.
+	* testsuite/19_diagnostics/23591_thread-1.c: New.
+	* testsuite/testsuite_shared.cc: Add tests, rename existing functions.
+	* libsupc++/eh_globals.cc: Make global thread local if possible.
+	* configure.ac: Use GCC_CHECK_TLS.
+	* acinclude.m4: Include tls.m4.
+	* configure: Regenerate.
+	* config.h.in: Same.
+
+2006-01-09  Benjamin Kosnik  <bkoz@redhat.com>
+
+	PR libstdc++/25472
+	* include/c_std/std_cstdlib.h: Fix for freestanding.
+
+2006-01-09  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* src/io-inst.cc: Separate instantiations into...
+	* src/ios-inst.cc: .. this.
+	* src/iostream-inst.cc: ... and this.
+	* src/Makefile.am (sources): Update.
+	* src/Makefile.in: Regenerate.
+
+2006-01-08  Paolo Carlini  <pcarlini@suse.de>
+	
+	* testsuite/testsuite_hooks.h (test_tm): New.
+	* testsuite/testsuite_hooks.cc (test_tm)): Define.
+	* testsuite/22_locale/time_put/put/wchar_t/10.cc: Use it.
+	* testsuite/22_locale/time_put/put/wchar_t/1.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/2.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/3.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/5.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/6.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/7.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/8.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/9.cc: Likewise.
+	* testsuite/22_locale/time_put/put/wchar_t/17038.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/10.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/1.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/2.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/3.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/4.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/5.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/6.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/7.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/8.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/9.cc: Likewise.
+	* testsuite/22_locale/time_put/put/char/17038.cc: Likewise.
+	* testsuite/22_locale/time_get/get_year/wchar_t/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_year/wchar_t/3.cc: Likewise.
+	* testsuite/22_locale/time_get/get_year/char/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_year/char/3.cc: Likewise.
+	* testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_monthname/char/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_monthname/char/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_weekday/wchar_t/3.cc: Likewise.
+	* testsuite/22_locale/time_get/get_weekday/char/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_weekday/char/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_weekday/char/3.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/wchar_t/12750.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/wchar_t/12750.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/wchar_t/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/wchar_t/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/wchar_t/3.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/char/12750.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/char/12750.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/char/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/char/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_date/char/3.cc: Likewise.
+	* testsuite/22_locale/time_get/get_time/wchar_t/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_time/wchar_t/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_time/wchar_t/3.cc: Likewise.
+	* testsuite/22_locale/time_get/get_time/wchar_t/4.cc: Likewise.
+	* testsuite/22_locale/time_get/get_time/char/1.cc: Likewise.
+	* testsuite/22_locale/time_get/get_time/char/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_time/char/3.cc: Likewise.
+	* testsuite/22_locale/time_get/get_time/char/4.cc: Likewise.
+
 2006-01-03  Paolo Carlini  <pcarlini@suse.de>
 
 	* testsuite/27_io/basic_stringstream/str/char/1.cc: Initialize vars.
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 9b73b290eb4..5d5e744d188 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -45,11 +45,12 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \
 	$(top_srcdir)/scripts/testsuite_flags.in ChangeLog
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
 	$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index f4d11bfabbf..12d0eb6daf7 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1648,8 +1648,8 @@ EOF
     rm -f conftest*
   fi
 
-  # This is a tad weird, for hysterical raisins.  We have to map enable/disable 
-  # to two different models.
+  # This is a tad weird, for hysterical raisins.  We have to map
+  # enable/disable to two different models.
   case $enable_sjlj_exceptions in
     yes)
       AC_DEFINE(_GLIBCXX_SJLJ_EXCEPTIONS, 1,
@@ -1878,5 +1878,6 @@ AC_DEFUN([AC_LC_MESSAGES], [
   ])
 ])
 
+# Macros from the top-level gcc directory.
+m4_include([../config/tls.m4])
 
-dnl vim:et:ts=2:sw=2
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 757e1cc3e69..8f4ca5225c6 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -638,6 +638,7 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../config/enable.m4])
 m4_include([../config/lead-dot.m4])
 m4_include([../config/no-executables.m4])
 m4_include([../libtool.m4])
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index 6fb113d0bfa..2aa1341ec7e 100644
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -355,6 +355,9 @@
 /* Define to 1 if you have the `tanl' function. */
 #undef HAVE_TANL
 
+/* Define to 1 if the target supports thread-local storage. */
+#undef HAVE_TLS
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 21a20bc427a..c93cda73f01 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -887,6 +887,8 @@ Optional Features:
   --enable-fully-dynamic-string
                           do not put empty strings in per-process static
                           memory [default=no]
+  _g_switchUse thread-local storage
+                          [default=yes]
   --enable-symvers=STYLE  enables symbol versioning of the shared library
                           [default=yes]
   --enable-version-specific-runtime-libs
@@ -4456,7 +4458,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4459 "configure"' > conftest.$ac_ext
+  echo '#line 4461 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5076,7 +5078,7 @@ fi;
     #
     # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
     cat > conftest.$ac_ext << EOF
-#line 5079 "configure"
+#line 5081 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
@@ -5104,8 +5106,8 @@ EOF
     rm -f conftest*
   fi
 
-  # This is a tad weird, for hysterical raisins.  We have to map enable/disable
-  # to two different models.
+  # This is a tad weird, for hysterical raisins.  We have to map
+  # enable/disable to two different models.
   case $enable_sjlj_exceptions in
     yes)
 
@@ -29929,6 +29931,135 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+  # For TLS support.
+
+   # Check whether --enable-tls or --disable-tls was given.
+if test "${enable_tls+set}" = set; then
+  enableval="$enable_tls"
+
+      case "$enableval" in
+       yes|no) ;;
+       *) { { echo "$as_me:$LINENO: error: Argument to enable/disable tls must be yes or no" >&5
+echo "$as_me: error: Argument to enable/disable tls must be yes or no" >&2;}
+   { (exit 1); exit 1; }; } ;;
+      esac
+
+else
+  enable_tls=yes
+fi;
+
+  echo "$as_me:$LINENO: checking whether the target supports thread-local storage" >&5
+echo $ECHO_N "checking whether the target supports thread-local storage... $ECHO_C" >&6
+if test "${have_tls+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    if test "$cross_compiling" = yes; then
+  cat >conftest.$ac_ext <<_ACEOF
+__thread int foo;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  have_tls=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+have_tls=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+__thread int a; int b; int main() { return a = b; }
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+                    save_LDFLAGS="$LDFLAGS"
+      LDFLAGS="-static $LDFLAGS"
+      if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+__thread int a; int b; int main() { return a = b; }
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  have_tls=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+have_tls=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+      LDFLAGS="$save_LDFLAGS"
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+have_tls=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:$LINENO: result: $have_tls" >&5
+echo "${ECHO_T}$have_tls" >&6
+  if test "$enable_tls $have_tls" = "yes yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TLS 1
+_ACEOF
+
+  fi
+
 
   if test "${ac_cv_header_locale_h+set}" = set; then
   echo "$as_me:$LINENO: checking for locale.h" >&5
@@ -82972,6 +83103,18 @@ echo $ECHO_N "checking for enabled iconv specializations... $ECHO_C" >&6
   echo "$as_me:$LINENO: result: $enable_iconv" >&5
 echo "${ECHO_T}$enable_iconv" >&6
 
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_HYPOT 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ISINF 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ISNAN 1
+_ACEOF
+
 
     # For showmanyc_helper().
 
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 986c0ef39fa..9db10226dca 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -157,6 +157,9 @@ if $GLIBCXX_IS_NATIVE; then
   # For LFS support.
   GLIBCXX_CHECK_LFS
 
+  # For TLS support.
+  GCC_CHECK_TLS
+
   AC_LC_MESSAGES
 
   AC_TRY_COMPILE(
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index 200aa6275cc..ec43775be29 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -273,6 +273,9 @@ case "${host}" in
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
     GLIBCXX_CHECK_ICONV_SUPPORT
+    AC_DEFINE(HAVE_HYPOT)
+    AC_DEFINE(HAVE_ISINF)
+    AC_DEFINE(HAVE_ISNAN)
 
     # For showmanyc_helper().
     AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index cfdfdf2283e..a0c358c6cad 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -40,11 +40,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/fragment.am
 subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
 	$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/libstdc++-v3/include/bits/valarray_after.h b/libstdc++-v3/include/bits/valarray_after.h
index 4838cd44b4f..8d73d42f27c 100644
--- a/libstdc++-v3/include/bits/valarray_after.h
+++ b/libstdc++-v3/include/bits/valarray_after.h
@@ -222,47 +222,71 @@ namespace std
   template<class _Clos, typename _Tp>
     inline valarray<_Tp>
     _Expr<_Clos, _Tp>::operator[](slice __s) const
-    { return _M_closure[__s]; }
+    {
+      valarray<_Tp> __v = valarray<_Tp>(*this)[__s];
+      return __v;
+    }
 
   template<class _Clos, typename _Tp>
     inline valarray<_Tp>
     _Expr<_Clos, _Tp>::operator[](const gslice& __gs) const
-    { return _M_closure[__gs]; }
+    {
+      valarray<_Tp> __v = valarray<_Tp>(*this)[__gs];
+      return __v;
+    }
 
   template<class _Clos, typename _Tp>
     inline valarray<_Tp>
     _Expr<_Clos, _Tp>::operator[](const valarray<bool>& __m) const
-    { return _M_closure[__m]; }
+    {
+      valarray<_Tp> __v = valarray<_Tp>(*this)[__m];
+      return __v;
+    }
 
   template<class _Clos, typename _Tp>
     inline valarray<_Tp>
     _Expr<_Clos, _Tp>::operator[](const valarray<size_t>& __i) const
-    { return _M_closure[__i]; }
+    {
+      valarray<_Tp> __v = valarray<_Tp>(*this)[__i];
+      return __v;
+    }
 
   template<class _Clos, typename _Tp>
     inline size_t
     _Expr<_Clos, _Tp>::size() const
-    { return _M_closure.size (); }
+    { return _M_closure.size(); }
 
   template<class _Clos, typename _Tp>
     inline valarray<_Tp>
     _Expr<_Clos, _Tp>::shift(int __n) const
-    { return valarray<_Tp>(_M_closure).shift(__n); }
+    {
+      valarray<_Tp> __v = valarray<_Tp>(*this).shift(__n);
+      return __v;
+    }
 
   template<class _Clos, typename _Tp>
     inline valarray<_Tp>
     _Expr<_Clos, _Tp>::cshift(int __n) const
-    { return valarray<_Tp>(_M_closure).cshift(__n); }
+    {
+      valarray<_Tp> __v = valarray<_Tp>(*this).cshift(__n);
+      return __v;
+    }
 
   template<class _Clos, typename _Tp>
     inline valarray<_Tp>
     _Expr<_Clos, _Tp>::apply(_Tp __f(const _Tp&)) const
-    { return valarray<_Tp>(_M_closure).apply(__f); }
+    {
+      valarray<_Tp> __v = valarray<_Tp>(*this).apply(__f);
+      return __v;
+    }
 
   template<class _Clos, typename _Tp>
     inline valarray<_Tp>
     _Expr<_Clos, _Tp>::apply(_Tp __f(_Tp)) const
-    { return valarray<_Tp>(_M_closure).apply(__f); }
+    {
+      valarray<_Tp> __v = valarray<_Tp>(*this).apply(__f);
+      return __v;
+    }
 
   // XXX: replace this with a more robust summation algorithm.
   template<class _Clos, typename _Tp>
diff --git a/libstdc++-v3/include/c_std/std_cstdlib.h b/libstdc++-v3/include/c_std/std_cstdlib.h
index b5c47fa2d44..2139092f57d 100644
--- a/libstdc++-v3/include/c_std/std_cstdlib.h
+++ b/libstdc++-v3/include/c_std/std_cstdlib.h
@@ -50,13 +50,25 @@
 #include <bits/c++config.h>
 #include <cstddef>
 
-#if _GLIBCXX_HOSTED
-/* The C standard does not require a freestanding implementation to
-   provide <stdlib.h>.  However, the C++ standard does still require
-   <cstdlib> -- but only the functionality mentioned in
-   [lib.support.start.term].  */
+#if !_GLIBCXX_HOSTED
+// The C standard does not require a freestanding implementation to
+// provide <stdlib.h>.  However, the C++ standard does still require
+// <cstdlib> -- but only the functionality mentioned in
+// [lib.support.start.term].
+
+#define EXIT_SUCCESS 0
+#define EXIT_FAILURE 1
+
+namespace std
+{
+  extern "C" void abort(void);
+  extern "C" int atexit(void (*)());
+  extern "C" void exit(int);
+} // namespace std
+
+#else
+
 #include <stdlib.h>
-#endif
 
 // Get rid of those macros defined in <stdlib.h> in lieu of real functions.
 #undef abort
@@ -90,7 +102,6 @@
 
 namespace std
 {
-#if _GLIBCXX_HOSTED
   using ::div_t;
   using ::ldiv_t;
 
@@ -132,16 +143,7 @@ namespace std
 
   inline ldiv_t
   div(long __i, long __j) { return ldiv(__i, __j); }
-#else
-  /* Provide the minimal set of definitions required of a freestanding
-     implementation.  */
-  #define EXIT_SUCCESS 0
-  #define EXIT_FAILURE 1
-  extern "C" void abort(void);
-  extern "C" int atexit(void (*)());
-  extern "C" void exit(int);
-#endif
-}
+} // namespace std
 
 #if _GLIBCXX_USE_C99
 
@@ -198,21 +200,24 @@ namespace __gnu_cxx
 namespace std
 {
 #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using __gnu_cxx::lldiv_t;
+  using ::__gnu_cxx::lldiv_t;
 #endif
-  using __gnu_cxx::_Exit;
-  using __gnu_cxx::abs;
+  using ::__gnu_cxx::_Exit;
+  using ::__gnu_cxx::abs;
 #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using __gnu_cxx::llabs;
-  using __gnu_cxx::div;
-  using __gnu_cxx::lldiv;
+  using ::__gnu_cxx::llabs;
+  using ::__gnu_cxx::div;
+  using ::__gnu_cxx::lldiv;
 #endif
-  using __gnu_cxx::atoll;
-  using __gnu_cxx::strtof;
-  using __gnu_cxx::strtoll;
-  using __gnu_cxx::strtoull;
-  using __gnu_cxx::strtold;
+  using ::__gnu_cxx::atoll;
+  using ::__gnu_cxx::strtof;
+  using ::__gnu_cxx::strtoll;
+  using ::__gnu_cxx::strtoull;
+  using ::__gnu_cxx::strtold;
 }
-#endif
+
+#endif // _GLIBCXX_USE_C99
+
+#endif // !_GLIBCXX_HOSTED
 
 #endif
diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index af3d6c1fc7c..73cd3ca127e 100644
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -40,11 +40,12 @@ target_triplet = @target@
 subdir = libmath
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
 	$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 44d57cc2e4c..fb4d7a8858a 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -42,11 +42,12 @@ DIST_COMMON = $(glibcxxinstall_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/fragment.am
 subdir = libsupc++
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
 	$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/libstdc++-v3/libsupc++/eh_globals.cc b/libstdc++-v3/libsupc++/eh_globals.cc
index 00465dedf93..9b7e916716d 100644
--- a/libstdc++-v3/libsupc++/eh_globals.cc
+++ b/libstdc++-v3/libsupc++/eh_globals.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*- Manage the thread-local exception globals.
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
 //
 // This file is part of GCC.
 //
@@ -27,101 +27,127 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
+#include <bits/c++config.h>
 #include <exception>
 #include <cstdlib>
+#include "cxxabi.h"
 #include "unwind-cxx.h"
-#include "bits/c++config.h"
 #include "bits/gthr.h"
 
 using namespace __cxxabiv1;
 
+#if _GLIBCXX_HAVE_TLS
+
+namespace __gnu_internal
+{
+  using namespace abi;
+  using namespace std;
+
+  __cxa_eh_globals*
+  get_global() throw()
+  {
+    static __thread __cxa_eh_globals global;
+    return &global;
+  }
+}
+
+extern "C" __cxa_eh_globals*
+__cxxabiv1::__cxa_get_globals_fast() throw()
+{ return __gnu_internal::get_global(); }
+
+extern "C" __cxa_eh_globals*
+__cxxabiv1::__cxa_get_globals() throw()
+{ return __gnu_internal::get_global(); }
+
+
+#else
 
 // Single-threaded fallback buffer.
-static __cxa_eh_globals globals_static;
+static __cxa_eh_globals eh_globals;
 
 #if __GTHREADS
-static __gthread_key_t globals_key;
-static int use_thread_key = -1;
 
 static void
-get_globals_dtor (void *ptr)
+eh_globals_dtor(void* ptr)
 {
   if (ptr)
     {
-      __cxa_exception *exn, *next;
-      exn = ((__cxa_eh_globals *) ptr)->caughtExceptions;
+      __cxa_eh_globals* g = reinterpret_cast<__cxa_eh_globals*>(ptr);
+      __cxa_exception* exn = g->caughtExceptions;
+      __cxa_exception* next;
       while (exn)
 	{
 	  next = exn->nextException;
-	  _Unwind_DeleteException (&exn->unwindHeader);
+	  _Unwind_DeleteException(&exn->unwindHeader);
 	  exn = next;
 	}
-      std::free (ptr);
+      std::free(ptr);
     }
 }
 
-static void
-get_globals_init ()
+struct __eh_globals_init
 {
-  use_thread_key =
-    (__gthread_key_create (&globals_key, get_globals_dtor) == 0);
-}
-
-static void
-get_globals_init_once ()
+  __gthread_key_t  	_M_key;
+  bool 			_M_init;
+
+  __eh_globals_init() : _M_init(false)
+  { 
+    if (__gthread_active_p())
+      _M_init = __gthread_key_create(&_M_key, eh_globals_dtor) == 0; 
+  }
+
+  ~__eh_globals_init()
+  {
+    if (_M_init)
+      __gthread_key_delete(_M_key);
+  }
+};
+
+static __eh_globals_init init;
+
+extern "C" __cxa_eh_globals*
+__cxxabiv1::__cxa_get_globals_fast() throw()
 {
-  static __gthread_once_t once = __GTHREAD_ONCE_INIT;
-  if (__gthread_once (&once, get_globals_init) != 0
-      || use_thread_key < 0)
-    use_thread_key = 0;
+  __cxa_eh_globals* g;
+  if (init._M_init)
+    g = static_cast<__cxa_eh_globals*>(__gthread_getspecific(init._M_key));
+  else
+    g = &eh_globals;
+  return g;
 }
-#endif
 
-extern "C" __cxa_eh_globals *
-__cxxabiv1::__cxa_get_globals_fast () throw()
+extern "C" __cxa_eh_globals*
+__cxxabiv1::__cxa_get_globals() throw()
 {
-#if __GTHREADS
-  if (use_thread_key)
-    return (__cxa_eh_globals *) __gthread_getspecific (globals_key);
+  __cxa_eh_globals* g;
+  if (init._M_init)
+    {
+      g = static_cast<__cxa_eh_globals*>(__gthread_getspecific(init._M_key));
+      if (!g)
+	{
+	  void* v = std::malloc(sizeof(__cxa_eh_globals));
+	  if (v == 0 || __gthread_setspecific(init._M_key, v) != 0)
+	    std::terminate();
+	  g = static_cast<__cxa_eh_globals*>(v);
+	  g->caughtExceptions = 0;
+	  g->uncaughtExceptions = 0;
+	}
+    }
   else
-    return &globals_static;
-#else
-  return &globals_static;
-#endif
+    g = &eh_globals;
+  return g;
 }
 
-extern "C" __cxa_eh_globals *
-__cxxabiv1::__cxa_get_globals () throw()
-{
-#if __GTHREADS
-  __cxa_eh_globals *g;
-
-  if (use_thread_key == 0)
-    return &globals_static;
+#else
 
-  if (use_thread_key < 0)
-    {
-      get_globals_init_once ();
+extern "C" __cxa_eh_globals*
+__cxxabiv1::__cxa_get_globals_fast() throw()
+{ return &eh_globals; }
 
-      // Make sure use_thread_key got initialized.
-      if (use_thread_key == 0)
-	return &globals_static;
-    }
+extern "C" __cxa_eh_globals*
+__cxxabiv1::__cxa_get_globals() throw()
+{ return &eh_globals; }
 
-  g = (__cxa_eh_globals *) __gthread_getspecific (globals_key);
-  if (! g)
-    {
-      if ((g = (__cxa_eh_globals *)
-	   std::malloc (sizeof (__cxa_eh_globals))) == 0
-	  || __gthread_setspecific (globals_key, (void *) g) != 0)
-        std::terminate ();
-      g->caughtExceptions = 0;
-      g->uncaughtExceptions = 0;
-    }
+#endif
 
-  return g;
-#else
-  return &globals_static;
 #endif
-}
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index 6252acf0362..e814e23eb5c 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -40,11 +40,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/fragment.am
 subdir = po
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
 	$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/libstdc++-v3/scripts/create_testsuite_files b/libstdc++-v3/scripts/create_testsuite_files
index 4b9a41fc5fc..d5305236140 100755
--- a/libstdc++-v3/scripts/create_testsuite_files
+++ b/libstdc++-v3/scripts/create_testsuite_files
@@ -35,7 +35,9 @@ dlist=`echo [0-9][0-9]*`
 for d in [a-z]*; do
   test -d $d && dlist="$dlist $d"
 done
-find $dlist "(" -type f -o -type l ")" -name "*.cc" -print | sort > $tmp.1
+find $dlist "(" -type f -o -type l ")" -name "*.cc" -print > $tmp.01
+find $dlist "(" -type f -o -type l ")" -name "*.c" -print > $tmp.02
+cat  $tmp.01 $tmp.02 | sort > $tmp.1
 if test ! -s "$tmp.1"; then
   exit 1
 fi
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 903930a8180..bc7f5058ea8 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -144,7 +144,8 @@ sources = \
 	concept-inst.cc \
 	fstream-inst.cc \
 	ext-inst.cc \
-	io-inst.cc \
+	ios-inst.cc \
+	iostream-inst.cc \
 	istream-inst.cc \
 	istream.cc \
 	locale-inst.cc \
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 188f46ce07d..cf58c42c852 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -40,11 +40,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/fragment.am
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
 	$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -69,11 +70,11 @@ am__objects_3 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \
 	list.lo locale.lo locale_init.lo locale_facets.lo \
 	localename.lo stdexcept.lo strstream.lo tree.lo \
 	allocator-inst.lo concept-inst.lo fstream-inst.lo ext-inst.lo \
-	io-inst.lo istream-inst.lo istream.lo locale-inst.lo \
-	locale-misc-inst.lo misc-inst.lo ostream-inst.lo \
-	sstream-inst.lo streambuf-inst.lo streambuf.lo string-inst.lo \
-	valarray-inst.lo wlocale-inst.lo wstring-inst.lo \
-	$(am__objects_1) $(am__objects_2)
+	ios-inst.lo iostream-inst.lo istream-inst.lo istream.lo \
+	locale-inst.lo locale-misc-inst.lo misc-inst.lo \
+	ostream-inst.lo sstream-inst.lo streambuf-inst.lo streambuf.lo \
+	string-inst.lo valarray-inst.lo wlocale-inst.lo \
+	wstring-inst.lo $(am__objects_1) $(am__objects_2)
 am_libstdc___la_OBJECTS = $(am__objects_3)
 libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -333,7 +334,8 @@ sources = \
 	concept-inst.cc \
 	fstream-inst.cc \
 	ext-inst.cc \
-	io-inst.cc \
+	ios-inst.cc \
+	iostream-inst.cc \
 	istream-inst.cc \
 	istream.cc \
 	locale-inst.cc \
diff --git a/libstdc++-v3/src/ios-inst.cc b/libstdc++-v3/src/ios-inst.cc
new file mode 100644
index 00000000000..83996f9cff9
--- /dev/null
+++ b/libstdc++-v3/src/ios-inst.cc
@@ -0,0 +1,44 @@
+// Explicit instantiation file.
+
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882:
+//
+
+#include <ios>
+
+namespace std
+{
+  template class basic_ios<char>;
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template class basic_ios<wchar_t>;
+#endif
+}
diff --git a/libstdc++-v3/src/io-inst.cc b/libstdc++-v3/src/iostream-inst.cc
index c6f59d6e848..9f389e64f91 100644
--- a/libstdc++-v3/src/io-inst.cc
+++ b/libstdc++-v3/src/iostream-inst.cc
@@ -1,6 +1,6 @@
 // Explicit instantiation file.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -32,28 +32,18 @@
 // ISO C++ 14882:
 //
 
-#include <ios>
+#include <iostream>
 #include <iomanip>
 
 namespace std
 {
-  // basic_ios
-  template class basic_ios<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template class basic_ios<wchar_t>;
-#endif
-
-  // iomanip
   template class _Setfill<char>;
   template _Setfill<char> setfill(char);
+  template class basic_iostream<char>;
+
 #ifdef _GLIBCXX_USE_WCHAR_T
   template class _Setfill<wchar_t>;
   template _Setfill<wchar_t> setfill(wchar_t);
-#endif
-
-  // iostream
-  template class basic_iostream<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_iostream<wchar_t>; 
 #endif
-} // namespace std
+}
diff --git a/libstdc++-v3/testsuite/19_diagnostics/23591_thread-1.c b/libstdc++-v3/testsuite/19_diagnostics/23591_thread-1.c
new file mode 100644
index 00000000000..8c953eaed0e
--- /dev/null
+++ b/libstdc++-v3/testsuite/19_diagnostics/23591_thread-1.c
@@ -0,0 +1,63 @@
+// { dg-require-sharedlib "" }
+// { dg-options "-g -O2 -pthread -ldl -x c" { target *-*-linux* } }
+
+// Copyright (C) 2005 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// This library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+#include <pthread.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+// NB: This must be compiled and linked as a "C" executable.
+static void* run(void* arg)
+{
+  typedef void (*function_type) (void);
+  void* lib;
+  void (*cb)();
+
+  lib = dlopen("./testsuite_shared.so", RTLD_NOW);
+  if (lib == NULL)
+    {
+      printf("dlopen failed: %s\n", strerror(errno));
+      return NULL;
+    }
+  cb = (function_type) dlsym(lib, "try_throw_exception");
+  if (cb == NULL)
+    {
+      printf("dlsym failed: %s\n", strerror(errno));
+      return NULL;
+    }
+  cb();
+  dlclose(lib);
+  return NULL;
+}
+
+// libstdc++/23591
+int main(void)
+{
+  pthread_t pt;
+
+  if (pthread_create(&pt, NULL, &run, NULL) != 0)
+    return 1;
+  if (pthread_join(pt, NULL) != 0)
+    return 1;
+
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/1.cc
index 73f533cf554..469133f8162 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -47,7 +47,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_date(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*) const
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc
index b5e1a244ea2..a51f5c5f3ff 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc
@@ -2,7 +2,7 @@
 
 // 2003-10-27 Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003, 2005 Free Software Foundation
+// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -47,8 +47,8 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday01 = { 0, 0, 12, 2, 9, 103, 4, 274, -1 };
-  const tm time_bday02 = { 0, 0, 12, 26, 9, 103, 0, 298, -1 };
+  const tm time_bday01 = __gnu_test::test_tm(0, 0, 12, 2, 9, 103, 4, 274, -1);
+  const tm time_bday02 = __gnu_test::test_tm(0, 0, 12, 26, 9, 103, 0, 298, -1);
 
   // inspection of named locales, is_IS
   iss.imbue(loc_is);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc
index c1b8fae91c9..8c5a876bf9c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -52,7 +52,7 @@ void test02()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_date(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*) const
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/3.cc
index fee8ced1543..92762e10775 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/3.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test03()
   const locale loc_c = locale::classic();
 
   // Create "C" time objects
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2, 0, 0 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   tm tm1;
 
   istringstream iss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/1.cc
index 61b079d4e0a..aead697120c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -48,7 +48,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_date(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*) const
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc
index 33014545375..40f1b5edc6f 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc
@@ -2,7 +2,7 @@
 
 // 2003-10-27 Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003, 2005 Free Software Foundation
+// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -47,8 +47,8 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday01 = { 0, 0, 12, 2, 9, 103, 4, 274, -1 };
-  const tm time_bday02 = { 0, 0, 12, 26, 9, 103, 0, 298, -1 };
+  const tm time_bday01 = __gnu_test::test_tm(0, 0, 12, 2, 9, 103, 4, 274, -1);
+  const tm time_bday02 = __gnu_test::test_tm(0, 0, 12, 26, 9, 103, 0, 298, -1);
 
   // inspection of named locales, is_IS
   iss.imbue(loc_is);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc
index a506dafc315..3060063babe 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -52,7 +52,7 @@ void test02()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_date(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*) const
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/3.cc
index c4bd129ecce..759b7fd42e6 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/3.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test03()
   const locale loc_c = locale::classic();
 
   // Create "C" time objects
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2, 0, 0 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   tm tm1;
 
   istringstream iss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/1.cc
index 678bee3039d..b5d5d869e54 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test01()
   locale loc_c = locale::classic();
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_monthname(iter_type, iter_type, ios_base&, 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc
index 727f6a89b06..b29106297d4 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -40,7 +40,7 @@ void test02()
   VERIFY( loc_hk != loc_c );
   VERIFY( loc_hk != loc_de );
 
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   const string empty;
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc
index 94c2f90a1b8..17a9516f063 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test01()
   locale loc_c = locale::classic();
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_monthname(iter_type, iter_type, ios_base&, 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc
index 08a93658f37..fe5255530e3 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -40,7 +40,7 @@ void test02()
   VERIFY( loc_hk != loc_c );
   VERIFY( loc_hk != loc_de );
 
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   const wstring empty;
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc
index 9aa45997a86..e4c586ef72b 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -50,7 +50,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // 2
   // iter_type 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
index 75391315606..2b71a6ebb50 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -39,7 +39,7 @@ void test02()
   VERIFY( loc_hk != loc_c );
 
   const string empty;
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // create an ostream-derived object, cache the time_get facet
   iterator_type end;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/3.cc
index 1599278b85b..3356adef3c7 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/3.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test03()
   const locale loc_c = locale::classic();
 
   // Create "C" time objects
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2, 0, 0 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   tm tm1;
 
   istringstream iss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/4.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/4.cc
index e49a6206524..ff300bbbf9e 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/4.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/4.cc
@@ -1,6 +1,6 @@
 // 2004-08-29  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -46,7 +46,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 60, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(60, 0, 12, 4, 3, 71, 0, 93, 0);
 
   iss.str("12:00:60 ");
   iterator_type is_it01(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc
index 15e30339d21..415d3fd1dc2 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -50,7 +50,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // 2
   // iter_type 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
index 498badba949..1b3de6f496c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -39,7 +39,7 @@ void test02()
   VERIFY( loc_hk != loc_c );
 
   const wstring empty;
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // create an ostream-derived object, cache the time_get facet
   iterator_type end;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/3.cc
index e0bb4442419..72892c60862 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/3.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test03()
   const locale loc_c = locale::classic();
 
   // Create "C" time objects
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2, 0, 0 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   tm tm1;
 
   wistringstream iss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/4.cc
index 161fb193c3c..ba9e9bdf6f4 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/4.cc
@@ -1,6 +1,6 @@
 // 2004-08-29  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -46,7 +46,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 60, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(60, 0, 12, 4, 3, 71, 0, 93, 0);
 
   iss.str(L"12:00:60 ");
   iterator_type is_it01(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/1.cc
index d4c260766ac..1c214bf1cdb 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -47,7 +47,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_weekday(iter_type, iter_type, ios_base&, 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc
index 23b50d63dcf..08b06efec34 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -52,7 +52,7 @@ void test02()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // inspection of named locales, de_DE
   iss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/3.cc
index 24dcc51fb96..46f01842547 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/3.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test03()
   const locale loc_c = locale::classic();
 
   // Create "C" time objects
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2, 0, 0 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   tm tm1;
 
   istringstream iss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc
index 81e0cbd3022..27b6cff54e9 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -47,7 +47,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_weekday(iter_type, iter_type, ios_base&, 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc
index 6857abb9799..e3547972c81 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -52,7 +52,7 @@ void test02()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // inspection of named locales, de_DE
   iss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/3.cc
index 942c87c8ff0..44393344500 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/3.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test03()
   const locale loc_c = locale::classic();
 
   // Create "C" time objects
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2, 0, 0 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   tm tm1;
 
   wistringstream iss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
index 66e44ac5a9c..782984cf50f 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -47,7 +47,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_year(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*) const
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/3.cc
index 11b177f879c..6a646b1a7a0 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/3.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test03()
   const locale loc_c = locale::classic();
 
   // Create "C" time objects
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2, 0, 0 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   tm tm1;
 
   istringstream iss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
index 0fff5d58a58..0bf843d4dfa 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -47,7 +47,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
    // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_year(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*) const
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/3.cc
index 85fd34d523a..fdfa472ffeb 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/3.cc
@@ -1,6 +1,6 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -38,7 +38,7 @@ void test03()
   const locale loc_c = locale::classic();
 
   // Create "C" time objects
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2, 0, 0 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   tm tm1;
 
   istringstream iss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc
index 2d6096c3922..ee06172656d 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -32,7 +32,7 @@ void test01()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/10.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/10.cc
index 9f2223d4cae..c7e2abe75ce 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/10.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/10.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -40,7 +40,7 @@ void test10()
   const locale loc_c = locale::classic();
   const string x(50, 'x'); // have to have allocated string!
   string res;
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
 
   ostringstream oss; 
   oss.imbue(locale(loc_c, new time_put_type));
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc
index bac3c910374..aa456fc4458 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc
@@ -2,7 +2,7 @@
 
 // 2004-08-25  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004, 2005 Free Software Foundation
+// Copyright (C) 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -35,7 +35,7 @@ void test01()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc
index db91d110a7a..121ad787bb3 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -34,7 +34,7 @@ void test02()
   bool test __attribute__((unused)) = true;
 
   // create "C" time object
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc
index 3fd23797281..acae5c1eb65 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -34,7 +34,7 @@ void test03()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction and sanity check.
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc
index 8a2ba847679..33018395283 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -34,7 +34,7 @@ void test04()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc
index 6488b0e3a5d..e7a93f07df6 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -33,7 +33,7 @@ void test05()
   bool test __attribute__((unused)) = true;
 
    // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
   const char* date = "%A, the second of %B";
   const char* date_ex = "%Ex";
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc
index ffec0393cba..0bb9a2d28db 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -35,7 +35,7 @@ void test06()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
   const char* date = "%A, the second of %B";
   const char* date_ex = "%Ex";
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc
index b4c5747c7dc..7753fe947bc 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -35,7 +35,7 @@ void test07()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
   const char* date = "%A, the second of %B";
   const char* date_ex = "%Ex";
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc
index 4699fdbdc2d..3a1d9914277 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -35,7 +35,7 @@ void test08()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
   const char* date = "%A, the second of %B";
   const char* date_ex = "%Ex";
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/9.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/9.cc
index 76f711067e1..86c509c247c 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/9.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/9.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -40,7 +40,7 @@ void test09()
   const locale loc_c = locale::classic();
   const string x(50, 'x'); // have to have allocated string!
   string res;
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   const char* date = "%X, %A, the second of %B, %Y";
 
   ostringstream oss; 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc
index c4be6be6f6e..9dd77260a61 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -32,7 +32,7 @@ void test01()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/10.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/10.cc
index c68e8ff9551..f1c91b171e7 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/10.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/10.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -40,7 +40,7 @@ void test10()
   const locale loc_c = locale::classic();
   const wstring x(50, 'x'); // have to have allocated wstring!
   wstring res;
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
 
   wostringstream oss; 
   oss.imbue(locale(loc_c, new time_put_type));
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc
index 3f5527cb02b..e245f48e2ce 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc
@@ -2,7 +2,7 @@
 
 // 2004-08-25  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004, 2005 Free Software Foundation
+// Copyright (C) 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -35,7 +35,7 @@ void test01()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc
index e98616215ab..672248c07ff 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -34,7 +34,7 @@ void test02()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc
index 83900e14bd3..8f8659dcbbc 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -34,7 +34,7 @@ void test03()
   bool test __attribute__((unused)) = true;
 
    // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc
index bb98ecfe732..a3b469d67ce 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -34,7 +34,7 @@ void test04()
   bool test __attribute__((unused)) = true;
   
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc
index e09382c389e..4d30717cc86 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -33,7 +33,7 @@ void test05()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
   const wchar_t* date = L"%A, the second of %B";
   const wchar_t* date_ex = L"%Ex";
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc
index 7f13c04e5c2..28f3d9ab74f 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -35,7 +35,7 @@ void test06()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
   const wchar_t* date = L"%A, the second of %B";
   const wchar_t* date_ex = L"%Ex";
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc
index 31c7b968898..aecd6d93dca 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -35,7 +35,7 @@ void test07()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
   const wchar_t* date = L"%A, the second of %B";
   const wchar_t* date_ex = L"%Ex";
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc
index 4e0da84d57a..c3f123e4f6e 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc
@@ -2,7 +2,7 @@
 
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -35,7 +35,7 @@ void test08()
   bool test __attribute__((unused)) = true;
 
   // create "C" time objects
-  tm time1 = { 0, 0, 12, 4, 3, 71, 0, 93, 0 };
+  const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
   const wchar_t* date = L"%A, the second of %B";
   const wchar_t* date_ex = L"%Ex";
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/9.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/9.cc
index a421835e472..3a3e01c633b 100644
--- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/9.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/9.cc
@@ -1,6 +1,6 @@
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -40,7 +40,7 @@ void test09()
   const locale loc_c = locale::classic();
   const wstring x(50, L'x'); // have to have allocated wstring!
   wstring res;
-  const tm time_sanity = { 0, 0, 12, 26, 5, 97, 2 };
+  const tm time_sanity = __gnu_test::test_tm(0, 0, 12, 26, 5, 97, 2, 0, 0);
   const wchar_t* date = L"%X, %A, the second of %B, %Y";
 
   wostringstream oss; 
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index dcfb5f80696..0b25a5a8686 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -40,11 +40,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/fragment.am
 subdir = testsuite
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
 	$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/22309_thread.cc b/libstdc++-v3/testsuite/ext/mt_allocator/22309_thread.cc
index f2243657a5d..1df94b7c666 100644
--- a/libstdc++-v3/testsuite/ext/mt_allocator/22309_thread.cc
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/22309_thread.cc
@@ -50,7 +50,7 @@ check_dlsym(void*& h)
 
   typedef void (*function_type) (void);
   function_type fn;
-  fn = reinterpret_cast<function_type>(dlsym(h, "foo"));
+  fn = reinterpret_cast<function_type>(dlsym(h, "try_allocation"));
 
   try 
     {
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 0f10e6dff91..ee5111dfaf9 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -266,14 +266,32 @@ proc libstdc++-dg-test { prog do_what extra_tool_flags } {
             # created or not.  If it was, dg.exp will try to run it.
             remote_file build delete $output_file;
         }
-        default {
+	default {
             perror "$do_what: not a valid dg-do keyword"
             return ""
         }
     }
+
     set options ""
     if { $extra_tool_flags != "" } {
-        lappend options "additional_flags=$extra_tool_flags"
+	verbose -log "extra_tool_flags are:"
+	verbose -log $extra_tool_flags
+	if { [string first "-x c" $extra_tool_flags ] != -1 } {
+	    # Short-circut a bunch of complicated goo here for the
+	    # special case of compiling a test file as a "C" file, not
+	    # as C++: just use target_compile, instead of the usual
+	    # gimmicks.
+	    verbose -log "compiling and executing as C, not C++"
+            set compile_type "executable"
+            set output_file "./[file rootname [file tail $prog]].exe"
+            remote_file build delete $output_file;
+	    lappend options "additional_flags=$extra_tool_flags"
+	    set comp_output [target_compile "$prog" "$output_file" "$compile_type" $options];
+	    set comp_output [ prune_g++_output $comp_output ];
+	    return [list $comp_output $output_file]
+        } else {
+	    lappend options "additional_flags=$extra_tool_flags"
+	}
     }
 
     # There is a libstdc++_compile made for us by default (via the tool-
@@ -608,8 +626,7 @@ proc check_v3_target_debug_mode { } {
 	set et_debug_mode 0
 
 	# Set up, compile, and execute a C++ test program that depends
-	# on correct ordering of static object destructors. This is
-	# indicative of the presence and use of __cxa_atexit.
+	# on debug mode working.
 	set src debug_mode[pid].cc
 	set exe debug_mode[pid].exe
 
diff --git a/libstdc++-v3/testsuite/libstdc++-dg/normal.exp b/libstdc++-v3/testsuite/libstdc++-dg/normal.exp
index 6ebe6b439ec..21bc3c1b915 100644
--- a/libstdc++-v3/testsuite/libstdc++-dg/normal.exp
+++ b/libstdc++-v3/testsuite/libstdc++-dg/normal.exp
@@ -1,4 +1,4 @@
-# Primary test file for libstdc++.
+# Functional and regression tests in C++ for libstdc++.
 
 # Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 #
@@ -61,6 +61,11 @@ if {[info exists tests_file] && [file exists $tests_file]} {
     # Find all the tests.
     foreach s $subdirs {
 	set subdir_tests [find $s *.cc]
+	set subdir_tests_c [find $s *.c]
+	foreach e $subdir_tests_c {
+	    lappend subdir_tests $e
+	}
+
 	# Filter out tests that should not be run.
 	foreach t $subdir_tests {
 	    # The DejaGNU "find" procedure sometimes returns a list 
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc
index 8d3d5309e27..40189fbf5d4 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.cc
+++ b/libstdc++-v3/testsuite/testsuite_hooks.cc
@@ -2,7 +2,7 @@
 
 // Utility subroutines for the C++ library testsuite. 
 //
-// Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -302,4 +302,22 @@ namespace __gnu_test
       std::__throw_runtime_error("could not wait for semaphore");
 #endif    
   }
+
+  // For use in 22_locale/time_get and time_put.
+  tm
+  test_tm(int sec, int min, int hour, int mday, int mon,
+	  int year, int wday, int yday, int isdst)
+  {
+    static tm tmp;
+    tmp.tm_sec = sec;
+    tmp.tm_min = min;
+    tmp.tm_hour = hour;
+    tmp.tm_mday = mday;
+    tmp.tm_mon = mon;
+    tmp.tm_year = year;
+    tmp.tm_wday = wday;
+    tmp.tm_yday = yday;
+    tmp.tm_isdst = isdst;
+    return tmp;
+  }
 }; // namespace __gnu_test
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/testsuite_hooks.h
index 38b80630fc2..b6c675b12e7 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/testsuite_hooks.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // Utility subroutines for the C++ library testsuite. 
 //
-// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -385,6 +385,11 @@ namespace __gnu_test
 
     pid_t pid_;
   };
+
+  // For use in 22_locale/time_get and time_put.
+  tm test_tm(int sec, int min, int hour, int mday, int mon,
+	     int year, int wday, int yday, int isdst);
+
 } // namespace __gnu_test
 
 #endif // _GLIBCXX_TESTSUITE_HOOKS_H
diff --git a/libstdc++-v3/testsuite/testsuite_shared.cc b/libstdc++-v3/testsuite/testsuite_shared.cc
index a829fb47aa7..58803a2ae4f 100644
--- a/libstdc++-v3/testsuite/testsuite_shared.cc
+++ b/libstdc++-v3/testsuite/testsuite_shared.cc
@@ -17,11 +17,14 @@
 // USA.
 
 #include <string>
+#include <stdexcept>
+#include <iostream>
+#include <sstream>
 #include <ext/mt_allocator.h>
 
 // libstdc++/22309
 extern "C" void
-foo()
+try_allocation()
 {
   typedef char value_t;
 
@@ -34,3 +37,37 @@ foo()
   string_t s;
   s += "west beach, indiana dunes";
 }
+
+// libstdc++/23591
+extern "C" void 
+try_throw_exception()
+{
+  try
+    {
+      throw std::bad_exception();
+    }
+  catch (const std::exception& e)
+    { }
+}
+
+extern "C" void 
+try_function_random_fail()
+{
+  long seed = lrand48();
+  if (seed < 2000)
+    seed = 2000;
+
+  {
+    std::ostringstream s;
+    s << "random_throw, seed: " << seed << std::endl;
+    std::cout << s.str();
+  }
+
+  while (--seed > 0)
+    {
+      try_throw_exception();
+    }
+
+  // Randomly throw. See if other threads cleanup.
+  throw std::bad_exception();
+}