Index: tches/gcc-4.3.3-branch_update-5.patch
===================================================================
--- patches/gcc-4.3.3-branch_update-5.patch	(revision 77e17c8d49567878da4e9c1b603e0478301c8674)
+++ 	(revision )
@@ -1,10744 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 03-23-2009
-Initial Package Version: 4.3.3
-Origin: Upstream
-Upstream Status: Applied
-Description: This is a branch update for gcc-4.3.3, and should be
-             rechecked periodically.
-
-diff -Naur gcc-4.3.3.orig/gcc/ada/ChangeLog gcc-4.3.3/gcc/ada/ChangeLog
---- gcc-4.3.3.orig/gcc/ada/ChangeLog	2009-01-24 02:15:46.000000000 -0800
-+++ gcc-4.3.3/gcc/ada/ChangeLog	2009-03-01 15:05:14.694633000 -0800
-@@ -1,3 +1,8 @@
-+2009-02-28  Eric Botcazou  <ebotcazou@adacore.com>
-+
-+	* Makefile.in (cygwin/mingw): Revert accidental EH_MECHANISM change
-+	made on 2007-12-06.
-+
- 2009-01-24  Release Manager
- 
- 	* GCC 4.3.3 released.
-diff -Naur gcc-4.3.3.orig/gcc/ada/Makefile.in gcc-4.3.3/gcc/ada/Makefile.in
---- gcc-4.3.3.orig/gcc/ada/Makefile.in	2008-02-13 11:04:53.000000000 -0800
-+++ gcc-4.3.3/gcc/ada/Makefile.in	2009-02-28 09:30:26.328421000 -0800
-@@ -1353,7 +1353,6 @@
-   mlib-tgt-specific.adb<mlib-tgt-mingw.adb \
-   indepsw.adb<indepsw-mingw.adb
- 
--  EH_MECHANISM=-gcc
-   GMEM_LIB = gmemlib
-   PREFIX_OBJS = $(PREFIX_REAL_OBJS)
-   EXTRA_GNATTOOLS = ../../gnatdll$(exeext)
-diff -Naur gcc-4.3.3.orig/gcc/alias.c gcc-4.3.3/gcc/alias.c
---- gcc-4.3.3.orig/gcc/alias.c	2008-03-19 03:06:52.000000000 -0700
-+++ gcc-4.3.3/gcc/alias.c	2009-01-25 04:26:15.714544000 -0800
-@@ -1508,26 +1508,27 @@
-   if (rtx_equal_p (x_base, y_base))
-     return 1;
- 
--  /* The base addresses of the read and write are different expressions.
--     If they are both symbols and they are not accessed via AND, there is
--     no conflict.  We can bring knowledge of object alignment into play
--     here.  For example, on alpha, "char a, b;" can alias one another,
--     though "char a; long b;" cannot.  */
-+  /* The base addresses are different expressions.  If they are not accessed
-+     via AND, there is no conflict.  We can bring knowledge of object
-+     alignment into play here.  For example, on alpha, "char a, b;" can
-+     alias one another, though "char a; long b;" cannot.  AND addesses may
-+     implicitly alias surrounding objects; i.e. unaligned access in DImode
-+     via AND address can alias all surrounding object types except those
-+     with aligment 8 or higher.  */
-+  if (GET_CODE (x) == AND && GET_CODE (y) == AND)
-+    return 1;
-+  if (GET_CODE (x) == AND
-+      && (GET_CODE (XEXP (x, 1)) != CONST_INT
-+	  || (int) GET_MODE_UNIT_SIZE (y_mode) < -INTVAL (XEXP (x, 1))))
-+    return 1;
-+  if (GET_CODE (y) == AND
-+      && (GET_CODE (XEXP (y, 1)) != CONST_INT
-+	  || (int) GET_MODE_UNIT_SIZE (x_mode) < -INTVAL (XEXP (y, 1))))
-+    return 1;
-+
-+  /* Differing symbols not accessed via AND never alias.  */
-   if (GET_CODE (x_base) != ADDRESS && GET_CODE (y_base) != ADDRESS)
--    {
--      if (GET_CODE (x) == AND && GET_CODE (y) == AND)
--	return 1;
--      if (GET_CODE (x) == AND
--	  && (GET_CODE (XEXP (x, 1)) != CONST_INT
--	      || (int) GET_MODE_UNIT_SIZE (y_mode) < -INTVAL (XEXP (x, 1))))
--	return 1;
--      if (GET_CODE (y) == AND
--	  && (GET_CODE (XEXP (y, 1)) != CONST_INT
--	      || (int) GET_MODE_UNIT_SIZE (x_mode) < -INTVAL (XEXP (y, 1))))
--	return 1;
--      /* Differing symbols never alias.  */
--      return 0;
--    }
-+    return 0;
- 
-   /* If one address is a stack reference there can be no alias:
-      stack references using different base registers do not alias,
-diff -Naur gcc-4.3.3.orig/gcc/calls.c gcc-4.3.3/gcc/calls.c
---- gcc-4.3.3.orig/gcc/calls.c	2008-06-24 00:58:17.000000000 -0700
-+++ gcc-4.3.3/gcc/calls.c	2009-02-21 03:08:24.357177000 -0800
-@@ -978,7 +978,6 @@
- 	    && targetm.calls.split_complex_arg (argtype))
- 	  {
- 	    tree subtype = TREE_TYPE (argtype);
--	    arg = save_expr (arg);
- 	    args[j].tree_value = build1 (REALPART_EXPR, subtype, arg);
- 	    j += inc;
- 	    args[j].tree_value = build1 (IMAGPART_EXPR, subtype, arg);
-@@ -3678,10 +3677,10 @@
- #ifdef ARGS_GROW_DOWNWARD
- 	      /* stack_slot is negative, but we want to index stack_usage_map
- 		 with positive values.  */
--	      upper_bound = -argvec[argnum].locate.offset.constant + 1;
-+	      upper_bound = -argvec[argnum].locate.slot_offset.constant + 1;
- 	      lower_bound = upper_bound - argvec[argnum].locate.size.constant;
- #else
--	      lower_bound = argvec[argnum].locate.offset.constant;
-+	      lower_bound = argvec[argnum].locate.slot_offset.constant;
- 	      upper_bound = lower_bound + argvec[argnum].locate.size.constant;
- #endif
- 
-diff -Naur gcc-4.3.3.orig/gcc/c-common.c gcc-4.3.3/gcc/c-common.c
---- gcc-4.3.3.orig/gcc/c-common.c	2008-11-12 14:08:01.000000000 -0800
-+++ gcc-4.3.3/gcc/c-common.c	2009-02-08 11:02:56.473953000 -0800
-@@ -5534,7 +5534,12 @@
- {
-   tree decl = *node;
- 
--  if ((TREE_CODE (decl) == FUNCTION_DECL && DECL_INITIAL (decl))
-+  if (TREE_CODE (decl) != FUNCTION_DECL && TREE_CODE (decl) != VAR_DECL)
-+    {
-+      warning (OPT_Wattributes, "%qE attribute ignored", name);
-+      *no_add_attrs = true;
-+    }
-+  else if ((TREE_CODE (decl) == FUNCTION_DECL && DECL_INITIAL (decl))
-       || (TREE_CODE (decl) != FUNCTION_DECL 
- 	  && TREE_PUBLIC (decl) && !DECL_EXTERNAL (decl))
-       /* A static variable declaration is always a tentative definition,
-@@ -5782,7 +5787,7 @@
- 
-   *no_add_attrs = true;
- 
--  if (!DECL_THREAD_LOCAL_P (decl))
-+  if (TREE_CODE (decl) != VAR_DECL || !DECL_THREAD_LOCAL_P (decl))
-     {
-       warning (OPT_Wattributes, "%qE attribute ignored", name);
-       return NULL_TREE;
-diff -Naur gcc-4.3.3.orig/gcc/c-decl.c gcc-4.3.3/gcc/c-decl.c
---- gcc-4.3.3.orig/gcc/c-decl.c	2008-06-26 08:42:07.000000000 -0700
-+++ gcc-4.3.3/gcc/c-decl.c	2009-02-10 08:43:49.527149000 -0800
-@@ -4386,12 +4386,20 @@
- 	      }
- 	    else if (decl_context == FIELD)
- 	      {
--		if (pedantic && !flag_isoc99 && !in_system_header)
-+		bool flexible_array_member = false;
-+		const struct c_declarator *t = declarator;
-+		while (t->kind == cdk_attrs)
-+		  t = t->declarator;
-+		flexible_array_member = (t->kind == cdk_id);
-+		if (flexible_array_member
-+		    && pedantic && !flag_isoc99 && !in_system_header)
- 		  pedwarn ("ISO C90 does not support flexible array members");
- 
- 		/* ISO C99 Flexible array members are effectively
- 		   identical to GCC's zero-length array extension.  */
--		itype = build_range_type (sizetype, size_zero_node, NULL_TREE);
-+		if (flexible_array_member || array_parm_vla_unspec_p)
-+		  itype = build_range_type (sizetype, size_zero_node,
-+					    NULL_TREE);
- 	      }
- 	    else if (decl_context == PARM)
- 	      {
-@@ -5362,6 +5370,8 @@
- 	    error ("redefinition of %<union %E%>", name);
- 	  else
- 	    error ("redefinition of %<struct %E%>", name);
-+	  /* Don't create structures using a name already in use.  */
-+	  ref = NULL_TREE;
- 	}
-       else if (C_TYPE_BEING_DEFINED (ref))
- 	{
-diff -Naur gcc-4.3.3.orig/gcc/ChangeLog gcc-4.3.3/gcc/ChangeLog
---- gcc-4.3.3.orig/gcc/ChangeLog	2009-01-24 02:16:13.000000000 -0800
-+++ gcc-4.3.3/gcc/ChangeLog	2009-03-17 06:11:58.563094000 -0700
-@@ -1,3 +1,341 @@
-+2009-03-17  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-03-17  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR target/39477
-+	* doc/extend.texi: Correct register behavior for regparm on
-+	Intel 386.
-+
-+2009-03-12  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-03-12  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR target/39327
-+	* config/i386/sse.md (sse3_addsubv4sf3): Correct item bits.
-+	(sse3_addsubv2df3): Likewise.
-+
-+2009-03-09  Denis Chertykov  <denisc@overta.ru>
-+
-+	* config/avr/avr.md ("andsi3"): Fix wrong cc attribute.
-+
-+2009-03-02  Richard Sandiford  <rdsandiford@googlemail.com>
-+
-+	* config/mips/mips.c (mips_mdebug_abi_name): Fix the handling
-+	of ABI_64.
-+
-+2009-03-02  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
-+
-+	* config/spu/spu.c (TARGET_SECTION_TYPE_FLAGS): Define.
-+	(spu_section_type_flags): New function.
-+
-+2009-02-28  Martin Jambor  <mjambor@suse.cz>
-+
-+	Backport from mainline:
-+	2008-12-02  Martin Jambor  <mjambor@suse.cz>
-+	
-+	PR middle-end/37861
-+	* tree-ssa-forwprop.c 
-+	(forward_propagate_addr_into_variable_array_index): Check that the
-+	offset is not computed from a MULT_EXPR if element size is one.
-+
-+2009-02-28  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-02-26  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* config/alpha/alpha.h (alpha_expand_mov): Return false if
-+	force_const_mem returns NULL_RTX.
-+
-+2009-02-26  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-02-02  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR inline-asm/39058
-+	* recog.h (asm_operand_ok): Add constraints argument.
-+	* recog.c (asm_operand_ok): Likewise.  If it is set, for digits
-+	recurse on matching constraint.
-+	(check_asm_operands): Pass constraints as 3rd argument to
-+	asm_operand_ok.  Don't look up matching constraint here.
-+	* stmt.c (expand_asm_operands): Pass NULL as 3rd argument
-+	to asm_operand_ok.
-+
-+2009-02-25  Janis Johnson  <janis187@us.ibm.com>
-+
-+	Backport from mainline:
-+	2008-10-29  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR middle-end/36578
-+	* convert.c (convert_to_real): Do not optimize conversions of
-+	binary arithmetic operations between binary and decimal
-+	floating-point types.  Consider mode of target type in determining
-+	decimal type for arithmetic.  Unless
-+	flag_unsafe_math_optimizations, do not optimize binary conversions
-+	where this may change rounding behavior.
-+	* real.c (real_can_shorten_arithmetic): New.
-+	* real.h (real_can_shorten_arithmetic): Declare.
-+
-+2009-02-21  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-02-20  Jaka Mocnik  <jaka@xlab.si>
-+
-+	* calls.c (emit_library_call_value_1): Use slot_offset instead of
-+	offset when calculating bounds for indexing stack_usage_map.  Fixes
-+	a buffer overflow with certain target setups.
-+
-+2009-02-20  Steve Ellcey  <sje@cup.hp.com>
-+
-+	PR target/38056
-+	* config/ia64/ia64.c (ia64_function_ok_for_sibcall): Check
-+	TARGET_CONST_GP.
-+
-+2009-02-19  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/39228
-+	* config/i386/i386.md (isinfxf2): Split from isinf<mode>2.
-+	(UNSPEC_FXAM_MEM): New unspec.
-+	(fxam<mode>2_i387_with_temp): New insn and split pattern.
-+	(isinf<mode>2): Use MODEF mode iterator.  Force operand[1] through
-+	memory using fxam<mode>2_i387_with_temp to remove excess precision.
-+
-+2009-02-17  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* config/soft-fp/double.h: Update from glibc CVS.
-+
-+2009-02-17  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35446
-+	* c-parser.c (c_parser_braced_init): Call pop_init_level when
-+	skipping until next close brace.
-+
-+2009-02-13  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35444
-+	* c-parser.c (c_parser_parms_list_declarator): Discard pending
-+	sizes on syntax error after some arguments have been parsed.
-+
-+2009-02-11  Uros Bizjak  <ubizjak@gmail.com>
-+	    Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR target/39118
-+	* config/i386/i386.md (UNSPEC_MEMORY_BLOCKAGE): New constant.
-+	(memory_blockage): New expander.
-+	(*memory_blockage): New insn pattern.
-+	* config/i386/i386.c (ix86_expand_prologue): Use memory_blockage
-+	instead of general blockage at the end of function prologue when
-+	frame pointer is used to access red zone area.  Do not emit blockage
-+	when profiling, it is emitted in generic code.
-+	(ix86_expand_epilogue): Emit memory_blockage at the beginning of
-+	function epilogue when frame pointer is used to access red zone area.
-+
-+2009-02-10  Steve Ellcey  <sje@cup.hp.com>
-+
-+	PR c/39084
-+	* c-decl.c (start_struct): Return NULL on error.
-+
-+2009-02-10  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/39118
-+	* config/i386/i386.c (expand_prologue): Emit blockage at the end
-+	of function prologue when frame pointer is used to access
-+	red zone area.
-+
-+2009-02-09  Janis Johnson  <janis187@us.ibm.com>
-+
-+	PR c/39035
-+	* real.c (do_compare): Special-case compare of zero against
-+	decimal float value.
-+
-+2009-02-08  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35434
-+	* c-common.c (handle_alias_attribute): Disallow attribute for
-+	anything not a FUNCTION_DECL or VAR_DECL.
-+
-+2009-02-08  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/36432
-+	* c-decl.c (grokdeclarator): Don't treat [] declarators in fields
-+	as indicating flexible array members unless the field itself is
-+	being declarared as the incomplete array.
-+
-+2009-02-07  Kaz Kojima  <kkojima@gcc.gnu.org>
-+
-+	Backport from mainline:
-+	2009-02-05  Kaz Kojima  <kkojima@gcc.gnu.org>
-+
-+	PR target/38991
-+	* config/sh/predicates.md (general_movsrc_operand): Don't check
-+	the subreg of system registers here.
-+
-+2009-02-05  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35435
-+	* c-common.c (handle_tls_model_attribute): Ignore attribute for
-+	non-VAR_DECLs without checking DECL_THREAD_LOCAL_P.
-+
-+2009-02-05  Richard Guenther  <rguenther@suse.de>
-+
-+	Backport from mainline
-+	2009-02-05  Daniel Berlin  <dberlin@dberlin.org>
-+		    Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/39100
-+	* tree-ssa-structalias.c (do_ds_constraint): Actually do what the
-+	comment says and add edges.
-+
-+2009-02-04  Ramana Radhakrishnan  <ramana.r@gmail.com>
-+
-+	PR rtl-optimization/39076
-+	Backport from mainline:
-+	2008-06-28  Andrew Jenner  <andrew@codesourcery.com>
-+	
-+	* regrename.c (build_def_use): Don't copy RTX.
-+
-+2009-02-04  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35433
-+	* c-typeck.c (composite_type): Set TYPE_SIZE and TYPE_SIZE_UNIT
-+	for composite type involving a zero-length array type.
-+
-+2009-02-02  Catherine Moore  <clm@codesourcery.com>
-+
-+	* sde.h (SUBTARGET_ARM_SPEC): Don't assemble -fpic code as
-+	-mabicalls.
-+
-+2009-01-31  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	* config/pa/fptr.c: Revert license to GPL 2.
-+	* config/pa/milli64.S: Likewise.
-+
-+2009-01-30  Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/39041
-+	* tree-ssa-forwprop.c (forward_propagate_addr_expr_1):
-+	Propagate variable indices only if the types match for this stmt.
-+
-+2009-01-29  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-01-28  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/38988
-+	* config/i386/i386.md (set_rip_rex64): Wrap operand 1 in label_ref.
-+	(set_got_offset_rex64): Ditto.
-+
-+	2009-01-27  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR middle-end/38969
-+	* calls.c (initialize_argument_information): Do not wrap complex
-+	arguments in SAVE_EXPR.
-+
-+2009-01-27  Steve Ellcey  <sje@cup.hp.com>
-+
-+	PR middle-end/38615
-+	* gimplify.c (gimplify_init_constructor): Fix promotion of const
-+	variables to static.
-+	* doc/invoke.texi (-fmerge-all-constants): Update description.
-+
-+2009-01-27  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-01-13  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* config/alpha/alpha.c (alpha_legitimate_address_p): Explicit
-+	relocations of local symbols wider than UNITS_PER_WORD are not valid.
-+	(alpha_legitimize_address): Do not split local symbols wider than
-+	UNITS_PER_WORD into HIGH/LO_SUM parts.
-+
-+	2009-01-07  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/38706
-+	* config/alpha/alpha.c (alpha_end_function): For TARGET_ABI_OSF, call
-+	free_after_compilation when outputting a thunk.
-+	(alpha_output_mi_thunk_osf): Assert that we are processing a thunk.
-+	Do not call free_after_compilation here.
-+
-+	2008-12-22  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* config/alpha/elf.h (ASM_OUTPUT_EXTERNAL): New macro.
-+
-+	2008-12-21  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* config/alpha/alpha.c (alpha_pad_noreturn): New static function.
-+	(alpha_reorg): Call alpha_pad_noreturn.
-+
-+	2008-12-08  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* config/alpha/alpha.c (alpha_set_memflags): Process memory
-+	references in full insn sequence.
-+
-+	2008-12-05  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* config/alpha/alpha.c (alpha_fold_vector_minmax): Create
-+	VIEW_CONVERT_EXPR to convert output to long_integer_type_node.
-+
-+	(alpha_emit_conditional_branch): Do not generate direct branch
-+	for UNORDERED comparisons.
-+
-+2008-01-26  Paolo Bonzini  <bonzini@gnu.org>
-+
-+	PR tree-optimization/38932
-+	* fold-const.c (fold_unary_ignore_overflow): New.
-+	* tree.h (fold_unary_ignore_overflow): Declare.
-+	* tree-ssa-ccp.c (ccp_fold): Use fold_unary_ignore_overflow.
-+	* tree-ssa-sccvn.c (simplify_unary_expression): Likewise.
-+
-+2009-01-25  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-01-22  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/38931
-+	* config/i386/i386.md (*movsi_1): Use type "mmx" for alternative 2.
-+	(*movdi_1_rex64): Use type "mmx" for alternative 5.
-+
-+	2009-01-21  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR rtl-optimization/38879
-+	* alias.c (base_alias_check): Unaligned access via AND address can
-+	alias all surrounding object types except those with sizes equal
-+	or wider than the size of unaligned access.
-+
-+2009-01-25  Richard Guenther  <rguenther@suse.de>
-+
-+	Backport from mainline:
-+	2008-12-02  Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/38359
-+	* fold-const.c (fold_binary): Fold -1 >> x to -1 only for
-+	non-negative x.
-+
-+2009-01-24  Eric Botcazou  <ebotcazou@adacore.com>
-+
-+	* config/sparc/linux.h (DBX_REGISTER_NUMBER): Delete.
-+	* config/sparc/linux64.h (DBX_REGISTER_NUMBER): Likewise.
-+	* config/sparc/sysv4.h (DBX_REGISTER_NUMBER): Likewise.
-+
-+2009-01-24  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR target/38902
-+	Backport from mainline:
-+	2008-12-23  Jakub Jelinek  <jakub@redhat.com>
-+
-+	* config/i386/i386.c (expand_movmem_via_rep_mov): Set MEM_SIZE
-+	correctly.
-+	(expand_setmem_via_rep_stos): Add ORIG_VALUE argument.  If
-+	ORIG_VALUE is const0_rtx and COUNT is constant, set MEM_SIZE
-+	on DESTMEM.
-+	(ix86_expand_setmem): Adjust callers.
-+
-+2008-01-24  Richard Guenther  <rguenther@suse.de>
-+
-+	* BASE-VER: Set to 4.3.4.
-+	* DEV-PHASE: Set to prerelease.
-+
- 2009-01-24  Release Manager
- 
- 	* GCC 4.3.3 released.
-@@ -5,8 +343,7 @@
- 2009-01-20  Joseph Myers  <joseph@codesourcery.com>
- 
- 	PR other/38758
--	* longlong.h: Update copyright years.  Use soft-fp license
--	notice.
-+	* longlong.h: Update copyright years.  Use soft-fp license notice.
- 
- 2009-01-19  Richard Guenther  <rguenther@suse.de>
- 
-@@ -41,7 +378,8 @@
- 	
- 2009-01-11  Matthias Klose  <doko@ubuntu.com>
- 
--	PR middle-end/38616, backport from mainline:
-+	PR middle-end/38616
-+	Backport from mainline:
- 	2008-05-04  Uros Bizjak  <ubizjak@gmail.com>
- 
- 	* config/i386/i386.md (*strmovsi_1): Simplify asm alternatives.
-@@ -509,8 +847,8 @@
- 	PR tree-optimization/37102
- 	* tree-outof-ssa.c (remove_gimple_phi_args): Remove all the PHI args  
- 	from a node. Check to see if another PHI is dead.
--	(eliminate_useless_phis): Rename from eliminate_virtual_phis and remove
--	real PHIs which have no uses.
-+	(eliminate_useless_phis): Rename from eliminate_virtual_phis and
-+	remove real PHIs which have no uses.
- 	(rewrite_out_of_ssa): Call eliminate_useless_phis.
- 
- 2008-10-08  Simon Martin  <simartin@users.sourceforge.net>
-@@ -986,8 +1324,10 @@
- 
- 	(MFC_MIN_DMA_LIST_ELEMENTS): New define.
- 	(MFC_MAX_DMA_LIST_ELEMENTS): Likewise.
--	(MFC_MIN_DMA_LIST_SIZE): Redefine in terms of MFC_MIN_DMA_LIST_ELEMENTS.
--	(MFC_MAX_DMA_LIST_SIZE): Redefine in terms of MFC_MAX_DMA_LIST_ELEMENTS.
-+	(MFC_MIN_DMA_LIST_SIZE): Redefine in terms of
-+	MFC_MIN_DMA_LIST_ELEMENTS.
-+	(MFC_MAX_DMA_LIST_SIZE): Redefine in terms of
-+	MFC_MAX_DMA_LIST_ELEMENTS.
- 
- 	(MFC_START_ENABLE): Remove PPU-only define.
- 	(MFC_PUTS_CMD, MFC_PUTFS_CMD, MFC_PUTBS_CMD): Likewise.
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/alpha.c gcc-4.3.3/gcc/config/alpha/alpha.c
---- gcc-4.3.3.orig/gcc/config/alpha/alpha.c	2008-09-08 16:16:55.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/alpha.c	2009-02-28 09:22:52.585822000 -0800
-@@ -1,6 +1,7 @@
- /* Subroutines used for code generation on the DEC Alpha.
-    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+   Free Software Foundation, Inc.
-    Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
- 
- This file is part of GCC.
-@@ -863,9 +864,11 @@
- 	}
-     }
- 
--  /* If we're managing explicit relocations, LO_SUM is valid, as
--     are small data symbols.  */
--  else if (TARGET_EXPLICIT_RELOCS)
-+  /* If we're managing explicit relocations, LO_SUM is valid, as are small
-+     data symbols.  Avoid explicit relocations in modes larger than word
-+     mode since i.e. $LC0+8($1) can fold around +/- 32k offset.  */
-+  else if (TARGET_EXPLICIT_RELOCS
-+	   && GET_MODE_SIZE (mode) <= UNITS_PER_WORD)
-     {
-       if (small_symbolic_operand (x, Pmode))
- 	return true;
-@@ -915,8 +918,7 @@
-    to be legitimate.  If we find one, return the new, valid address.  */
- 
- rtx
--alpha_legitimize_address (rtx x, rtx scratch,
--			  enum machine_mode mode ATTRIBUTE_UNUSED)
-+alpha_legitimize_address (rtx x, rtx scratch, enum machine_mode mode)
- {
-   HOST_WIDE_INT addend;
- 
-@@ -964,8 +966,12 @@
-       goto split_addend;
-     }
- 
--  /* If this is a local symbol, split the address into HIGH/LO_SUM parts.  */
--  if (TARGET_EXPLICIT_RELOCS && symbolic_operand (x, Pmode))
-+  /* If this is a local symbol, split the address into HIGH/LO_SUM parts.
-+     Avoid modes larger than word mode since i.e. $LC0+8($1) can fold
-+     around +/- 32k offset.  */
-+  if (TARGET_EXPLICIT_RELOCS
-+      && GET_MODE_SIZE (mode) <= UNITS_PER_WORD
-+      && symbolic_operand (x, Pmode))
-     {
-       rtx r0, r16, eqv, tga, tp, insn, dest, seq;
- 
-@@ -1602,18 +1608,17 @@
-   return -1;
- }
- 
--/* Given INSN, which is an INSN list or the PATTERN of a single insn
--   generated to perform a memory operation, look for any MEMs in either
-+/* Given SEQ, which is an INSN list, look for any MEMs in either
-    a SET_DEST or a SET_SRC and copy the in-struct, unchanging, and
-    volatile flags from REF into each of the MEMs found.  If REF is not
-    a MEM, don't do anything.  */
- 
- void
--alpha_set_memflags (rtx insn, rtx ref)
-+alpha_set_memflags (rtx seq, rtx ref)
- {
--  rtx *base_ptr;
-+  rtx insn;
- 
--  if (GET_CODE (ref) != MEM)
-+  if (!MEM_P (ref))
-     return;
- 
-   /* This is only called from alpha.md, after having had something
-@@ -1626,11 +1631,11 @@
-       && !MEM_READONLY_P (ref))
-     return;
- 
--  if (INSN_P (insn))
--    base_ptr = &PATTERN (insn);
--  else
--    base_ptr = &insn;
--  for_each_rtx (base_ptr, alpha_set_memflags_1, (void *) ref);
-+  for (insn = seq; insn; insn = NEXT_INSN (insn))
-+    if (INSN_P (insn))
-+      for_each_rtx (&PATTERN (insn), alpha_set_memflags_1, (void *) ref);
-+    else
-+      gcc_unreachable ();
- }
- 
-
- static rtx alpha_emit_set_const (rtx, enum machine_mode, HOST_WIDE_INT,
-@@ -2118,6 +2123,8 @@
- bool
- alpha_expand_mov (enum machine_mode mode, rtx *operands)
- {
-+  rtx tmp;
-+
-   /* If the output is not a register, the input must be.  */
-   if (GET_CODE (operands[0]) == MEM
-       && ! reg_or_0_operand (operands[1], mode))
-@@ -2126,8 +2133,6 @@
-   /* Allow legitimize_address to perform some simplifications.  */
-   if (mode == Pmode && symbolic_operand (operands[1], mode))
-     {
--      rtx tmp;
--
-       tmp = alpha_legitimize_address (operands[1], operands[0], mode);
-       if (tmp)
- 	{
-@@ -2152,14 +2157,18 @@
-     }
- 
-   /* Otherwise we've nothing left but to drop the thing to memory.  */
--  operands[1] = force_const_mem (mode, operands[1]);
-+  tmp = force_const_mem (mode, operands[1]);
-+
-+  if (tmp == NULL_RTX)
-+    return false;
-+
-   if (reload_in_progress)
-     {
--      emit_move_insn (operands[0], XEXP (operands[1], 0));
--      operands[1] = replace_equiv_address (operands[1], operands[0]);
-+      emit_move_insn (operands[0], XEXP (tmp, 0));
-+      operands[1] = replace_equiv_address (tmp, operands[0]);
-     }
-   else
--    operands[1] = validize_mem (operands[1]);
-+    operands[1] = validize_mem (tmp);
-   return false;
- }
- 
-@@ -2452,7 +2461,7 @@
-   if (alpha_compare.fp_p)
-     {
-       cmp_mode = DFmode;
--      if (flag_unsafe_math_optimizations)
-+      if (flag_unsafe_math_optimizations && cmp_code != UNORDERED)
- 	{
- 	  /* When we are not as concerned about non-finite values, and we
- 	     are comparing against zero, we can branch directly.  */
-@@ -6794,7 +6803,7 @@
-   tree op0 = fold_convert (vtype, op[0]);
-   tree op1 = fold_convert (vtype, op[1]);
-   tree val = fold_build2 (code, vtype, op0, op1);
--  return fold_convert (long_integer_type_node, val);
-+  return fold_build1 (VIEW_CONVERT_EXPR, long_integer_type_node, val);
- }
- 
- static tree
-@@ -8242,6 +8251,11 @@
-   if (GET_CODE (insn) == CALL_INSN)
-     output_asm_insn (get_insn_template (CODE_FOR_nop, NULL), NULL);
- 
-+#if TARGET_ABI_OSF
-+  if (current_function_is_thunk)
-+    free_after_compilation (cfun);
-+#endif
-+
- #if TARGET_ABI_OPEN_VMS
-   alpha_write_linkage (file, fnname, decl);
- #endif
-@@ -8281,6 +8295,8 @@
-   HOST_WIDE_INT hi, lo;
-   rtx this, insn, funexp;
- 
-+  gcc_assert (current_function_is_thunk);
-+
-   /* We always require a valid GP.  */
-   emit_insn (gen_prologue_ldgp ());
-   emit_note (NOTE_INSN_PROLOGUE_END);
-@@ -9268,12 +9284,68 @@
-       i = next;
-     }
- }
-+
-+/* Insert an unop between a noreturn function call and GP load.  */
-+
-+static void
-+alpha_pad_noreturn (void)
-+{
-+  rtx insn, next;
-+
-+  for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
-+    {
-+      rtx pat;
-+
-+      if (!CALL_P (insn)
-+	  || !find_reg_note (insn, REG_NORETURN, NULL_RTX))
-+        continue;
-+
-+      next = next_active_insn (insn);
-+
-+      if (next)
-+	{
-+	  pat = PATTERN (next);
-+
-+	  if (GET_CODE (pat) == SET
-+	      && GET_CODE (SET_SRC (pat)) == UNSPEC_VOLATILE
-+	      && XINT (SET_SRC (pat), 1) == UNSPECV_LDGP1)
-+	    emit_insn_after (gen_unop (), insn);
-+	}
-+    }
-+}
- 
-
- /* Machine dependent reorg pass.  */
- 
- static void
- alpha_reorg (void)
- {
-+  /* Workaround for a linker error that triggers when an
-+     exception handler immediatelly follows a noreturn function.
-+
-+     The instruction stream from an object file:
-+
-+  54:   00 40 5b 6b     jsr     ra,(t12),58 <__func+0x58>
-+  58:   00 00 ba 27     ldah    gp,0(ra)
-+  5c:   00 00 bd 23     lda     gp,0(gp)
-+  60:   00 00 7d a7     ldq     t12,0(gp)
-+  64:   00 40 5b 6b     jsr     ra,(t12),68 <__func+0x68>
-+
-+     was converted in the final link pass to:
-+
-+   fdb24:       a0 03 40 d3     bsr     ra,fe9a8 <_called_func+0x8>
-+   fdb28:       00 00 fe 2f     unop
-+   fdb2c:       00 00 fe 2f     unop
-+   fdb30:       30 82 7d a7     ldq     t12,-32208(gp)
-+   fdb34:       00 40 5b 6b     jsr     ra,(t12),fdb38 <__func+0x68>
-+
-+     GP load instructions were wrongly cleared by the linker relaxation
-+     pass.  This workaround prevents removal of GP loads by inserting
-+     an unop instruction between a noreturn function call and
-+     exception handler prologue.  */
-+
-+  if (current_function_has_exception_handlers ())
-+    alpha_pad_noreturn ();
-+
-   if (alpha_tp != ALPHA_TP_PROG || flag_exceptions)
-     alpha_handle_trap_shadows ();
- 
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/elf.h gcc-4.3.3/gcc/config/alpha/elf.h
---- gcc-4.3.3.orig/gcc/config/alpha/elf.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/elf.h	2009-01-27 03:39:42.241832000 -0800
-@@ -423,3 +423,13 @@
- #if defined(HAVE_LD_EH_FRAME_HDR)
- #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
- #endif
-+
-+/* A C statement (sans semicolon) to output to the stdio stream STREAM
-+   any text necessary for declaring the name of an external symbol
-+   named NAME which is referenced in this compilation but not defined.
-+   It is needed to properly support non-default visibility.  */
-+
-+#ifndef ASM_OUTPUT_EXTERNAL
-+#define ASM_OUTPUT_EXTERNAL(FILE, DECL, NAME) \
-+  default_elf_asm_output_external (FILE, DECL, NAME)
-+#endif
-diff -Naur gcc-4.3.3.orig/gcc/config/avr/avr.md gcc-4.3.3/gcc/config/avr/avr.md
---- gcc-4.3.3.orig/gcc/config/avr/avr.md	2008-09-12 10:29:38.000000000 -0700
-+++ gcc-4.3.3/gcc/config/avr/avr.md	2009-03-09 13:49:28.992696000 -0700
-@@ -1,8 +1,8 @@
- ;; -*- Mode: Scheme -*-
- ;;   Machine description for GNU compiler,
- ;;   for ATMEL AVR micro controllers.
--;;   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008
--;;   Free Software Foundation, Inc.
-+;;   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008,
-+;;   2009 Free Software Foundation, Inc.
- ;;   Contributed by Denis Chertykov (denisc@overta.ru)
- 
- ;; This file is part of GCC.
-@@ -1180,7 +1180,7 @@
-   return \"bug\";
- }"
-   [(set_attr "length" "4,4")
--   (set_attr "cc" "set_n,set_n")])
-+   (set_attr "cc" "set_n,clobber")])
- 
- ;;|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- ;; ior
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/i386.c gcc-4.3.3/gcc/config/i386/i386.c
---- gcc-4.3.3.orig/gcc/config/i386/i386.c	2008-08-28 06:31:33.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/i386.c	2009-02-11 03:53:47.721500000 -0800
-@@ -6483,14 +6483,21 @@
-         insn = emit_insn (gen_set_got (pic_offset_table_rtx));
-     }
- 
--  /* Prevent function calls from being scheduled before the call to mcount.
--     In the pic_reg_used case, make sure that the got load isn't deleted.  */
--  if (current_function_profile)
--    {
--      if (pic_reg_used)
--	emit_insn (gen_prologue_use (pic_offset_table_rtx));
--      emit_insn (gen_blockage ());
--    }
-+  /* In the pic_reg_used case, make sure that the got load isn't deleted
-+     when mcount needs it.  Blockage to avoid call movement across mcount
-+     call is emitted in generic code after the NOTE_INSN_PROLOGUE_END
-+     note.  */
-+  if (current_function_profile && pic_reg_used)
-+    emit_insn (gen_prologue_use (pic_offset_table_rtx));
-+
-+  /* Prevent instructions from being scheduled into register save push
-+     sequence when access to the redzone area is done through frame pointer.
-+     The offset betweeh the frame pointer and the stack pointer is calculated
-+     relative to the value of the stack pointer at the end of the function
-+     prologue, and moving instructions that access redzone area via frame
-+     pointer inside push sequence violates this assumption.  */
-+  if (frame_pointer_needed && frame.red_zone_size)
-+    emit_insn (gen_memory_blockage ());
- 
-   /* Emit cld instruction if stringops are used in the function.  */
-   if (TARGET_CLD && ix86_current_function_needs_cld)
-@@ -6539,6 +6546,11 @@
- 
-   ix86_compute_frame_layout (&frame);
- 
-+  /* See the comment about red zone and frame
-+     pointer usage in ix86_expand_prologue.  */
-+  if (frame_pointer_needed && frame.red_zone_size)
-+    emit_insn (gen_memory_blockage ()); 
-+
-   /* Calculate start of saved registers relative to ebp.  Special care
-      must be taken for the normal return case of a function using
-      eh_return: the eax and edx registers are marked as saved, but not
-@@ -14773,6 +14785,22 @@
-       destexp = gen_rtx_PLUS (Pmode, destptr, countreg);
-       srcexp = gen_rtx_PLUS (Pmode, srcptr, countreg);
-     }
-+  if (CONST_INT_P (count))
-+    {
-+      count = GEN_INT (INTVAL (count)
-+		       & ~((HOST_WIDE_INT) GET_MODE_SIZE (mode) - 1));
-+      destmem = shallow_copy_rtx (destmem);
-+      srcmem = shallow_copy_rtx (srcmem);
-+      set_mem_size (destmem, count);
-+      set_mem_size (srcmem, count);
-+    }
-+  else
-+    {
-+      if (MEM_SIZE (destmem))
-+	set_mem_size (destmem, NULL_RTX);
-+      if (MEM_SIZE (srcmem))
-+	set_mem_size (srcmem, NULL_RTX);
-+    }
-   emit_insn (gen_rep_mov (destptr, destmem, srcptr, srcmem, countreg,
- 			  destexp, srcexp));
- }
-@@ -14781,8 +14809,8 @@
-    Arguments have same meaning as for previous function */
- static void
- expand_setmem_via_rep_stos (rtx destmem, rtx destptr, rtx value,
--			    rtx count,
--			    enum machine_mode mode)
-+			    rtx count, enum machine_mode mode,
-+			    rtx orig_value)
- {
-   rtx destexp;
-   rtx countreg;
-@@ -14799,6 +14827,15 @@
-     }
-   else
-     destexp = gen_rtx_PLUS (Pmode, destptr, countreg);
-+  if (orig_value == const0_rtx && CONST_INT_P (count))
-+    {
-+      count = GEN_INT (INTVAL (count)
-+		       & ~((HOST_WIDE_INT) GET_MODE_SIZE (mode) - 1));
-+      destmem = shallow_copy_rtx (destmem);
-+      set_mem_size (destmem, count);
-+    }
-+  else if (MEM_SIZE (destmem))
-+    set_mem_size (destmem, NULL_RTX);
-   emit_insn (gen_rep_stos (destptr, countreg, destmem, value, destexp));
- }
- 
-@@ -15871,15 +15908,15 @@
-       break;
-     case rep_prefix_8_byte:
-       expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp,
--				  DImode);
-+				  DImode, val_exp);
-       break;
-     case rep_prefix_4_byte:
-       expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp,
--				  SImode);
-+				  SImode, val_exp);
-       break;
-     case rep_prefix_1_byte:
-       expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp,
--				  QImode);
-+				  QImode, val_exp);
-       break;
-     }
-   /* Adjust properly the offset of src and dest memory for aliasing.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/i386.md gcc-4.3.3/gcc/config/i386/i386.md
---- gcc-4.3.3.orig/gcc/config/i386/i386.md	2009-01-11 09:29:23.000000000 -0800
-+++ gcc-4.3.3/gcc/config/i386/i386.md	2009-02-19 04:44:40.878358000 -0800
-@@ -67,12 +67,13 @@
-    (UNSPEC_DEF_CFA		15)
-    (UNSPEC_SET_RIP		16)
-    (UNSPEC_SET_GOT_OFFSET	17)
-+   (UNSPEC_MEMORY_BLOCKAGE	18)
- 
-    ; TLS support
--   (UNSPEC_TP			18)
--   (UNSPEC_TLS_GD		19)
--   (UNSPEC_TLS_LD_BASE		20)
--   (UNSPEC_TLSDESC		21)
-+   (UNSPEC_TP			20)
-+   (UNSPEC_TLS_GD		21)
-+   (UNSPEC_TLS_LD_BASE		22)
-+   (UNSPEC_TLSDESC		23)
- 
-    ; Other random patterns
-    (UNSPEC_SCAS			30)
-@@ -144,6 +145,7 @@
-    (UNSPEC_FPREM1_U		91)
- 
-    (UNSPEC_C2_FLAG		95)
-+   (UNSPEC_FXAM_MEM		96)
- 
-    ; SSP patterns
-    (UNSPEC_SP_SET		100)
-@@ -1397,7 +1399,7 @@
- 	  gcc_unreachable ();
- 	}
- 
--    case TYPE_MMXADD:
-+    case TYPE_MMX:
-       return "pxor\t%0, %0";
- 
-     case TYPE_MMXMOV:
-@@ -1415,7 +1417,7 @@
- }
-   [(set (attr "type")
-      (cond [(eq_attr "alternative" "2")
--	      (const_string "mmxadd")
-+	      (const_string "mmx")
- 	    (eq_attr "alternative" "3,4,5")
- 	      (const_string "mmxmov")
- 	    (eq_attr "alternative" "6")
-@@ -2231,7 +2233,7 @@
-       return "movq\t{%1, %0|%0, %1}";
- 
-     case TYPE_SSELOG1:
--    case TYPE_MMXADD:
-+    case TYPE_MMX:
-       return "pxor\t%0, %0";
- 
-     case TYPE_MULTI:
-@@ -2252,7 +2254,7 @@
- }
-   [(set (attr "type")
-      (cond [(eq_attr "alternative" "5")
--	      (const_string "mmxadd")
-+	      (const_string "mmx")
- 	    (eq_attr "alternative" "6,7,8,9,10")
- 	      (const_string "mmxmov")
- 	    (eq_attr "alternative" "11")
-@@ -14877,6 +14879,24 @@
-   ""
-   [(set_attr "length" "0")])
- 
-+;; Do not schedule instructions accessing memory across this point.
-+
-+(define_expand "memory_blockage"
-+  [(set (match_dup 0)
-+	(unspec:BLK [(match_dup 0)] UNSPEC_MEMORY_BLOCKAGE))]
-+  ""
-+{
-+  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
-+  MEM_VOLATILE_P (operands[0]) = 1;
-+})
-+
-+(define_insn "*memory_blockage"
-+  [(set (match_operand:BLK 0 "" "")
-+	(unspec:BLK [(match_dup 0)] UNSPEC_MEMORY_BLOCKAGE))]
-+  ""
-+  ""
-+  [(set_attr "length" "0")])
-+
- ;; As USE insns aren't meaningful after reload, this is used instead
- ;; to prevent deleting instructions setting registers for PIC code
- (define_insn "prologue_use"
-@@ -15001,7 +15021,7 @@
- 
- (define_insn "set_rip_rex64"
-   [(set (match_operand:DI 0 "register_operand" "=r")
--	(unspec:DI [(match_operand:DI 1 "" "")] UNSPEC_SET_RIP))]
-+	(unspec:DI [(label_ref (match_operand 1 "" ""))] UNSPEC_SET_RIP))]
-   "TARGET_64BIT"
-   "lea{q}\t{%l1(%%rip), %0|%0, %l1[rip]}"
-   [(set_attr "type" "lea")
-@@ -15009,7 +15029,9 @@
- 
- (define_insn "set_got_offset_rex64"
-   [(set (match_operand:DI 0 "register_operand" "=r")
--	(unspec:DI [(match_operand:DI 1 "" "")] UNSPEC_SET_GOT_OFFSET))]
-+	(unspec:DI
-+	  [(label_ref (match_operand 1 "" ""))]
-+	  UNSPEC_SET_GOT_OFFSET))]
-   "TARGET_64BIT"
-   "movabs{q}\t{$_GLOBAL_OFFSET_TABLE_-%l1, %0|%0, OFFSET FLAT:_GLOBAL_OFFSET_TABLE_-%l1}"
-   [(set_attr "type" "imov")
-@@ -18472,9 +18494,56 @@
-    (set_attr "unit" "i387")
-    (set_attr "mode" "<MODE>")])
- 
-+(define_insn_and_split "fxam<mode>2_i387_with_temp"
-+  [(set (match_operand:HI 0 "register_operand" "")
-+	(unspec:HI
-+	  [(match_operand:MODEF 1 "memory_operand" "")]
-+	  UNSPEC_FXAM_MEM))]
-+  "TARGET_USE_FANCY_MATH_387
-+   && !(reload_completed || reload_in_progress)"
-+  "#"
-+  "&& 1"
-+  [(set (match_dup 2)(match_dup 1))
-+   (set (match_dup 0)
-+	(unspec:HI [(match_dup 2)] UNSPEC_FXAM))]
-+{
-+  operands[2] = gen_reg_rtx (<MODE>mode);
-+
-+  MEM_VOLATILE_P (operands[1]) = 1;
-+}
-+  [(set_attr "type" "multi")
-+   (set_attr "unit" "i387")
-+   (set_attr "mode" "<MODE>")])
-+
-+(define_expand "isinfxf2"
-+  [(use (match_operand:SI 0 "register_operand" ""))
-+   (use (match_operand:XF 1 "register_operand" ""))]
-+  "TARGET_USE_FANCY_MATH_387
-+   && TARGET_C99_FUNCTIONS"
-+{
-+  rtx mask = GEN_INT (0x45);
-+  rtx val = GEN_INT (0x05);
-+
-+  rtx cond;
-+
-+  rtx scratch = gen_reg_rtx (HImode);
-+  rtx res = gen_reg_rtx (QImode);
-+
-+  emit_insn (gen_fxamxf2_i387 (scratch, operands[1]));
-+
-+  emit_insn (gen_andqi_ext_0 (scratch, scratch, mask));
-+  emit_insn (gen_cmpqi_ext_3 (scratch, val));
-+  cond = gen_rtx_fmt_ee (EQ, QImode,
-+			 gen_rtx_REG (CCmode, FLAGS_REG),
-+			 const0_rtx);
-+  emit_insn (gen_rtx_SET (VOIDmode, res, cond));
-+  emit_insn (gen_zero_extendqisi2 (operands[0], res));
-+  DONE;
-+})
-+
- (define_expand "isinf<mode>2"
-   [(use (match_operand:SI 0 "register_operand" ""))
--   (use (match_operand:X87MODEF 1 "register_operand" ""))]
-+   (use (match_operand:MODEF 1 "nonimmediate_operand" ""))]
-   "TARGET_USE_FANCY_MATH_387
-    && TARGET_C99_FUNCTIONS
-    && !(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)"
-@@ -18487,7 +18556,18 @@
-   rtx scratch = gen_reg_rtx (HImode);
-   rtx res = gen_reg_rtx (QImode);
- 
--  emit_insn (gen_fxam<mode>2_i387 (scratch, operands[1]));
-+  /* Remove excess precision by forcing value through memory. */
-+  if (memory_operand (operands[1], VOIDmode))
-+    emit_insn (gen_fxam<mode>2_i387_with_temp (scratch, operands[1]));
-+  else
-+    {
-+      int slot = virtuals_instantiated ? SLOT_TEMP : SLOT_VIRTUAL;
-+      rtx temp = assign_386_stack_local (<MODE>mode, slot);
-+
-+      emit_move_insn (temp, operands[1]);
-+      emit_insn (gen_fxam<mode>2_i387_with_temp (scratch, temp));
-+    }
-+
-   emit_insn (gen_andqi_ext_0 (scratch, scratch, mask));
-   emit_insn (gen_cmpqi_ext_3 (scratch, val));
-   cond = gen_rtx_fmt_ee (EQ, QImode,
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/sse.md gcc-4.3.3/gcc/config/i386/sse.md
---- gcc-4.3.3.orig/gcc/config/i386/sse.md	2008-12-01 04:28:05.000000000 -0800
-+++ gcc-4.3.3/gcc/config/i386/sse.md	2009-03-12 10:50:02.974543000 -0700
-@@ -737,7 +737,7 @@
- 	    (match_operand:V4SF 1 "register_operand" "0")
- 	    (match_operand:V4SF 2 "nonimmediate_operand" "xm"))
- 	  (minus:V4SF (match_dup 1) (match_dup 2))
--	  (const_int 5)))]
-+	  (const_int 10)))]
-   "TARGET_SSE3"
-   "addsubps\t{%2, %0|%0, %2}"
-   [(set_attr "type" "sseadd")
-@@ -2381,7 +2381,7 @@
- 	    (match_operand:V2DF 1 "register_operand" "0")
- 	    (match_operand:V2DF 2 "nonimmediate_operand" "xm"))
- 	  (minus:V2DF (match_dup 1) (match_dup 2))
--	  (const_int 1)))]
-+	  (const_int 2)))]
-   "TARGET_SSE3"
-   "addsubpd\t{%2, %0|%0, %2}"
-   [(set_attr "type" "sseadd")
-diff -Naur gcc-4.3.3.orig/gcc/config/ia64/ia64.c gcc-4.3.3/gcc/config/ia64/ia64.c
---- gcc-4.3.3.orig/gcc/config/ia64/ia64.c	2008-07-01 13:59:19.000000000 -0700
-+++ gcc-4.3.3/gcc/config/ia64/ia64.c	2009-02-20 09:18:20.718912000 -0800
-@@ -4328,8 +4328,9 @@
-     return false;
- 
-   /* We must always return with our current GP.  This means we can
--     only sibcall to functions defined in the current module.  */
--  return decl && (*targetm.binds_local_p) (decl);
-+     only sibcall to functions defined in the current module unless
-+     TARGET_CONST_GP is set to true.  */
-+  return (decl && (*targetm.binds_local_p) (decl)) || TARGET_CONST_GP;
- }
- 
-
- 
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/mips.c gcc-4.3.3/gcc/config/mips/mips.c
---- gcc-4.3.3.orig/gcc/config/mips/mips.c	2008-07-12 01:00:46.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/mips.c	2009-03-02 12:42:24.177070000 -0800
-@@ -7080,7 +7080,7 @@
-     case ABI_N32:
-       return "abiN32";
-     case ABI_64:
--      return "abiN64";
-+      return "abi64";
-     case ABI_EABI:
-       return TARGET_64BIT ? "eabi64" : "eabi32";
-     default:
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/sde.h gcc-4.3.3/gcc/config/mips/sde.h
---- gcc-4.3.3.orig/gcc/config/mips/sde.h	2007-09-19 10:13:33.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/sde.h	2009-02-02 12:31:19.548659000 -0800
-@@ -56,7 +56,6 @@
- #undef SUBTARGET_ASM_SPEC
- #define SUBTARGET_ASM_SPEC "\
- %{!mips1:--trap} \
--%{fPIC|fpic|fPIE|fpie:%{!mips16*:-KPIC}} \
- %{mips16:-no-mips16}"
- 
- #undef LINK_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/pa/fptr.c gcc-4.3.3/gcc/config/pa/fptr.c
---- gcc-4.3.3.orig/gcc/config/pa/fptr.c	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/pa/fptr.c	2009-01-31 12:05:03.693395000 -0800
-@@ -6,7 +6,7 @@
- 
- GCC is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free
--Software Foundation; either version 3, or (at your option) any later
-+Software Foundation; either version 2, or (at your option) any later
- version.
- 
- In addition to the permissions in the GNU General Public License, the
-@@ -24,8 +24,9 @@
- for more details.
- 
- You should have received a copy of the GNU General Public License
--along with GCC; see the file COPYING3.  If not see
--<http://www.gnu.org/licenses/>.  */
-+along with GCC; see the file COPYING.  If not, write to the Free
-+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-+02110-1301, USA.  */
- 
- /* WARNING: The code is this function depends on internal and undocumented
-    details of the GNU linker and dynamic loader as implemented for parisc
-diff -Naur gcc-4.3.3.orig/gcc/config/pa/milli64.S gcc-4.3.3/gcc/config/pa/milli64.S
---- gcc-4.3.3.orig/gcc/config/pa/milli64.S	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/pa/milli64.S	2009-01-31 12:05:03.693395000 -0800
-@@ -8,7 +8,7 @@
- 
- GCC is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free
--Software Foundation; either version 3, or (at your option) any later
-+Software Foundation; either version 2, or (at your option) any later
- version.
- 
- In addition to the permissions in the GNU General Public License, the
-@@ -26,8 +26,9 @@
- for more details.
- 
- You should have received a copy of the GNU General Public License
--	along with GCC; see the file COPYING3.  If not see
--<http://www.gnu.org/licenses/>.  */
-+along with GCC; see the file COPYING.  If not, write to the Free
-+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-+02110-1301, USA.  */
- 
- #ifdef pa64
-         .level  2.0w
-diff -Naur gcc-4.3.3.orig/gcc/config/sh/predicates.md gcc-4.3.3/gcc/config/sh/predicates.md
---- gcc-4.3.3.orig/gcc/config/sh/predicates.md	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sh/predicates.md	2009-02-07 16:53:30.513258000 -0800
-@@ -1,5 +1,5 @@
- ;; Predicate definitions for Renesas / SuperH SH.
--;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-+;; Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
- ;;
- ;; This file is part of GCC.
- ;;
-@@ -392,12 +392,6 @@
- 	return 0;
-     }
- 
--  if ((mode == QImode || mode == HImode)
--      && (GET_CODE (op) == SUBREG
--	  && GET_CODE (XEXP (op, 0)) == REG
--	  && system_reg_operand (XEXP (op, 0), mode)))
--    return 0;
--
-   if (TARGET_SHMEDIA
-       && (GET_CODE (op) == PARALLEL || GET_CODE (op) == CONST_VECTOR)
-       && sh_rep_vec (op, mode))
-diff -Naur gcc-4.3.3.orig/gcc/config/soft-fp/double.h gcc-4.3.3/gcc/config/soft-fp/double.h
---- gcc-4.3.3.orig/gcc/config/soft-fp/double.h	2007-05-03 12:05:39.000000000 -0700
-+++ gcc-4.3.3/gcc/config/soft-fp/double.h	2009-02-17 05:54:43.208764000 -0800
-@@ -1,6 +1,7 @@
- /* Software floating-point emulation.
-    Definitions for IEEE Double Precision
--   Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
-+   Copyright (C) 1997, 1998, 1999, 2006, 2007, 2008, 2009
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Richard Henderson (rth@cygnus.com),
- 		  Jakub Jelinek (jj@ultra.linux.cz),
-@@ -203,13 +204,13 @@
- 
- #define FP_UNPACK_SEMIRAW_D(X,val)	\
-   do {					\
--    _FP_UNPACK_RAW_2(1,X,val);		\
-+    _FP_UNPACK_RAW_1(D,X,val);		\
-     _FP_UNPACK_SEMIRAW(D,1,X);		\
-   } while (0)
- 
- #define FP_UNPACK_SEMIRAW_DP(X,val)	\
-   do {					\
--    _FP_UNPACK_RAW_2_P(1,X,val);	\
-+    _FP_UNPACK_RAW_1_P(D,X,val);	\
-     _FP_UNPACK_SEMIRAW(D,1,X);		\
-   } while (0)
- 
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux64.h	2007-10-18 21:29:38.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux64.h	2009-01-24 12:49:51.463535000 -0800
-@@ -285,10 +285,6 @@
- %{mlittle-endian:-EL} \
- %(asm_cpu) %(asm_arch) %(asm_relax)"
- 
--/* Same as sparc.h */
--#undef DBX_REGISTER_NUMBER
--#define DBX_REGISTER_NUMBER(REGNO) (REGNO)
--
- #undef ASM_OUTPUT_ALIGNED_LOCAL
- #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN)		\
- do {									\
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux.h	2009-01-24 12:49:51.463535000 -0800
-@@ -148,10 +148,6 @@
-   "%{V} %{v:%{!V:-V}} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Wa,*:%*} -s \
-    %{fpic|fPIC|fpie|fPIE:-K PIC} %(asm_cpu) %(asm_relax)"
- 
--/* Same as sparc.h */
--#undef DBX_REGISTER_NUMBER
--#define DBX_REGISTER_NUMBER(REGNO) (REGNO)
--
- #undef ASM_OUTPUT_ALIGNED_LOCAL
- #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN)		\
- do {									\
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/sysv4.h gcc-4.3.3/gcc/config/sparc/sysv4.h
---- gcc-4.3.3.orig/gcc/config/sparc/sysv4.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/sysv4.h	2009-01-24 12:49:51.463535000 -0800
-@@ -93,22 +93,6 @@
- 	fprintf (FILE, "\n");						\
-   } while (0)
- 
--/* Define how the SPARC registers should be numbered for Dwarf output.
--   The numbering provided here should be compatible with the native
--   svr4 SDB debugger in the SPARC/svr4 reference port.  The numbering
--   is as follows:
--
--   Assembly name	gcc internal regno	Dwarf regno
--   ----------------------------------------------------------
--   g0-g7		0-7			0-7
--   o0-o7		8-15			8-15
--   l0-l7		16-23			16-23
--   i0-i7		24-31			24-31
--   f0-f31		32-63			40-71
--*/
--
--#define DBX_REGISTER_NUMBER(REGNO) ((REGNO) < 32 ? (REGNO) : (REGNO) + 8)
--
- /* A set of symbol definitions for assembly pseudo-ops which will
-    get us switched to various sections of interest.  These are used
-    in all places where we simply want to switch to a section, and
-diff -Naur gcc-4.3.3.orig/gcc/config/spu/spu.c gcc-4.3.3/gcc/config/spu/spu.c
---- gcc-4.3.3.orig/gcc/config/spu/spu.c	2008-09-12 06:29:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/spu/spu.c	2009-03-02 11:38:26.367169000 -0800
-@@ -142,6 +142,7 @@
- static bool spu_vector_alignment_reachable (const_tree, bool);
- static int spu_sms_res_mii (struct ddg *g);
- static void asm_file_start (void);
-+static unsigned int spu_section_type_flags (tree, const char *, int);
- 
- extern const char *reg_names[];
- rtx spu_compare_op0, spu_compare_op1;
-@@ -325,6 +326,9 @@
- #undef TARGET_ASM_FILE_START
- #define TARGET_ASM_FILE_START asm_file_start
- 
-+#undef TARGET_SECTION_TYPE_FLAGS
-+#define TARGET_SECTION_TYPE_FLAGS spu_section_type_flags
-+
- struct gcc_target targetm = TARGET_INITIALIZER;
- 
- void
-@@ -6220,3 +6224,13 @@
-   default_file_start ();
- }
- 
-+/* Implement targetm.section_type_flags.  */
-+static unsigned int
-+spu_section_type_flags (tree decl, const char *name, int reloc)
-+{
-+  /* .toe needs to have type @nobits.  */
-+  if (strcmp (name, ".toe") == 0)
-+    return SECTION_BSS;
-+  return default_section_type_flags (decl, name, reloc);
-+}
-+
-diff -Naur gcc-4.3.3.orig/gcc/convert.c gcc-4.3.3/gcc/convert.c
---- gcc-4.3.3.orig/gcc/convert.c	2007-09-06 18:24:09.000000000 -0700
-+++ gcc-4.3.3/gcc/convert.c	2009-02-25 14:08:55.493777000 -0800
-@@ -261,18 +261,22 @@
- 	     tree arg1 = strip_float_extensions (TREE_OPERAND (expr, 1));
- 
- 	     if (FLOAT_TYPE_P (TREE_TYPE (arg0))
--		 && FLOAT_TYPE_P (TREE_TYPE (arg1)))
-+		 && FLOAT_TYPE_P (TREE_TYPE (arg1))
-+		 && DECIMAL_FLOAT_TYPE_P (itype) == DECIMAL_FLOAT_TYPE_P (type))
- 	       {
- 		  tree newtype = type;
- 
- 		  if (TYPE_MODE (TREE_TYPE (arg0)) == SDmode
--		      || TYPE_MODE (TREE_TYPE (arg1)) == SDmode)
-+		      || TYPE_MODE (TREE_TYPE (arg1)) == SDmode
-+		      || TYPE_MODE (type) == SDmode)
- 		    newtype = dfloat32_type_node;
- 		  if (TYPE_MODE (TREE_TYPE (arg0)) == DDmode
--		      || TYPE_MODE (TREE_TYPE (arg1)) == DDmode)
-+		      || TYPE_MODE (TREE_TYPE (arg1)) == DDmode
-+		      || TYPE_MODE (type) == DDmode)
- 		    newtype = dfloat64_type_node;
- 		  if (TYPE_MODE (TREE_TYPE (arg0)) == TDmode
--		      || TYPE_MODE (TREE_TYPE (arg1)) == TDmode)
-+		      || TYPE_MODE (TREE_TYPE (arg1)) == TDmode
-+		      || TYPE_MODE (type) == TDmode)
-                     newtype = dfloat128_type_node;
- 		  if (newtype == dfloat32_type_node
- 		      || newtype == dfloat64_type_node
-@@ -290,7 +294,32 @@
- 		    newtype = TREE_TYPE (arg0);
- 		  if (TYPE_PRECISION (TREE_TYPE (arg1)) > TYPE_PRECISION (newtype))
- 		    newtype = TREE_TYPE (arg1);
--		  if (TYPE_PRECISION (newtype) < TYPE_PRECISION (itype))
-+		  /* Sometimes this transformation is safe (cannot
-+		     change results through affecting double rounding
-+		     cases) and sometimes it is not.  If NEWTYPE is
-+		     wider than TYPE, e.g. (float)((long double)double
-+		     + (long double)double) converted to
-+		     (float)(double + double), the transformation is
-+		     unsafe regardless of the details of the types
-+		     involved; double rounding can arise if the result
-+		     of NEWTYPE arithmetic is a NEWTYPE value half way
-+		     between two representable TYPE values but the
-+		     exact value is sufficiently different (in the
-+		     right direction) for this difference to be
-+		     visible in ITYPE arithmetic.  If NEWTYPE is the
-+		     same as TYPE, however, the transformation may be
-+		     safe depending on the types involved: it is safe
-+		     if the ITYPE has strictly more than twice as many
-+		     mantissa bits as TYPE, can represent infinities
-+		     and NaNs if the TYPE can, and has sufficient
-+		     exponent range for the product or ratio of two
-+		     values representable in the TYPE to be within the
-+		     range of normal values of ITYPE.  */
-+		  if (TYPE_PRECISION (newtype) < TYPE_PRECISION (itype)
-+		      && (flag_unsafe_math_optimizations
-+			  || (TYPE_PRECISION (newtype) == TYPE_PRECISION (type)
-+			      && real_can_shorten_arithmetic (TYPE_MODE (itype),
-+							      TYPE_MODE (type)))))
- 		    {
- 		      expr = build2 (TREE_CODE (expr), newtype,
- 				     fold (convert_to_real (newtype, arg0)),
-diff -Naur gcc-4.3.3.orig/gcc/cp/ChangeLog gcc-4.3.3/gcc/cp/ChangeLog
---- gcc-4.3.3.orig/gcc/cp/ChangeLog	2009-01-24 02:15:39.000000000 -0800
-+++ gcc-4.3.3/gcc/cp/ChangeLog	2009-03-18 08:00:32.834440000 -0700
-@@ -1,3 +1,66 @@
-+2009-03-18  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-03-18  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR c++/39425
-+	* parser.c (cp_parser_explicit_specialization): Don't skip the
-+	rest of the specialization when begin_specialization returns
-+	false.
-+
-+2009-03-04  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/9634
-+	PR c++/29469
-+	PR c++/29607
-+	* decl.c (make_typename_type): Do look inside currently open classes.
-+	* parser.c (cp_parser_lookup_name): Likewise.
-+	(cp_parser_template_name): Likewise.
-+	* pt.c (dependent_scope_p): New function.
-+	* cp-tree.h: Declare it.
-+	* class.c (currently_open_class): Return fast if T isn't a class.
-+
-+2009-02-20  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/39225
-+	* decl.c (grokdeclarator): Handle ~identifier.
-+
-+2009-02-17  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/38950
-+	* pt.c (unify)[TEMPLATE_PARM_INDEX]: Convert to the tsubsted type.
-+
-+2009-02-13  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/39070
-+	* semantics.c (finish_call_expr): Change koenig_p parm to int.
-+	If -1, don't set KOENIG_LOOKUP_P but do keep hidden candidates.
-+	* cp-tree.h: Adjust prototype.
-+	* pt.c (tsubst_copy_and_build) [CALL_EXPR]: Pass -1.
-+
-+2009-02-03  Paolo Bonzini  <bonzini@gnu.org>
-+
-+	PR c++/36897
-+	* pt.c (convert_nontype_argument_function): Expect expr to be an
-+	ADDR_EXPR.
-+
-+	PR c++/37314
-+	* typeck.c (merge_types): Call resolve_typename_type if only
-+	one type is a typename.
-+
-+2009-02-02  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/39054
-+	* parser.c (cp_parser_unqualified_id): Don't wrap error_mark_node 
-+	in BIT_NOT_EXPR.
-+
-+2009-01-26  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/23287
-+	* parser.c (cp_parser_unqualified_id): In a template,
-+	accept ~identifier.
-+	* typeck.c (lookup_destructor): Handle IDENTIFIER_NODE.
-+
- 2009-01-24  Release Manager
- 
- 	* GCC 4.3.3 released.
-diff -Naur gcc-4.3.3.orig/gcc/cp/class.c gcc-4.3.3/gcc/cp/class.c
---- gcc-4.3.3.orig/gcc/cp/class.c	2008-06-15 04:57:33.000000000 -0700
-+++ gcc-4.3.3/gcc/cp/class.c	2009-03-04 11:37:43.898064000 -0800
-@@ -5688,6 +5688,9 @@
- {
-   int i;
- 
-+  if (!CLASS_TYPE_P (t))
-+    return false;
-+
-   /* We start looking from 1 because entry 0 is from global scope,
-      and has no type.  */
-   for (i = current_class_depth; i > 0; --i)
-diff -Naur gcc-4.3.3.orig/gcc/cp/cp-tree.h gcc-4.3.3/gcc/cp/cp-tree.h
---- gcc-4.3.3.orig/gcc/cp/cp-tree.h	2009-01-15 14:34:20.000000000 -0800
-+++ gcc-4.3.3/gcc/cp/cp-tree.h	2009-03-04 11:37:43.898064000 -0800
-@@ -4460,6 +4460,7 @@
- extern tree maybe_get_template_decl_from_type_decl (tree);
- extern int processing_template_parmlist;
- extern bool dependent_type_p			(tree);
-+extern bool dependent_scope_p			(tree);
- extern bool any_dependent_template_arguments_p  (const_tree);
- extern bool dependent_template_p		(tree);
- extern bool dependent_template_id_p		(tree, tree);
-@@ -4623,7 +4624,7 @@
- extern tree finish_stmt_expr			(tree, bool);
- extern tree stmt_expr_value_expr		(tree);
- extern tree perform_koenig_lookup		(tree, tree);
--extern tree finish_call_expr			(tree, tree, bool, bool);
-+extern tree finish_call_expr			(tree, tree, bool, int);
- extern tree finish_increment_expr		(tree, enum tree_code);
- extern tree finish_this_expr			(void);
- extern tree finish_pseudo_destructor_expr       (tree, tree, tree);
-diff -Naur gcc-4.3.3.orig/gcc/cp/decl.c gcc-4.3.3/gcc/cp/decl.c
---- gcc-4.3.3.orig/gcc/cp/decl.c	2008-09-30 12:56:13.000000000 -0700
-+++ gcc-4.3.3/gcc/cp/decl.c	2009-03-04 11:37:43.898064000 -0800
-@@ -2978,12 +2978,6 @@
-   gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);
-   gcc_assert (TYPE_P (context));
- 
--  /* When the CONTEXT is a dependent type,  NAME could refer to a
--     dependent base class of CONTEXT.  So we cannot peek inside it,
--     even if CONTEXT is a currently open scope.  */
--  if (dependent_type_p (context))
--    return build_typename_type (context, name, fullname, tag_type);
--
-   if (!IS_AGGR_TYPE (context))
-     {
-       if (complain & tf_error)
-@@ -2991,11 +2985,23 @@
-       return error_mark_node;
-     }
-   
-+  /* When the CONTEXT is a dependent type,  NAME could refer to a
-+     dependent base class of CONTEXT.  But look inside it anyway
-+     if CONTEXT is a currently open scope, in case it refers to a
-+     member of the current instantiation or a non-dependent base;
-+     lookup will stop when we hit a dependent base.  */
-+  if (!dependent_scope_p (context))
-+    /* We should only set WANT_TYPE when we're a nested typename type.
-+       Then we can give better diagnostics if we find a non-type.  */
-+    t = lookup_field (context, name, 0, /*want_type=*/true);
-+  else
-+    t = NULL_TREE;
-+
-+  if (!t && dependent_type_p (context)) 
-+    return build_typename_type (context, name, fullname, tag_type);
-+
-   want_template = TREE_CODE (fullname) == TEMPLATE_ID_EXPR;
-   
--  /* We should only set WANT_TYPE when we're a nested typename type.
--     Then we can give better diagnostics if we find a non-type.  */
--  t = lookup_field (context, name, 0, /*want_type=*/true);
-   if (!t)
-     {
-       if (complain & tf_error)
-@@ -7512,7 +7518,9 @@
- 		    }
- 
- 		  type = TREE_OPERAND (decl, 0);
--		  name = IDENTIFIER_POINTER (constructor_name (type));
-+		  if (TYPE_P (type))
-+		    type = constructor_name (type);
-+		  name = IDENTIFIER_POINTER (type);
- 		  dname = decl;
- 		}
- 		break;
-@@ -8009,8 +8017,9 @@
-       switch (TREE_CODE (unqualified_id))
- 	{
- 	case BIT_NOT_EXPR:
--	  unqualified_id
--	    = constructor_name (TREE_OPERAND (unqualified_id, 0));
-+	  unqualified_id = TREE_OPERAND (unqualified_id, 0);
-+	  if (TYPE_P (unqualified_id))
-+	    unqualified_id = constructor_name (unqualified_id);
- 	  break;
- 
- 	case IDENTIFIER_NODE:
-@@ -8856,21 +8865,20 @@
- 	    /* Check that the name used for a destructor makes sense.  */
- 	    if (sfk == sfk_destructor)
- 	      {
-+		tree uqname = id_declarator->u.id.unqualified_name;
-+
- 		if (!ctype)
- 		  {
- 		    gcc_assert (friendp);
- 		    error ("expected qualified name in friend declaration "
--			   "for destructor %qD",
--			   id_declarator->u.id.unqualified_name);
-+			   "for destructor %qD", uqname);
- 		    return error_mark_node;
- 		  }
- 
--		if (!same_type_p (TREE_OPERAND
--				  (id_declarator->u.id.unqualified_name, 0),
--				  ctype))
-+		if (!check_dtor_name (ctype, TREE_OPERAND (uqname, 0)))
- 		  {
- 		    error ("declaration of %qD as member of %qT",
--			   id_declarator->u.id.unqualified_name, ctype);
-+			   uqname, ctype);
- 		    return error_mark_node;
- 		  }
- 	      }
-diff -Naur gcc-4.3.3.orig/gcc/cp/parser.c gcc-4.3.3/gcc/cp/parser.c
---- gcc-4.3.3.orig/gcc/cp/parser.c	2008-11-19 13:00:23.000000000 -0800
-+++ gcc-4.3.3/gcc/cp/parser.c	2009-03-18 08:00:32.834440000 -0700
-@@ -3791,6 +3791,8 @@
- 	    parser->scope = NULL_TREE;
- 	    parser->object_scope = NULL_TREE;
- 	    parser->qualifying_scope = NULL_TREE;
-+	    if (processing_template_decl)
-+	      cp_parser_parse_tentatively (parser);
- 	    type_decl
- 	      = cp_parser_class_name (parser,
- 				      /*typename_keyword_p=*/false,
-@@ -3799,6 +3801,16 @@
- 				      /*check_dependency=*/false,
- 				      /*class_head_p=*/false,
- 				      declarator_p);
-+	    if (processing_template_decl
-+		&& ! cp_parser_parse_definitely (parser))
-+	      {
-+		/* We couldn't find a type with this name, so just accept
-+		   it and check for a match at instantiation time.  */
-+		type_decl = cp_parser_identifier (parser);
-+		if (type_decl != error_mark_node)
-+		  type_decl = build_nt (BIT_NOT_EXPR, type_decl);
-+		return type_decl;
-+	      }
- 	  }
- 	/* If an error occurred, assume that the name of the
- 	   destructor is the same as the name of the qualifying
-@@ -9941,7 +9953,7 @@
- 	  && !template_keyword_p
- 	  && parser->scope && TYPE_P (parser->scope)
- 	  && check_dependency_p
--	  && dependent_type_p (parser->scope)
-+	  && dependent_scope_p (parser->scope)
- 	  /* Do not do this for dtors (or ctors), since they never
- 	     need the template keyword before their name.  */
- 	  && !constructor_name_p (identifier, parser->scope))
-@@ -10485,7 +10497,6 @@
-   if (!begin_specialization ())
-     {
-       end_specialization ();
--      cp_parser_skip_to_end_of_block_or_statement (parser);
-       return;
-     }
- 
-@@ -16214,35 +16225,11 @@
- 	 cannot look up the name if the scope is not a class type; it
- 	 might, for example, be a template type parameter.  */
-       dependent_p = (TYPE_P (parser->scope)
--		     && !(parser->in_declarator_p
--			  && currently_open_class (parser->scope))
--		     && dependent_type_p (parser->scope));
-+		     && dependent_scope_p (parser->scope));
-       if ((check_dependency || !CLASS_TYPE_P (parser->scope))
--	   && dependent_p)
--	{
--	  if (tag_type)
--	    {
--	      tree type;
--
--	      /* The resolution to Core Issue 180 says that `struct
--		 A::B' should be considered a type-name, even if `A'
--		 is dependent.  */
--	      type = make_typename_type (parser->scope, name, tag_type,
--					 /*complain=*/tf_error);
--	      decl = TYPE_NAME (type);
--	    }
--	  else if (is_template
--		   && (cp_parser_next_token_ends_template_argument_p (parser)
--		       || cp_lexer_next_token_is (parser->lexer,
--						  CPP_CLOSE_PAREN)))
--	    decl = make_unbound_class_template (parser->scope,
--						name, NULL_TREE,
--						/*complain=*/tf_error);
--	  else
--	    decl = build_qualified_name (/*type=*/NULL_TREE,
--					 parser->scope, name,
--					 is_template);
--	}
-+	  && dependent_p)
-+	/* Defer lookup.  */
-+	decl = error_mark_node;
-       else
- 	{
- 	  tree pushed_scope = NULL_TREE;
-@@ -16263,14 +16250,42 @@
- 					/*complain=*/true);
- 
- 	  /* If we have a single function from a using decl, pull it out.  */
--	  if (decl
--	      && TREE_CODE (decl) == OVERLOAD
-+	  if (TREE_CODE (decl) == OVERLOAD
- 	      && !really_overloaded_fn (decl))
- 	    decl = OVL_FUNCTION (decl);
- 
- 	  if (pushed_scope)
- 	    pop_scope (pushed_scope);
- 	}
-+
-+      /* If the scope is a dependent type and either we deferred lookup or
-+	 we did lookup but didn't find the name, rememeber the name.  */
-+      if (decl == error_mark_node && TYPE_P (parser->scope)
-+	  && dependent_type_p (parser->scope))
-+	{
-+	  if (tag_type)
-+	    {
-+	      tree type;
-+
-+	      /* The resolution to Core Issue 180 says that `struct
-+		 A::B' should be considered a type-name, even if `A'
-+		 is dependent.  */
-+	      type = make_typename_type (parser->scope, name, tag_type,
-+					 /*complain=*/tf_error);
-+	      decl = TYPE_NAME (type);
-+	    }
-+	  else if (is_template
-+		   && (cp_parser_next_token_ends_template_argument_p (parser)
-+		       || cp_lexer_next_token_is (parser->lexer,
-+						  CPP_CLOSE_PAREN)))
-+	    decl = make_unbound_class_template (parser->scope,
-+						name, NULL_TREE,
-+						/*complain=*/tf_error);
-+	  else
-+	    decl = build_qualified_name (/*type=*/NULL_TREE,
-+					 parser->scope, name,
-+					 is_template);
-+	}
-       parser->qualifying_scope = parser->scope;
-       parser->object_scope = NULL_TREE;
-     }
-diff -Naur gcc-4.3.3.orig/gcc/cp/pt.c gcc-4.3.3/gcc/cp/pt.c
---- gcc-4.3.3.orig/gcc/cp/pt.c	2009-01-16 14:35:24.000000000 -0800
-+++ gcc-4.3.3/gcc/cp/pt.c	2009-03-04 11:37:43.898064000 -0800
-@@ -4555,6 +4555,13 @@
-       expr = convert_nontype_argument_function (type, expr);
-       if (!expr || expr == error_mark_node)
- 	return expr;
-+
-+      if (TREE_CODE (expr) != ADDR_EXPR)
-+	{
-+	  error ("%qE is not a valid template argument for type %qT", expr, type);
-+	  error ("it must be the address of a function with external linkage");
-+	  return NULL_TREE;
-+	}
-     }
-   /* [temp.arg.nontype]/5, bullet 5
- 
-@@ -11054,12 +11061,12 @@
- 		       qualified_p ? LOOKUP_NONVIRTUAL : LOOKUP_NORMAL,
- 		       /*fn_p=*/NULL));
- 	  }
--	/* Pass true for koenig_p so that build_new_function_call will
-+	/* Pass -1 for koenig_p so that build_new_function_call will
- 	   allow hidden friends found by arg-dependent lookup at template
- 	   parsing time.  */
- 	return finish_call_expr (function, call_args,
- 				 /*disallow_virtual=*/qualified_p,
--				 /*koenig_p*/true);
-+				 /*koenig_p*/-1);
-       }
- 
-     case COND_EXPR:
-@@ -13051,7 +13058,7 @@
- 	/* Convert the ARG to the type of PARM; the deduced non-type
- 	   template argument must exactly match the types of the
- 	   corresponding parameter.  */
--	arg = fold (build_nop (TREE_TYPE (parm), arg));
-+	arg = fold (build_nop (tparm, arg));
-       else if (uses_template_parms (tparm))
- 	/* We haven't deduced the type of this parameter yet.  Try again
- 	   later.  */
-@@ -15637,6 +15644,16 @@
-   return TYPE_DEPENDENT_P (type);
- }
- 
-+/* Returns TRUE if SCOPE is a dependent scope, in which we can't do any
-+   lookup.  In other words, a dependent type that is not the current
-+   instantiation.  */
-+
-+bool
-+dependent_scope_p (tree scope)
-+{
-+  return dependent_type_p (scope) && !currently_open_class (scope);
-+}
-+
- /* Returns TRUE if EXPRESSION is dependent, according to CRITERION.  */
- 
- static bool
-@@ -15658,7 +15675,7 @@
-      An id-expression is type-dependent if it contains a
-      nested-name-specifier that contains a class-name that names a
-      dependent type.  */
--  /* The suggested resolution to Core Issue 2 implies that if the
-+  /* The suggested resolution to Core Issue 224 implies that if the
-      qualifying type is the current class, then we must peek
-      inside it.  */
-   if (DECL_P (name)
-diff -Naur gcc-4.3.3.orig/gcc/cp/semantics.c gcc-4.3.3/gcc/cp/semantics.c
---- gcc-4.3.3.orig/gcc/cp/semantics.c	2008-11-14 14:01:12.000000000 -0800
-+++ gcc-4.3.3/gcc/cp/semantics.c	2009-02-13 13:53:38.261573000 -0800
-@@ -1832,10 +1832,14 @@
-    qualified.  For example a call to `X::f' never generates a virtual
-    call.)
- 
-+   KOENIG_P is 1 if we want to perform argument-dependent lookup,
-+   -1 if we don't, but we want to accept functions found by previous
-+   argument-dependent lookup, and 0 if we want nothing to do with it.
-+
-    Returns code for the call.  */
- 
- tree
--finish_call_expr (tree fn, tree args, bool disallow_virtual, bool koenig_p)
-+finish_call_expr (tree fn, tree args, bool disallow_virtual, int koenig_p)
- {
-   tree result;
-   tree orig_fn;
-@@ -1857,7 +1861,7 @@
- 	  || any_type_dependent_arguments_p (args))
- 	{
- 	  result = build_nt_call_list (fn, args);
--	  KOENIG_LOOKUP_P (result) = koenig_p;
-+	  KOENIG_LOOKUP_P (result) = koenig_p > 0;
- 	  if (cfun)
- 	    {
- 	      do
-@@ -1946,7 +1950,7 @@
- 
-       if (!result)
- 	/* A call to a namespace-scope function.  */
--	result = build_new_function_call (fn, args, koenig_p);
-+	result = build_new_function_call (fn, args, koenig_p != 0);
-     }
-   else if (TREE_CODE (fn) == PSEUDO_DTOR_EXPR)
-     {
-diff -Naur gcc-4.3.3.orig/gcc/cp/typeck.c gcc-4.3.3/gcc/cp/typeck.c
---- gcc-4.3.3.orig/gcc/cp/typeck.c	2009-01-15 14:34:20.000000000 -0800
-+++ gcc-4.3.3/gcc/cp/typeck.c	2009-02-03 07:56:05.128711000 -0800
-@@ -608,6 +608,20 @@
- 
-   code1 = TREE_CODE (t1);
-   code2 = TREE_CODE (t2);
-+  if (code1 != code2)
-+    {
-+      gcc_assert (code1 == TYPENAME_TYPE || code2 == TYPENAME_TYPE);
-+      if (code1 == TYPENAME_TYPE)
-+	{
-+          t1 = resolve_typename_type (t1, /*only_current_p=*/true);
-+	  code1 = TREE_CODE (t1);
-+	}
-+      else
-+	{
-+          t2 = resolve_typename_type (t2, /*only_current_p=*/true);
-+	  code2 = TREE_CODE (t2);
-+	}
-+    }
- 
-   switch (code1)
-     {
-@@ -2034,8 +2048,8 @@
-   return result;
- }
- 
--/* Return the destructor denoted by OBJECT.SCOPE::~DTOR_NAME, or, if
--   SCOPE is NULL, by OBJECT.~DTOR_NAME.  */
-+/* Return the destructor denoted by OBJECT.SCOPE::DTOR_NAME, or, if
-+   SCOPE is NULL, by OBJECT.DTOR_NAME, where DTOR_NAME is ~type.  */
- 
- static tree
- lookup_destructor (tree object, tree scope, tree dtor_name)
-@@ -2050,7 +2064,21 @@
- 	     scope, dtor_type);
-       return error_mark_node;
-     }
--  if (!DERIVED_FROM_P (dtor_type, TYPE_MAIN_VARIANT (object_type)))
-+  if (TREE_CODE (dtor_type) == IDENTIFIER_NODE)
-+    {
-+      /* In a template, names we can't find a match for are still accepted
-+	 destructor names, and we check them here.  */
-+      if (check_dtor_name (object_type, dtor_type))
-+	dtor_type = object_type;
-+      else
-+	{
-+	  error ("object type %qT does not match destructor name ~%qT",
-+		 object_type, dtor_type);
-+	  return error_mark_node;
-+	}
-+      
-+    }
-+  else if (!DERIVED_FROM_P (dtor_type, TYPE_MAIN_VARIANT (object_type)))
-     {
-       error ("the type being destroyed is %qT, but the destructor refers to %qT",
- 	     TYPE_MAIN_VARIANT (object_type), dtor_type);
-diff -Naur gcc-4.3.3.orig/gcc/c-parser.c gcc-4.3.3/gcc/c-parser.c
---- gcc-4.3.3.orig/gcc/c-parser.c	2008-04-03 14:24:28.000000000 -0700
-+++ gcc-4.3.3/gcc/c-parser.c	2009-02-17 05:00:40.440258000 -0800
-@@ -2680,6 +2680,7 @@
- 			     "expected %<;%>, %<,%> or %<)%>"))
- 	{
- 	  c_parser_skip_until_found (parser, CPP_CLOSE_PAREN, NULL);
-+	  get_pending_sizes ();
- 	  return NULL;
- 	}
-       if (c_parser_next_token_is (parser, CPP_ELLIPSIS))
-@@ -2707,6 +2708,7 @@
- 	    {
- 	      c_parser_skip_until_found (parser, CPP_CLOSE_PAREN,
- 					 "expected %<)%>");
-+	      get_pending_sizes ();
- 	      return NULL;
- 	    }
- 	}
-@@ -3132,6 +3134,7 @@
-       ret.value = error_mark_node;
-       ret.original_code = ERROR_MARK;
-       c_parser_skip_until_found (parser, CPP_CLOSE_BRACE, "expected %<}%>");
-+      pop_init_level (0);
-       return ret;
-     }
-   c_parser_consume_token (parser);
-diff -Naur gcc-4.3.3.orig/gcc/c-typeck.c gcc-4.3.3/gcc/c-typeck.c
---- gcc-4.3.3.orig/gcc/c-typeck.c	2008-01-29 15:19:07.000000000 -0800
-+++ gcc-4.3.3/gcc/c-typeck.c	2009-02-04 05:07:43.805620000 -0800
-@@ -327,10 +327,14 @@
- 	tree d2 = TYPE_DOMAIN (t2);
- 	bool d1_variable, d2_variable;
- 	bool d1_zero, d2_zero;
-+	bool t1_complete, t2_complete;
- 
- 	/* We should not have any type quals on arrays at all.  */
- 	gcc_assert (!TYPE_QUALS (t1) && !TYPE_QUALS (t2));
- 
-+	t1_complete = COMPLETE_TYPE_P (t1);
-+	t2_complete = COMPLETE_TYPE_P (t2);
-+
- 	d1_zero = d1 == 0 || !TYPE_MAX_VALUE (d1);
- 	d2_zero = d2 == 0 || !TYPE_MAX_VALUE (d2);
- 
-@@ -370,6 +374,15 @@
- 						 || !d1_variable))
- 					    ? t1
- 					    : t2));
-+	/* Ensure a composite type involving a zero-length array type
-+	   is a zero-length type not an incomplete type.  */
-+	if (d1_zero && d2_zero
-+	    && (t1_complete || t2_complete)
-+	    && !COMPLETE_TYPE_P (t1))
-+	  {
-+	    TYPE_SIZE (t1) = bitsize_zero_node;
-+	    TYPE_SIZE_UNIT (t1) = size_zero_node;
-+	  }
- 	t1 = c_build_qualified_type (t1, quals);
- 	return build_type_attribute_variant (t1, attributes);
-       }
-diff -Naur gcc-4.3.3.orig/gcc/DATESTAMP gcc-4.3.3/gcc/DATESTAMP
---- gcc-4.3.3.orig/gcc/DATESTAMP	2009-01-23 16:16:35.000000000 -0800
-+++ gcc-4.3.3/gcc/DATESTAMP	2009-03-22 17:16:37.424141000 -0700
-@@ -1 +1 @@
--20090124
-+20090323
-diff -Naur gcc-4.3.3.orig/gcc/doc/extend.texi gcc-4.3.3/gcc/doc/extend.texi
---- gcc-4.3.3.orig/gcc/doc/extend.texi	2008-07-15 08:52:35.000000000 -0700
-+++ gcc-4.3.3/gcc/doc/extend.texi	2009-03-17 06:11:58.563094000 -0700
-@@ -2687,7 +2687,7 @@
- the loader, which might assume EAX, EDX and ECX can be clobbered, as
- per the standard calling conventions.  Solaris 8 is affected by this.
- GNU systems with GLIBC 2.1 or higher, and FreeBSD, are believed to be
--safe since the loaders there save all registers.  (Lazy binding can be
-+safe since the loaders there save EAX, EDX and ECX.  (Lazy binding can be
- disabled with the linker or the loader if desired, to avoid the
- problem.)
- 
-diff -Naur gcc-4.3.3.orig/gcc/doc/invoke.texi gcc-4.3.3/gcc/doc/invoke.texi
---- gcc-4.3.3.orig/gcc/doc/invoke.texi	2008-11-21 08:21:50.000000000 -0800
-+++ gcc-4.3.3/gcc/doc/invoke.texi	2009-01-27 10:45:49.519017000 -0800
-@@ -5406,8 +5406,9 @@
- This option implies @option{-fmerge-constants}.  In addition to
- @option{-fmerge-constants} this considers e.g.@: even constant initialized
- arrays or initialized constant variables with integral or floating point
--types.  Languages like C or C++ require each non-automatic variable to
--have distinct location, so using this option will result in non-conforming
-+types.  Languages like C or C++ require each variable, including multiple
-+instances of the same variable in recursive calls, to have distinct locations,
-+so using this option will result in non-conforming
- behavior.
- 
- @item -fmodulo-sched
-diff -Naur gcc-4.3.3.orig/gcc/fold-const.c gcc-4.3.3/gcc/fold-const.c
---- gcc-4.3.3.orig/gcc/fold-const.c	2008-10-22 13:08:01.000000000 -0700
-+++ gcc-4.3.3/gcc/fold-const.c	2009-01-26 07:54:18.800086000 -0800
-@@ -8519,6 +8519,24 @@
-     } /* switch (code) */
- }
- 
-+
-+/* If the operation was a conversion do _not_ mark a resulting constant
-+   with TREE_OVERFLOW if the original constant was not.  These conversions
-+   have implementation defined behavior and retaining the TREE_OVERFLOW
-+   flag here would confuse later passes such as VRP.  */
-+tree
-+fold_unary_ignore_overflow (enum tree_code code, tree type, tree op0)
-+{
-+  tree res = fold_unary (code, type, op0);
-+  if (res
-+      && TREE_CODE (res) == INTEGER_CST
-+      && TREE_CODE (op0) == INTEGER_CST
-+      && (code == NOP_EXPR || code == CONVERT_EXPR))
-+    TREE_OVERFLOW (res) = TREE_OVERFLOW (op0);
-+
-+  return res;
-+}
-+
- /* Fold a binary expression of code CODE and type TYPE with operands
-    OP0 and OP1, containing either a MIN-MAX or a MAX-MIN combination.
-    Return the folded expression if folding is successful.  Otherwise,
-@@ -11673,7 +11691,8 @@
- 
-     case RSHIFT_EXPR:
-       /* Optimize -1 >> x for arithmetic right shifts.  */
--      if (integer_all_onesp (arg0) && !TYPE_UNSIGNED (type))
-+      if (integer_all_onesp (arg0) && !TYPE_UNSIGNED (type)
-+	  && tree_expr_nonnegative_p (arg1))
- 	return omit_one_operand (type, arg0, arg1);
-       /* ... fall through ...  */
- 
-diff -Naur gcc-4.3.3.orig/gcc/fortran/ChangeLog gcc-4.3.3/gcc/fortran/ChangeLog
---- gcc-4.3.3.orig/gcc/fortran/ChangeLog	2009-01-24 02:15:54.000000000 -0800
-+++ gcc-4.3.3/gcc/fortran/ChangeLog	2009-03-07 07:58:49.569600000 -0800
-@@ -1,3 +1,57 @@
-+2009-03-07  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/39295
-+	* interface.c (compare_type_rank_if): Return 1 if the symbols
-+	are the same and deal with external procedures where one is
-+	identified to be a function or subroutine by usage but the
-+	other is not.
-+
-+2009-03-07  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/39292
-+	* trans-array.c (gfc_conv_array_initializer): Convert all
-+	expressions rather than ICEing.
-+
-+2009-02-19  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/38852
-+	PR fortran/39006
-+	Backport from trunk
-+	* trans-intrinsic.c (gfc_conv_intrinsic_bound): Use the array
-+	descriptor ubound for UBOUND, when the array lbound == 1.
-+
-+2009-01-26  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/38907
-+	Backport from trunk
-+	* resolve.c (check_host_association): Remove the matching to
-+	correct an incorrect host association and use manipulation of
-+	the expression instead.
-+
-+2009-01-26  Mikael Morin  <mikael.morin@tele2.fr>
-+
-+        PR fortran/38859
-+	Backport from trunk
-+        * simplify.c (simplify_bound): Don't use array specification
-+        if variable or component has subsequent references.
-+
-+2009-01-26  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/38657
-+	Backport from trunk.
-+	* module.c (write_common_0): Add argument 'this_module' and
-+	check that non-use associated common blocks are written first.
-+	(write_common): Call write_common_0 twice, once with true and
-+	then with false.
-+
-+2009-01-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
-+
-+	PR fortran/38672
-+	Backport from trunk.
-+	* resolve.c (resolve_symbol):  Check for the
-+	presence of derived->ns->proc_name before
-+	accessing derived->ns->proc_name->attr.flavor .
-+
- 2009-01-24  Release Manager
- 
- 	* GCC 4.3.3 released.
-diff -Naur gcc-4.3.3.orig/gcc/fortran/interface.c gcc-4.3.3/gcc/fortran/interface.c
---- gcc-4.3.3.orig/gcc/fortran/interface.c	2009-01-10 13:01:14.000000000 -0800
-+++ gcc-4.3.3/gcc/fortran/interface.c	2009-03-07 07:58:49.569600000 -0800
-@@ -492,17 +492,26 @@
-   if (s1 == NULL || s2 == NULL)
-     return s1 == s2 ? 1 : 0;
- 
-+  if (s1 == s2)
-+    return 1;
-+
-   if (s1->attr.flavor != FL_PROCEDURE && s2->attr.flavor != FL_PROCEDURE)
-     return compare_type_rank (s1, s2);
- 
-   if (s1->attr.flavor != FL_PROCEDURE || s2->attr.flavor != FL_PROCEDURE)
-     return 0;
- 
--  /* At this point, both symbols are procedures.  */
--  if ((s1->attr.function == 0 && s1->attr.subroutine == 0)
--      || (s2->attr.function == 0 && s2->attr.subroutine == 0))
--    return 0;
-+  /* At this point, both symbols are procedures.  It can happen that
-+     a external procedures are compared where one is identified by usage
-+     to be a function or subroutine but the other is not.  Check TKR
-+     nonetheless for these cases.  */
-+  if (s1->attr.function == 0 && s1->attr.subroutine == 0)
-+    return s1->attr.external == 1 ? compare_type_rank (s1, s2) : 0;
-+
-+  if (s2->attr.function == 0 && s2->attr.subroutine == 0)
-+    return s2->attr.external == 1 ? compare_type_rank (s1, s2) : 0;
- 
-+  /* Now the type of procedure has been identified.  */
-   if (s1->attr.function != s2->attr.function
-       || s1->attr.subroutine != s2->attr.subroutine)
-     return 0;
-diff -Naur gcc-4.3.3.orig/gcc/fortran/module.c gcc-4.3.3/gcc/fortran/module.c
---- gcc-4.3.3.orig/gcc/fortran/module.c	2009-01-17 01:28:50.000000000 -0800
-+++ gcc-4.3.3/gcc/fortran/module.c	2009-01-25 21:12:03.141287000 -0800
-@@ -3992,7 +3992,7 @@
- /* Write a common block to the module -- recursive helper function.  */
- 
- static void
--write_common_0 (gfc_symtree *st)
-+write_common_0 (gfc_symtree *st, bool this_module)
- {
-   gfc_common_head *p;
-   const char * name;
-@@ -4004,7 +4004,7 @@
-   if (st == NULL)
-     return;
- 
--  write_common_0 (st->left);
-+  write_common_0 (st->left, this_module);
- 
-   /* We will write out the binding label, or the name if no label given.  */
-   name = st->n.common->name;
-@@ -4023,6 +4023,10 @@
-       w = (c < 0) ? w->left : w->right;
-     }
- 
-+  /* Give priority to commons that are not use associated.  */
-+  if (this_module && p->use_assoc)
-+    write_me = false;
-+
-   if (write_me)
-     {
-       /* Write the common to the module.  */
-@@ -4043,12 +4047,12 @@
- 
-       /* Record that we have written this common.  */
-       w = gfc_getmem (sizeof (struct written_common));
--      w->name = name;
-       w->label = label;
-+      w->name = name;
-       gfc_insert_bbt (&written_commons, w, compare_written_commons);
-     }
- 
--  write_common_0 (st->right);
-+  write_common_0 (st->right, this_module);
- }
- 
- 
-@@ -4059,7 +4063,8 @@
- write_common (gfc_symtree *st)
- {
-   written_commons = NULL;
--  write_common_0 (st);
-+  write_common_0 (st, true);
-+  write_common_0 (st, false);
-   free_written_common (written_commons);
-   written_commons = NULL;
- }
-diff -Naur gcc-4.3.3.orig/gcc/fortran/resolve.c gcc-4.3.3/gcc/fortran/resolve.c
---- gcc-4.3.3.orig/gcc/fortran/resolve.c	2009-01-11 05:42:32.000000000 -0800
-+++ gcc-4.3.3/gcc/fortran/resolve.c	2009-01-25 22:15:41.225652000 -0800
-@@ -4189,15 +4189,17 @@
- /* Checks to see that the correct symbol has been host associated.
-    The only situation where this arises is that in which a twice
-    contained function is parsed after the host association is made.
--   Therefore, on detecting this, the line is rematched, having got
--   rid of the existing references and actual_arg_list.  */
-+   Therefore, on detecting this, change the symbol in the expression
-+   and convert the array reference into an actual arglist if the old
-+   symbol is a variable.  */
- static bool
- check_host_association (gfc_expr *e)
- {
-   gfc_symbol *sym, *old_sym;
--  locus temp_locus;
--  gfc_expr *expr;
-+  gfc_symtree *st;
-   int n;
-+  gfc_ref *ref;
-+  gfc_actual_arglist *arg, *tail;
-   bool retval = e->expr_type == EXPR_FUNCTION;
- 
-   /*  If the expression is the result of substitution in
-@@ -4213,26 +4215,16 @@
-   if (gfc_current_ns->parent
- 	&& old_sym->ns != gfc_current_ns)
-     {
-+      /* Use the 'USE' name so that renamed module symbols are
-+	 correctly handled.  */
-       gfc_find_symbol (e->symtree->name, gfc_current_ns, 1, &sym);
-+
-       if (sym && old_sym != sym
- 	      && sym->ts.type == old_sym->ts.type
- 	      && sym->attr.flavor == FL_PROCEDURE
- 	      && sym->attr.contained)
- 	{
--	  temp_locus = gfc_current_locus;
--	  gfc_current_locus = e->where;
--
--	  gfc_buffer_error (1);
--
--	  gfc_free_ref_list (e->ref);
--	  e->ref = NULL;
--
--	  if (retval)
--	    {
--	      gfc_free_actual_arglist (e->value.function.actual);
--	      e->value.function.actual = NULL;
--	    }
--
-+	  /* Clear the shape, since it might not be valid.  */
- 	  if (e->shape != NULL)
- 	    {
- 	      for (n = 0; n < e->rank; n++)
-@@ -4241,22 +4233,58 @@
- 	      gfc_free (e->shape);
- 	    }
- 
--/* TODO - Replace this gfc_match_rvalue with a straight replacement of
--   actual arglists for function to function substitutions and with a
--   conversion of the reference list to an actual arglist in the case of
--   a variable to function replacement.  This should be quite easy since
--   only integers and vectors can be involved.  */	    
--	  gfc_match_rvalue (&expr);
--	  gfc_clear_error ();
--	  gfc_buffer_error (0);
-+	  /* Give the symbol a symtree in the right place!  */
-+	  gfc_get_sym_tree (sym->name, gfc_current_ns, &st);
-+	  st->n.sym = sym;
-+
-+	  if (old_sym->attr.flavor == FL_PROCEDURE)
-+	    {
-+	      /* Original was function so point to the new symbol, since
-+		 the actual argument list is already attached to the
-+		 expression. */
-+	      e->value.function.esym = NULL;
-+	      e->symtree = st;
-+	    }
-+	  else
-+	    {
-+	      /* Original was variable so convert array references into
-+		 an actual arglist. This does not need any checking now
-+		 since gfc_resolve_function will take care of it.  */
-+	      e->value.function.actual = NULL;
-+	      e->expr_type = EXPR_FUNCTION;
-+	      e->symtree = st;
-+
-+	      /* Ambiguity will not arise if the array reference is not
-+		 the last reference.  */
-+	      for (ref = e->ref; ref; ref = ref->next)
-+		if (ref->type == REF_ARRAY && ref->next == NULL)
-+		  break;
- 
--	  gcc_assert (expr && sym == expr->symtree->n.sym);
-+	      gcc_assert (ref->type == REF_ARRAY);
- 
--	  *e = *expr;
--	  gfc_free (expr);
--	  sym->refs++;
-+	      /* Grab the start expressions from the array ref and
-+		 copy them into actual arguments.  */
-+	      for (n = 0; n < ref->u.ar.dimen; n++)
-+		{
-+		  arg = gfc_get_actual_arglist ();
-+		  arg->expr = gfc_copy_expr (ref->u.ar.start[n]);
-+		  if (e->value.function.actual == NULL)
-+		    tail = e->value.function.actual = arg;
-+	          else
-+		    {
-+		      tail->next = arg;
-+		      tail = arg;
-+		    }
-+		}
- 
--	  gfc_current_locus = temp_locus;
-+	      /* Dump the reference list and set the rank.  */
-+	      gfc_free_ref_list (e->ref);
-+	      e->ref = NULL;
-+	      e->rank = sym->as ? sym->as->rank : 0;
-+	    }
-+
-+	  gfc_resolve_expr (e);
-+	  sym->refs++;
- 	}
-     }
-   /* This might have changed!  */
-@@ -8116,6 +8144,7 @@
-      module function and is not PRIVATE.  */
-   if (sym->ts.type == BT_DERIVED
- 	&& sym->ts.derived->attr.use_assoc
-+	&& sym->ns->proc_name
- 	&& sym->ns->proc_name->attr.flavor == FL_MODULE)
-     {
-       gfc_symbol *ds;
-diff -Naur gcc-4.3.3.orig/gcc/fortran/simplify.c gcc-4.3.3/gcc/fortran/simplify.c
---- gcc-4.3.3.orig/gcc/fortran/simplify.c	2008-11-13 22:14:46.000000000 -0800
-+++ gcc-4.3.3/gcc/fortran/simplify.c	2009-01-25 21:43:44.109708000 -0800
-@@ -2104,7 +2104,10 @@
- 	    case AR_FULL:
- 	      /* We're done because 'as' has already been set in the
- 		 previous iteration.  */
--	      goto done;
-+	      if (!ref->next)
-+	        goto done;
-+
-+	    /* Fall through.  */
- 
- 	    case AR_SECTION:
- 	    case AR_UNKNOWN:
-diff -Naur gcc-4.3.3.orig/gcc/fortran/trans-array.c gcc-4.3.3/gcc/fortran/trans-array.c
---- gcc-4.3.3.orig/gcc/fortran/trans-array.c	2008-11-29 12:42:22.000000000 -0800
-+++ gcc-4.3.3/gcc/fortran/trans-array.c	2009-03-07 07:56:37.773017000 -0800
-@@ -3867,8 +3867,21 @@
- 	      CONSTRUCTOR_APPEND_ELT (v, index, se.expr);
- 	      break;
- 
-+
- 	    default:
--	      gcc_unreachable ();
-+	      /* Catch those occasional beasts that do not simplify
-+		 for one reason or another, assuming that if they are
-+		 standard defying the frontend will catch them.  */
-+	      gfc_conv_expr (&se, c->expr);
-+	      if (range == NULL_TREE)
-+		CONSTRUCTOR_APPEND_ELT (v, index, se.expr);
-+	      else
-+		{
-+		  if (index != NULL_TREE)
-+		  CONSTRUCTOR_APPEND_ELT (v, index, se.expr);
-+		  CONSTRUCTOR_APPEND_ELT (v, range, se.expr);
-+		}
-+	      break;
- 	    }
-         }
-       break;
-diff -Naur gcc-4.3.3.orig/gcc/fortran/trans-intrinsic.c gcc-4.3.3/gcc/fortran/trans-intrinsic.c
---- gcc-4.3.3.orig/gcc/fortran/trans-intrinsic.c	2008-07-27 04:41:35.000000000 -0700
-+++ gcc-4.3.3/gcc/fortran/trans-intrinsic.c	2009-02-18 22:43:15.919035000 -0800
-@@ -917,12 +917,17 @@
- 
-       cond4 = fold_build2 (LT_EXPR, boolean_type_node, stride,
- 			   gfc_index_zero_node);
--      cond4 = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, cond4, cond2);
- 
-       if (upper)
- 	{
-+	  tree cond5;
- 	  cond = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, cond3, cond4);
- 
-+	  cond5 = fold_build2 (EQ_EXPR, boolean_type_node, gfc_index_one_node, lbound);
-+	  cond5 = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, cond4, cond5);
-+
-+	  cond = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, cond, cond5);
-+
- 	  se->expr = fold_build3 (COND_EXPR, gfc_array_index_type, cond,
- 				  ubound, gfc_index_zero_node);
- 	}
-diff -Naur gcc-4.3.3.orig/gcc/gimplify.c gcc-4.3.3/gcc/gimplify.c
---- gcc-4.3.3.orig/gcc/gimplify.c	2008-12-18 13:55:31.000000000 -0800
-+++ gcc-4.3.3/gcc/gimplify.c	2009-01-27 10:45:49.519017000 -0800
-@@ -3206,7 +3206,8 @@
- 	if (valid_const_initializer
- 	    && num_nonzero_elements > 1
- 	    && TREE_READONLY (object)
--	    && TREE_CODE (object) == VAR_DECL)
-+	    && TREE_CODE (object) == VAR_DECL
-+	    && (flag_merge_constants >= 2 || !TREE_ADDRESSABLE (object)))
- 	  {
- 	    if (notify_temp_creation)
- 	      return GS_ERROR;
-diff -Naur gcc-4.3.3.orig/gcc/real.c gcc-4.3.3/gcc/real.c
---- gcc-4.3.3.orig/gcc/real.c	2008-10-22 04:33:04.000000000 -0700
-+++ gcc-4.3.3/gcc/real.c	2009-02-25 14:08:55.493777000 -0800
-@@ -905,15 +905,23 @@
-       /* Sign of zero doesn't matter for compares.  */
-       return 0;
- 
-+    case CLASS2 (rvc_normal, rvc_zero):
-+      /* Decimal float zero is special and uses rvc_normal, not rvc_zero.  */
-+      if (a->decimal)
-+	return decimal_do_compare (a, b, nan_result);
-+      /* Fall through.  */
-     case CLASS2 (rvc_inf, rvc_zero):
-     case CLASS2 (rvc_inf, rvc_normal):
--    case CLASS2 (rvc_normal, rvc_zero):
-       return (a->sign ? -1 : 1);
- 
-     case CLASS2 (rvc_inf, rvc_inf):
-       return -a->sign - -b->sign;
- 
-     case CLASS2 (rvc_zero, rvc_normal):
-+      /* Decimal float zero is special and uses rvc_normal, not rvc_zero.  */
-+      if (b->decimal)
-+	return decimal_do_compare (a, b, nan_result);
-+      /* Fall through.  */
-     case CLASS2 (rvc_zero, rvc_inf):
-     case CLASS2 (rvc_normal, rvc_inf):
-       return (b->sign ? 1 : -1);
-@@ -1266,6 +1274,31 @@
-   *r = u;
-   return true;
- }
-+
-+/* Return true if arithmetic on values in IMODE that were promoted
-+   from values in TMODE is equivalent to direct arithmetic on values
-+   in TMODE.  */
-+
-+bool
-+real_can_shorten_arithmetic (enum machine_mode imode, enum machine_mode tmode)
-+{
-+  const struct real_format *tfmt, *ifmt;
-+  tfmt = REAL_MODE_FORMAT (tmode);
-+  ifmt = REAL_MODE_FORMAT (imode);
-+  /* These conditions are conservative rather than trying to catch the
-+     exact boundary conditions; the main case to allow is IEEE float
-+     and double.  */
-+  return (ifmt->b == tfmt->b
-+	  && ifmt->p > 2 * tfmt->p
-+	  && ifmt->emin < 2 * tfmt->emin - tfmt->p - 2
-+	  && ifmt->emin < tfmt->emin - tfmt->emax - tfmt->p - 2
-+	  && ifmt->emax > 2 * tfmt->emax + 2
-+	  && ifmt->emax > tfmt->emax - tfmt->emin + tfmt->p + 2
-+	  && ifmt->round_towards_zero == tfmt->round_towards_zero
-+	  && ifmt->has_nans >= tfmt->has_nans
-+	  && ifmt->has_inf >= tfmt->has_inf
-+	  && ifmt->has_signed_zero >= tfmt->has_signed_zero);
-+}
- 
-
- /* Render R as an integer.  */
- 
-diff -Naur gcc-4.3.3.orig/gcc/real.h gcc-4.3.3/gcc/real.h
---- gcc-4.3.3.orig/gcc/real.h	2008-08-19 09:37:13.000000000 -0700
-+++ gcc-4.3.3/gcc/real.h	2009-02-25 14:08:55.493777000 -0800
-@@ -413,6 +413,11 @@
- /* Replace R by 1/R in the given machine mode, if the result is exact.  */
- extern bool exact_real_inverse (enum machine_mode, REAL_VALUE_TYPE *);
- 
-+/* Return true if arithmetic on values in IMODE that were promoted
-+   from values in TMODE is equivalent to direct arithmetic on values
-+   in TMODE.  */
-+bool real_can_shorten_arithmetic (enum machine_mode, enum machine_mode);
-+
- /* In tree.c: wrap up a REAL_VALUE_TYPE in a tree node.  */
- extern tree build_real (tree, REAL_VALUE_TYPE);
- 
-diff -Naur gcc-4.3.3.orig/gcc/recog.c gcc-4.3.3/gcc/recog.c
---- gcc-4.3.3.orig/gcc/recog.c	2008-06-07 14:13:29.000000000 -0700
-+++ gcc-4.3.3/gcc/recog.c	2009-02-25 23:06:48.803473000 -0800
-@@ -1,6 +1,6 @@
- /* Subroutines used by or related to instruction recognition.
-    Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
--   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
-    Free Software Foundation, Inc.
- 
- This file is part of GCC.
-@@ -147,10 +147,7 @@
-       const char *c = constraints[i];
-       if (c[0] == '%')
- 	c++;
--      if (ISDIGIT ((unsigned char) c[0]) && c[1] == '\0')
--	c = constraints[c[0] - '0'];
--
--      if (! asm_operand_ok (operands[i], c))
-+      if (! asm_operand_ok (operands[i], c, constraints))
- 	return 0;
-     }
- 
-@@ -1506,7 +1503,7 @@
-    Return > 0 if ok, = 0 if bad, < 0 if inconclusive.  */
- 
- int
--asm_operand_ok (rtx op, const char *constraint)
-+asm_operand_ok (rtx op, const char *constraint, const char **constraints)
- {
-   int result = 0;
- 
-@@ -1534,15 +1531,29 @@
- 
- 	case '0': case '1': case '2': case '3': case '4':
- 	case '5': case '6': case '7': case '8': case '9':
--	  /* For best results, our caller should have given us the
--	     proper matching constraint, but we can't actually fail
--	     the check if they didn't.  Indicate that results are
--	     inconclusive.  */
--	  do
--	    constraint++;
--	  while (ISDIGIT (*constraint));
--	  if (! result)
--	    result = -1;
-+	  /* If caller provided constraints pointer, look up
-+	     the maching constraint.  Otherwise, our caller should have
-+	     given us the proper matching constraint, but we can't
-+	     actually fail the check if they didn't.  Indicate that
-+	     results are inconclusive.  */
-+	  if (constraints)
-+	    {
-+	      char *end;
-+	      unsigned long match;
-+
-+	      match = strtoul (constraint, &end, 10);
-+	      if (!result)
-+		result = asm_operand_ok (op, constraints[match], NULL);
-+	      constraint = (const char *) end;
-+	    }
-+	  else
-+	    {
-+	      do
-+		constraint++;
-+	      while (ISDIGIT (*constraint));
-+	      if (! result)
-+		result = -1;
-+	    }
- 	  continue;
- 
- 	case 'p':
-diff -Naur gcc-4.3.3.orig/gcc/recog.h gcc-4.3.3/gcc/recog.h
---- gcc-4.3.3.orig/gcc/recog.h	2007-07-26 01:37:01.000000000 -0700
-+++ gcc-4.3.3/gcc/recog.h	2009-02-25 23:06:48.803473000 -0800
-@@ -1,6 +1,6 @@
- /* Declarations for interface to insn recognizer and insn-output.c.
-    Copyright (C) 1987, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004,
--   2005, 2006, 2007 Free Software Foundation, Inc.
-+   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -71,7 +71,7 @@
- extern void init_recog (void);
- extern void init_recog_no_volatile (void);
- extern int check_asm_operands (rtx);
--extern int asm_operand_ok (rtx, const char *);
-+extern int asm_operand_ok (rtx, const char *, const char **);
- extern bool validate_change (rtx, rtx *, rtx, bool);
- extern bool validate_unshare_change (rtx, rtx *, rtx, bool);
- extern bool canonicalize_change_group (rtx insn, rtx x);
-diff -Naur gcc-4.3.3.orig/gcc/regrename.c gcc-4.3.3/gcc/regrename.c
---- gcc-4.3.3.orig/gcc/regrename.c	2008-11-25 13:26:19.000000000 -0800
-+++ gcc-4.3.3/gcc/regrename.c	2009-02-04 13:42:04.642083000 -0800
-@@ -820,7 +820,7 @@
- 		    OP_IN, 0);
- 
- 	  for (i = 0; i < recog_data.n_dups; i++)
--	    *recog_data.dup_loc[i] = copy_rtx (old_dups[i]);
-+	    *recog_data.dup_loc[i] = old_dups[i];
- 	  for (i = 0; i < n_ops; i++)
- 	    *recog_data.operand_loc[i] = old_operands[i];
- 	  if (recog_data.n_dups)
-diff -Naur gcc-4.3.3.orig/gcc/stmt.c gcc-4.3.3/gcc/stmt.c
---- gcc-4.3.3.orig/gcc/stmt.c	2008-05-09 11:12:13.000000000 -0700
-+++ gcc-4.3.3/gcc/stmt.c	2009-02-25 23:06:48.803473000 -0800
-@@ -1,6 +1,6 @@
- /* Expands front end tree to back end RTL for GCC
-    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997,
--   1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+   1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
-    Free Software Foundation, Inc.
- 
- This file is part of GCC.
-@@ -895,7 +895,7 @@
-       else if (MEM_P (op))
- 	op = validize_mem (op);
- 
--      if (asm_operand_ok (op, constraint) <= 0)
-+      if (asm_operand_ok (op, constraint, NULL) <= 0)
- 	{
- 	  if (allows_reg && TYPE_MODE (type) != BLKmode)
- 	    op = force_reg (TYPE_MODE (type), op);
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/ChangeLog gcc-4.3.3/gcc/testsuite/ChangeLog
---- gcc-4.3.3.orig/gcc/testsuite/ChangeLog	2009-01-24 02:15:24.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/ChangeLog	2009-03-18 08:00:32.834440000 -0700
-@@ -1,3 +1,369 @@
-+2009-03-18  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-03-18  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR c++/39425
-+	* g++.dg/template/pr39425.C: New.
-+
-+	* g++.dg/template/spec33.C: Updated.
-+
-+2009-03-13  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-03-13  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR testsuite/39451
-+	* gcc.dg/asm-b.c: Use "Q" constraint on %b1/%h1 and "R"
-+	constraint on (%2).
-+
-+2009-03-11  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
-+
-+	* g++.old-deja/g++.jason/thunk2.C: Skip on SPU.
-+
-+2009-03-07  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/39295
-+	* gfortran.dg/interface_25.f90: New test.
-+	* gfortran.dg/interface_26.f90: New test.
-+
-+2009-03-07  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/39292
-+	* gfortran.dg/initialization_22.f90: New test.
-+
-+2009-03-04  Jason Merrill  <jason@redhat.com>
-+	    Giovanni Bajo  <giovannibajo@gcc.gnu.org>
-+
-+	PR c++/9634
-+	PR c++/29469
-+	PR c++/29607
-+	* g++.dg/template/dependent-name5.C: New test.
-+
-+2009-02-26  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-02-02  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR inline-asm/39058
-+	* gcc.target/i386/pr39058.c: New test.
-+
-+2009-02-25  Janis Johnson  <janis187@us.ibm.com>
-+
-+	Backport from mainline:
-+	2008-10-29  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR middle-end/36578
-+	* gcc.dg/dfp/convert-bfp-13.c, gcc.dg/dfp/convert-bfp-14.c,
-+	gcc.dg/dfp/convert-dfp-fold-2.c, gcc.target/i386/pr36578-1.c,
-+	gcc.target/i386/pr36578-2.c: New tests.
-+
-+2009-02-25  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2008-02-25  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR rtl-optimization/39241
-+	* gcc.dg/torture/pr39241.c: New.
-+
-+2009-02-21  Kaz Kojima  <kkojima@gcc.gnu.org>
-+
-+	* gcc.c-torture/execute/pr39228.x: New.
-+
-+2009-02-20  Steve Ellcey  <sje@cup.hp.com>
-+
-+	PR target/38056
-+	* gcc.target/ia64/sibcall-opt-1.c: New test.
-+	* gcc.target/ia64/sibcall-opt-2.c: New test.
-+
-+2009-02-20  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/39225
-+	* g++.dg/parse/dtor15.C: New test.
-+
-+2009-02-19  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/39228
-+	* gcc.c-torture/execute/pr39228.c: New test.
-+
-+2009-02-19  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/38852
-+	PR fortran/39006
-+	Backport from mainline:
-+	* gfortran.dg/bound_6.f90: New test.
-+
-+2009-02-17  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/38950
-+	* g++.dg/template/array20.C: New test.
-+
-+2009-02-17  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35446
-+	* gcc.dg/noncompile/init-5.c: New test.
-+	* gcc.dg/init-bad-4.c: Adjust expected errors.
-+
-+2009-02-15  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* gcc.dg/struct/w_prof_single_str_global.c: Mask return value.
-+
-+	Backport from mainline:
-+	2009-01-12  Mark Mitchell  <mark@codesourcery.com>
-+
-+	* gcc.dg/struct/wo_prof_single_str_global.c: Mask return value.
-+	* gcc.dg/struct/wo_prof_single_str_local.c: Mask return value.
-+	* gcc.dg/struct/wo_prof_single_str_pointer.c: Mask return value.
-+
-+2009-02-13  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/39070
-+	* g++.dg/cpp0x/decltype16.C: New.
-+
-+2009-02-13  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35444
-+	* gcc.dg/noncompile/pr35444-1.c, gcc.dg/noncompile/pr35444-2.c:
-+	New tests.
-+
-+2009-02-10  Steve Ellcey  <sje@cup.hp.com>
-+
-+	PR c/39084
-+	* gcc.dg/pr39084.c: New test.
-+
-+2009-02-09  Janis Johnson  <janis187@us.ibm.com>
-+
-+	PR c/39035
-+	* gcc.dg/dfp/pr39035.c: New test.
-+
-+2009-02-08  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35434
-+	* gcc.dg/attr-alias-4.c: New test.
-+
-+2009-02-08  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/36432
-+	* gcc.dg/c90-flex-array-2.c, gcc.dg/c99-flex-array-6.c: New tests.
-+
-+2009-02-05  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35435
-+	* gcc.dg/tls/diag-6.c: New test.
-+
-+2009-02-05  Richard Guenther  <rguenther@suse.de>
-+
-+	Backport from mainline
-+	2009-02-05  Daniel Berlin  <dberlin@dberlin.org>
-+
-+	* gcc.c-torture/execute/pr39100.c: New.
-+
-+2009-02-04  Joseph Myers  <joseph@codesourcery.com>
-+
-+	PR c/35433
-+	* gcc.dg/init-bad-6.c: New test.
-+
-+2009-02-03  Paolo Bonzini  <bonzini@gnu.org>
-+
-+	PR c++/36897
-+	* g++.dg/template/func2.C: New test.
-+
-+	PR c++/37314
-+	* g++.dg/template/typename15.C: New.
-+	* g++.dg/template/typename16.C: New.
-+
-+2009-02-02  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/39054
-+	* g++.dg/parse/dtor14.C: New test.
-+
-+2009-01-30  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-01-14  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR rtl-optimization/38245
-+	* gcc.dg/pr38245-3.c: New test.
-+	* gcc.dg/pr38245-3.h: New file.
-+	* gcc.dg/pr38245-4.c: New file.
-+	* gcc.dg/pr38364.c: New test.
-+
-+2009-01-30  Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/39041
-+	* gcc.c-torture/compile/pr39041.c: New testcase.
-+
-+2009-01-30  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-01-16  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR tree-optimization/38789
-+	* gcc.c-torture/compile/pr38789.c: New test.
-+
-+2009-01-30  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-01-27  Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/38503
-+	* g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C: New testcase.
-+
-+	2009-01-26  Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/38745
-+	* g++.dg/torture/pr38745.C: New testcase.
-+
-+	2009-01-26  Richard Guenther  <rguenther@suse.de>
-+
-+	PR middle-end/38851
-+	* g++.dg/warn/Wuninitialized-1.C: New testcase.
-+
-+	2009-01-20  Andrew Pinski  <andrew_pinski@playstation.sony.com>
-+		    Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/38747
-+	PR tree-optimization/38748
-+	* gcc.dg/tree-ssa/struct-aliasing-1.c: New test.
-+	* gcc.c-torture/execute/struct-aliasing-1.c: Likewise.
-+
-+2009-01-29  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-01-28  Richard Guenther  <rguenther@suse.de>
-+
-+	PR middle-end/38908
-+	* g++.dg/warn/Wuninitialized-2.C: New testcase.
-+
-+	2009-01-27  Daniel Kraft  <d@domob.eu>
-+
-+	PR fortran/38883
-+	* gfortran.dg/mvbits_6.f90:  New test.
-+	* gfortran.dg/mvbits_7.f90:  New test.
-+	* gfortran.dg/mvbits_8.f90:  New test.
-+
-+	2009-01-21  Daniel Kraft  <d@domob.eu>
-+
-+	PR fortran/38887
-+	* gfortran.dg/mvbits_5.f90:  New test.
-+
-+2009-01-29  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-01-29  Steve Ellcey  <sje@cup.hp.com>
-+
-+	PR middle-end/38857
-+	* gcc.c-torture/compile/pr38857.c: New test.
-+
-+	2009-01-28  Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/38926
-+	* gcc.c-torture/compile/pr38926.c: New testcase.
-+
-+2009-01-29  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-01-28  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/38988
-+	* gcc.target/i386/pr38988.c: New test.
-+
-+	2009-01-27  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR middle-end/38969
-+	* gcc.c-torture/execute/pr38969.c: New test.
-+
-+2009-01-27  Steve Ellcey  <sje@cup.hp.com>
-+
-+	PR middle-end/38615
-+	* gcc.dg/pr38615.c: New test.
-+
-+2009-01-27  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-01-07  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/38706
-+	* g++.dg/other/pr38706.C: New test.
-+
-+2009-01-26  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/23287
-+	* g++.dg/template/dtor5.C: New test.
-+
-+2009-01-26  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2008-07-17  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR testsuite/36443
-+	* objc.dg/gnu-encoding/gnu-encoding.exp: Temporarily unset
-+	GCC_EXEC_PREFIX from environment when running $HOSTCC.
-+
-+2008-01-26  Paolo Bonzini  <bonzini@gnu.org>
-+
-+	PR tree-optimization/38932
-+	* gcc.dg/pr38932.c: New.
-+
-+2009-01-26  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/38907
-+	Backport from trunk
-+	* gfortran.dg/host_assoc_function_7.f90: New test.
-+
-+2009-01-26  Mikael Morin  <mikael.morin@tele2.fr>
-+
-+	PR fortran/38859
-+	Backport from trunk
-+	* gfortran.dg/bound_5.f90: New test.
-+
-+2009-01-26  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/38657
-+	Backport from trunk.
-+	* gfortran.dg/module_commons_3.f90: Reapply.
-+
-+2009-01-25  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-01-22  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/38931
-+	* gcc.target/i386/pr38931.c: New test.
-+
-+2009-01-25  Richard Guenther  <rguenther@suse.de>
-+
-+	Backport from mainline:
-+	2008-12-02  Richard Guenther  <rguenther@suse.de>
-+
-+	PR tree-optimization/38359
-+	* gcc.c-torture/compile/pr38359.c: New testcase.
-+	* gcc.c-torture/execute/shiftopt-1.c: Adjust.
-+
-+2009-01-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
-+
-+	PR fortran/38672
-+	Backport from trunk.
-+	* gfortran.dg/host_assoc_blockdata_1.f90:  New test.
-+	* gfortran.dg/host_assoc_blockdata_2.f90:  New test.
-+
-+2009-01-24  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2009-01-20  Kees Cook  <kees@ubuntu.com>
-+		    H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR target/38902
-+	* gcc.dg/pr38902.c: New.
-+
-+2009-01-24  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline:
-+	2008-01-20  Paolo Bonzini  <bonzini@gnu.org>
-+
-+	PR target/38868
-+	* gfortran.dg/pr38868.f: New testcase.
-+
- 2009-01-24  Release Manager
- 
- 	* GCC 4.3.3 released.
-@@ -89,7 +455,7 @@
- 
- 	Backport from mainline:
- 	2008-12-29  Dorit Nuzman  <dorit@il.ibm.com>
--	            Ira Rosen  <irar@il.ibm.com>
-+		    Ira Rosen  <irar@il.ibm.com>
- 
- 	PR tree-optimization/38529
- 	* gcc.dg/vect/pr38529.c: New test.
-@@ -426,8 +792,8 @@
- 
- 2008-11-14  Paul Thomas  <pault@gcc.gnu.org>
- 
--        PR fortran/37836
--        * gfortran.dg/minmaxval_1.f90: New test.
-+	PR fortran/37836
-+	* gfortran.dg/minmaxval_1.f90: New test.
- 
- 2008-11-13  Jason Merrill  <jason@redhat.com>
- 
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38359.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38359.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38359.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38359.c	2009-01-24 15:26:56.556617000 -0800
-@@ -0,0 +1,17 @@
-+unsigned _ov_64_seek_lap (_Bool x1, _Bool x2, _Bool x3)
-+{
-+  unsigned ltmp_3978_7__PHI_TEMPORARY;
-+  signed ltmp_4011_7;
-+
-+  if (!x1 || !x2)
-+    while (1) ;
-+
-+  if (x3)
-+    ltmp_3978_7__PHI_TEMPORARY = 0xffffff7e;
-+  else
-+    ltmp_3978_7__PHI_TEMPORARY = 1;
-+
-+  ltmp_4011_7 = -1;
-+  return ltmp_4011_7 >> ltmp_3978_7__PHI_TEMPORARY;
-+}
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38789.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38789.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38789.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38789.c	2009-01-30 09:46:24.138943000 -0800
-@@ -0,0 +1,18 @@
-+/* PR tree-optimization/38789 */
-+
-+void
-+baz (int v)
-+{
-+  unsigned a = (v == 1) ? 1 : 2;
-+
-+  if (__builtin_constant_p (a))
-+    asm volatile ("# constant %0" :: "i" (a));
-+  else
-+    asm volatile ("# register %0" :: "r" (a));
-+
-+  a = 6;
-+  if (__builtin_constant_p (a))
-+    asm volatile ("# constant %0" :: "i" (a));
-+  else
-+    asm volatile ("# register %0" :: "r" (a));
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38857.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38857.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38857.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38857.c	2009-01-29 09:06:01.240583000 -0800
-@@ -0,0 +1,22 @@
-+static const int vs_total_ac_bits = 2680;
-+typedef struct EncBlockInfo {
-+      short mb[64];
-+      unsigned char next[64];
-+} EncBlockInfo;
-+inline void dv_guess_qnos(EncBlockInfo* blks, int* qnos) {
-+      int size[5];
-+      int j, k, a, prev;
-+      EncBlockInfo* b;
-+      for(a=2; a==2 || vs_total_ac_bits < size[0]; a+=a){
-+	 for (j=0; j<6*5; j++, b++) {
-+	     for (k= b->next[prev]; k<64; k= b->next[k]) {
-+		 if(b->mb[k] < a && b->mb[k] > -a){
-+		     b->next[prev] = b->next[k];
-+		 }
-+		 else{
-+		     prev = k;
-+		 }
-+	     }
-+	 }
-+     }
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38926.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38926.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38926.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38926.c	2009-01-29 09:06:01.240583000 -0800
-@@ -0,0 +1,41 @@
-+static inline int foo (unsigned _si1)
-+{
-+  if (_si1 != 0)
-+    if (_si1 > 2147483647)
-+      return 1;
-+  return 0;
-+}
-+
-+static inline unsigned bar (unsigned _left, int _right)
-+{
-+  return (unsigned) _right >= 8 ? 1 : _left >> _right;
-+}
-+
-+unsigned g_2;
-+unsigned g_67;
-+volatile unsigned g_162;
-+
-+static inline int func_62 (unsigned p_63)
-+{
-+  p_63 = g_2 & g_67;
-+  if (g_2)
-+    ;
-+  else if (p_63)
-+    return 1;
-+  g_67 = bar (p_63, g_2);
-+  return 0;
-+}
-+
-+unsigned baz (void)
-+{
-+  if (g_2)
-+    for (; g_2 <= -16; g_2 = foo (g_2))
-+      {
-+        for (; g_162; g_162)
-+          func_62 (func_62 (0));
-+        if (g_67)
-+          break;
-+      }
-+  return g_2;
-+}
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr39041.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr39041.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr39041.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr39041.c	2009-01-30 14:14:39.201534000 -0800
-@@ -0,0 +1,28 @@
-+int test_bit(int nr, void *addr)
-+{
-+  int *a = (int *)addr;
-+  int mask;
-+  a += nr;
-+  mask = 1 << nr;
-+  return mask & *a;
-+}
-+struct {
-+    struct {
-+	int disabled;
-+    } *data[1];
-+} trace;
-+struct {
-+    unsigned bits[1];
-+} cpumask;
-+void inc(int *);
-+void dec(int *);
-+int foo(void)
-+{
-+  int cpu;
-+  for (cpu = 0; cpu < 1; cpu++) {
-+      if (test_bit(cpu, cpumask.bits))
-+	inc(&trace.data[cpu]->disabled);
-+      if (!test_bit(cpu, cpumask.bits))
-+	dec(&trace.data[cpu]->disabled);
-+  }
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr38969.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr38969.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr38969.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr38969.c	2009-01-29 02:05:17.651873000 -0800
-@@ -0,0 +1,25 @@
-+__complex__ float
-+__attribute__ ((noinline)) foo (__complex__ float x)
-+{
-+  return x;
-+}
-+
-+__complex__ float
-+__attribute__ ((noinline)) bar (__complex__ float x)
-+{
-+  return foo (x);
-+}
-+
-+int main()
-+{
-+  __complex__ float a, b;
-+  __real__ a = 9;
-+  __imag__ a = 42;
-+
-+  b = bar (a);
-+
-+  if (a != b)
-+    abort ();
-+
-+  return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39100.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39100.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39100.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39100.c	2009-02-05 03:10:02.086542000 -0800
-@@ -0,0 +1,65 @@
-+/* Bad PTA results (incorrect store handling) was causing us to delete
-+   *na = 0 store.  */
-+
-+typedef struct E
-+{
-+  int p;
-+  struct E *n;
-+} *EP;   
-+
-+typedef struct C
-+{
-+  EP x;
-+  short cn, cp; 
-+} *CP;
-+
-+__attribute__((noinline)) CP
-+foo (CP h, EP x)
-+{
-+  EP pl = 0, *pa = &pl;
-+  EP nl = 0, *na = &nl;
-+  EP n;
-+
-+  while (x)
-+    {
-+      n = x->n;   
-+      if ((x->p & 1) == 1) 
-+        {
-+          h->cp++;
-+          *pa = x;
-+          pa = &((*pa)->n);
-+        }
-+      else
-+        {
-+          h->cn++;
-+          *na = x;
-+          na = &((*na)->n);
-+        }    
-+      x = n;
-+    }
-+  *pa = nl;
-+  *na = 0;
-+  h->x = pl;
-+  return h;
-+}
-+
-+int
-+main (void)
-+{  
-+  struct C c = { 0, 0, 0 };
-+  struct E e[2] = { { 0, &e[1] }, { 1, 0 } };
-+  EP p;
-+
-+  foo (&c, &e[0]);
-+  if (c.cn != 1 || c.cp != 1)
-+    __builtin_abort ();
-+  if (c.x != &e[1])
-+    __builtin_abort ();
-+  if (e[1].n != &e[0])
-+    __builtin_abort ();
-+  if (e[0].n)
-+    __builtin_abort ();
-+  return 0;  
-+}
-+
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39228.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39228.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39228.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39228.c	2009-02-19 04:44:40.878358000 -0800
-@@ -0,0 +1,36 @@
-+extern void abort (void);
-+
-+static int __attribute__((always_inline)) testf (float b)
-+{
-+  float c = 1.01f * b;
-+
-+  return __builtin_isinff (c);
-+}
-+
-+static int __attribute__((always_inline)) test (double b)
-+{
-+  double c = 1.01 * b;
-+
-+  return __builtin_isinf (c);
-+}
-+
-+static int __attribute__((always_inline)) testl (long double b)
-+{
-+  long double c = 1.01L * b;
-+
-+  return __builtin_isinfl (c);
-+}
-+
-+int main()
-+{
-+  if (testf (__FLT_MAX__) < 1)
-+    abort ();
-+
-+  if (test (__DBL_MAX__) < 1)
-+    abort ();
-+
-+  if (testl (__LDBL_MAX__) < 1)
-+    abort ();
-+
-+  return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39228.x gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39228.x
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39228.x	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39228.x	2009-02-21 05:04:37.075689000 -0800
-@@ -0,0 +1,10 @@
-+if { [istarget "alpha*-*-*"] || [istarget "sh*-*-*"] } {
-+	# alpha and SH require -mieee for this test.
-+	set additional_flags "-mieee"
-+}
-+if [istarget "spu-*-*"] {
-+	# No Inf/NaN support on SPU.
-+	return 1
-+}
-+
-+return 0
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c	2002-12-16 10:23:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c	2009-01-24 15:26:56.556617000 -0800
-@@ -43,12 +43,6 @@
- 
-   if (0 >> x != 0)
-     link_error ();
--
--  if (-1 >> x != -1)
--    link_error ();
--
--  if (~0 >> x != ~0)
--    link_error ();
- }
- 
- int
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c	2009-01-30 09:31:24.050790000 -0800
-@@ -0,0 +1,17 @@
-+struct S { float f; };
-+int __attribute__((noinline))
-+foo (int *r, struct S *p)
-+{
-+  int *q = (int *)&p->f;
-+  int i = *q;
-+  *r = 0;
-+  return i + *q;
-+}
-+extern void abort (void);
-+int main()
-+{
-+  int i = 1;
-+  if (foo (&i, (struct S *)&i) != 1)
-+    abort ();
-+  return (0);
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/asm-b.c gcc-4.3.3/gcc/testsuite/gcc.dg/asm-b.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/asm-b.c	2006-12-20 14:01:01.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/asm-b.c	2009-03-13 06:25:50.614654000 -0700
-@@ -24,8 +24,8 @@
- #if defined (__powerpc__) || defined (__PPC__) || defined (__ppc__) || defined (_POWER) || defined (__ppc64__)
-   __asm __volatile ("sthbrx %1,0,%2" : "=m" (*z) : "r" (y), "r" (z));
- #elif defined __i386__ || defined __x86_64__
--  __asm __volatile ("movb %b1,1(%2); movb %h1,(%2)" : "=m" (*z) : "r" (y), "r"
--(z));
-+  __asm __volatile ("movb %b1,1(%2)\n\tmovb %h1,(%2)"
-+		    : "=m" (*z) : "Q" (y), "R" (z));
- #endif
-   return (x & 1) == 0;
- }
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/attr-alias-4.c gcc-4.3.3/gcc/testsuite/gcc.dg/attr-alias-4.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/attr-alias-4.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/attr-alias-4.c	2009-02-08 11:02:56.473953000 -0800
-@@ -0,0 +1,4 @@
-+/* ICE on invalid alias attribute: PR 35434.  */
-+/* { dg-do compile } */
-+/* { dg-options "" } */
-+typedef int i __attribute__((alias("j"))); /* { dg-warning "ignored" } */
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/c90-flex-array-2.c gcc-4.3.3/gcc/testsuite/gcc.dg/c90-flex-array-2.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/c90-flex-array-2.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/c90-flex-array-2.c	2009-02-08 11:01:57.311455000 -0800
-@@ -0,0 +1,15 @@
-+/* [] does not indicate a flexible array member unless it is the field
-+   itself being declared as an incomplete array type rather than a
-+   pointer or other type derived from such a type.  PR 36432.  */
-+/* { dg-do compile } */
-+/* { dg-options "-std=iso9899:1990 -pedantic-errors" } */
-+
-+void
-+f (void)
-+{
-+  int a[3];
-+  int (*p)[];
-+  struct { int (*p)[]; } s;
-+  p = &a;
-+  s.p = &a;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/c99-flex-array-6.c gcc-4.3.3/gcc/testsuite/gcc.dg/c99-flex-array-6.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/c99-flex-array-6.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/c99-flex-array-6.c	2009-02-08 11:01:57.311455000 -0800
-@@ -0,0 +1,15 @@
-+/* [] does not indicate a flexible array member unless it is the field
-+   itself being declared as an incomplete array type rather than a
-+   pointer or other type derived from such a type.  PR 36432.  */
-+/* { dg-do compile } */
-+/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
-+
-+void
-+f (void)
-+{
-+  int a[3];
-+  int (*p)[];
-+  struct { int (*p)[]; } s;
-+  p = &a;
-+  s.p = &a;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-bfp-13.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-bfp-13.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-bfp-13.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-bfp-13.c	2009-02-25 14:08:55.493777000 -0800
-@@ -0,0 +1,20 @@
-+/* Test for bug where fold changed binary operation to decimal
-+   depending on typedefs.  */
-+/* { dg-options "-std=gnu99" } */
-+
-+extern void abort (void);
-+extern void exit (int);
-+
-+volatile double d = 1.2345675;
-+
-+typedef const volatile _Decimal32 d32;
-+
-+int
-+main (void)
-+{
-+  _Decimal32 a = (d * d);
-+  d32 b = (d * d);
-+  if (a != b)
-+    abort ();
-+  exit (0);
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-bfp-14.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-bfp-14.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-bfp-14.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-bfp-14.c	2009-02-25 14:08:55.493777000 -0800
-@@ -0,0 +1,17 @@
-+/* Test for bug where fold narrowed decimal floating-point
-+   operations.  */
-+/* { dg-options "-std=gnu99" } */
-+
-+extern void abort (void);
-+extern void exit (int);
-+
-+volatile _Decimal32 f = 1.23456DF;
-+volatile _Decimal64 d = 1.23456DD;
-+
-+int
-+main (void)
-+{
-+  if ((double)((_Decimal64)f * (_Decimal64)f) != (double)(d * d))
-+    abort ();
-+  exit (0);
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-dfp-fold-2.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-dfp-fold-2.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-dfp-fold-2.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-dfp-fold-2.c	2009-02-25 14:08:55.493777000 -0800
-@@ -0,0 +1,17 @@
-+/* Test for bug where fold narrowed decimal floating-point
-+   operations.  */
-+/* { dg-options "-std=gnu99" } */
-+
-+extern void abort (void);
-+extern void exit (int);
-+
-+volatile _Decimal32 f = 1.23456DF;
-+volatile _Decimal64 d = 1.23456DD;
-+
-+int
-+main (void)
-+{
-+  if ((_Decimal128)((_Decimal64)f * (_Decimal64)f) != (_Decimal128)(d * d))
-+    abort ();
-+  exit (0);
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/pr39034.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/pr39034.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/pr39034.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/pr39034.c	2009-02-25 14:08:55.493777000 -0800
-@@ -0,0 +1,110 @@
-+/* { dg-do run } */
-+/* { dg-options "-std=gnu99 -O" } */
-+
-+/* DFP TR 24732 == WG14 / N1176, N1312 */
-+
-+extern void abort (void);
-+int failures = 0;
-+
-+#ifdef DBG
-+#include <stdio.h>
-+#define FAILURE(MSG) { printf ("line %d: %s\n", __LINE__, MSG); failures++; }
-+#else
-+#define FAILURE(MSG) failures++;
-+#endif
-+
-+
-+/* Test runtime computations.  */
-+
-+void
-+runtime32 (void)
-+{
-+  volatile float v1 = 28.f, v2 = 3.f, v3 = 9.f, v4 = 31.f, v5 = 3.f, v6 = 10.f;
-+  float      b32 = (float)((v1/v2-v3) - (v4/v5-v6));
-+  _Decimal32 d32 = (float)((v1/v2-v3) - (v4/v5-v6));
-+
-+  if (b32)
-+    FAILURE ("runtime: b32 should be zero")
-+  if (d32)
-+    FAILURE ("runtime: d32 should be zero")
-+}
-+
-+void
-+runtime64 (void)
-+{
-+  volatile double v1 = 28., v2 = 3., v3 = 9., v4 = 31., v5 = 3., v6 = 10.;
-+  double     b64 = (double)((v1/v2-v3) - (v4/v5-v6));
-+  _Decimal64 d64 = (double)((v1/v2-v3) - (v4/v5-v6));
-+
-+  if (b64)
-+    FAILURE ("runtime: b64 should be zero")
-+  if (d64)
-+    FAILURE ("runtime: d64 should be zero")
-+}
-+
-+void
-+runtime128 (void)
-+{
-+  volatile long double v1 = 28.l, v2 = 3.l, v3 = 9.l,
-+                       v4 = 31.l, v5 = 3.l, v6 = 10.l;
-+  long double b128 = (long double)((v1/v2-v3) - (v4/v5-v6));
-+  _Decimal128 d128 = (long double)((v1/v2-v3) - (v4/v5-v6));
-+
-+  if (b128)
-+    FAILURE ("runtime: b128 should be zero")
-+  if (d128)
-+    FAILURE ("runtime: d128 should be zero")
-+}
-+
-+/* Test constant folding.  */
-+
-+void
-+fold32 (void)
-+{
-+  double     d32 = (float)((28.f/3.f-9.f) - (31.f/3.f-10.f));
-+  _Decimal32 b32 = (float)((28.f/3.f-9.f) - (31.f/3.f-10.f));
-+
-+  if (b32)
-+    FAILURE ("fold: b32 should be zero")
-+  if (d32)
-+    FAILURE ("fold: d32 should be zero")
-+}
-+
-+void
-+fold64 (void)
-+{
-+  double     b64 = (double)((28./3.-9.) - (31./3.-10.));
-+  _Decimal64 d64 = (double)((28./3.-9.) - (31./3.-10.));
-+
-+  if (b64)
-+    FAILURE ("fold: b64 should be zero")
-+  if (d64)
-+    FAILURE ("fold: d64 should be zero")
-+}
-+
-+void
-+fold128 (void)
-+{
-+  long double b128 = (long double)((28./3.-9.) - (31./3.-10.));
-+  _Decimal128 d128 = (long double)((28./3.-9.) - (31./3.-10.));
-+
-+  if (b128)
-+    FAILURE ("fold: b128 should be zero")
-+  if (d128)
-+    FAILURE ("fold: d128 should be zero")
-+}
-+
-+int
-+main ()
-+{
-+  runtime32 ();
-+  runtime64 ();
-+  runtime128 ();
-+  fold32 ();
-+  fold64 ();
-+  fold128 ();
-+
-+  if (failures != 0)
-+    abort ();
-+  return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/pr39035.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/pr39035.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/pr39035.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/pr39035.c	2009-02-09 10:51:31.855521000 -0800
-@@ -0,0 +1,81 @@
-+/* { dg-do run } */
-+/* { dg-options "-std=gnu99 -O" } */
-+
-+/* DFP TR 24732 == WG14 / N1176, N1312 */
-+/* Based on a test from Fred Tydeman.  */
-+
-+extern void abort (void);
-+int failures = 0;
-+
-+#ifdef DBG
-+#include <stdio.h>
-+#define FAILURE(MSG) { printf ("line %d: %s\n", __LINE__, MSG); failures++; }
-+#else
-+#define FAILURE(MSG) failures++;
-+#endif
-+
-+/* Test runtime computations.  */
-+
-+void
-+runtime32 (void)
-+{
-+  volatile _Decimal32 d;
-+  d = 0.0DF;
-+  if (d)
-+    FAILURE ("0.0DF should be zero")
-+}
-+
-+void
-+runtime64 (void)
-+{
-+  volatile _Decimal64 d;
-+  d = 0.0DD;
-+  if (d)
-+    FAILURE ("0.0DD should be zero")
-+}
-+
-+void
-+runtime128 (void)
-+{
-+  volatile _Decimal128 d;
-+  d = 0.0DL;
-+  if (d)
-+    FAILURE ("0.0DL should be zero")
-+}
-+
-+void
-+fold32 (void)
-+{
-+  if (0.0DF)
-+    FAILURE ("0.0DF should be zero")
-+}
-+
-+void
-+fold64 (void)
-+{
-+  if (0.0DD)
-+    FAILURE ("0.0DD should be zero")
-+}
-+
-+void
-+fold128 (void)
-+{
-+  if (0.0DL)
-+    FAILURE ("0.0DL should be zero")
-+}
-+
-+int
-+main(void)
-+{
-+  runtime32 ();
-+  runtime64 ();
-+  runtime128 ();
-+
-+  fold32 ();
-+  fold64 ();
-+  fold128 ();
-+
-+  if (failures != 0)
-+    abort ();
-+  return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/init-bad-4.c gcc-4.3.3/gcc/testsuite/gcc.dg/init-bad-4.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/init-bad-4.c	2006-04-21 16:02:26.000000000 -0700
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/init-bad-4.c	2009-02-17 05:00:40.440258000 -0800
-@@ -2,4 +2,4 @@
- /* Origin: Richard Guenther <rguenth@gcc.gnu.org> */
- /* { dg-do compile } */
- 
--struct A { } a = (struct A) {{ (X)0 }};  /* { dg-error "no members|extra brace|near|undeclared|constant|compound" } */
-+struct A { } a = (struct A) {{ (X)0 }};  /* { dg-error "no members|extra brace|near|undeclared|constant|compound|excess" } */
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/init-bad-6.c gcc-4.3.3/gcc/testsuite/gcc.dg/init-bad-6.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/init-bad-6.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/init-bad-6.c	2009-02-04 05:07:43.805620000 -0800
-@@ -0,0 +1,12 @@
-+/* ICE arising from bug computing composite type of zero-length array
-+   types: PR 35433.  */
-+/* { dg-do compile } */
-+/* { dg-options "" } */
-+
-+typedef int* X;
-+typedef int* Y;
-+
-+X (*p)[][0];
-+Y (*q)[][0];
-+
-+typeof(*(0 ? p : q)) x = { 0 }; /* { dg-warning "excess elements in array initializer|near initialization" } */
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/init-5.c gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/init-5.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/init-5.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/init-5.c	2009-02-17 05:00:40.440258000 -0800
-@@ -0,0 +1,4 @@
-+/* Test for ICE after syntax error in initializer with range
-+   designator: PR 35446.  */
-+
-+int a[2][2] = { [0 ... 1] = { ; } }; /* { dg-error "expected expression" } */
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/pr35444-1.c gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/pr35444-1.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/pr35444-1.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/pr35444-1.c	2009-02-13 05:10:52.921838000 -0800
-@@ -0,0 +1,3 @@
-+/* PR 35444: ICE from pending VLA sizes in invalid parameter list.  */
-+void foo(int n, int a[n], int 0); /* { dg-error "expected" } */
-+void bar() {}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/pr35444-2.c gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/pr35444-2.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/pr35444-2.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/pr35444-2.c	2009-02-13 05:10:52.921838000 -0800
-@@ -0,0 +1,4 @@
-+/* PR 35444: ICE from pending VLA sizes in invalid parameter list.
-+   Similar case to the PR, but with "..." before the syntax error.  */
-+void foo(int n, int a[n], ... 0); /* { dg-error "expected" } */
-+void bar() {}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.c	2009-01-30 14:36:22.577619000 -0800
-@@ -0,0 +1,112 @@
-+/* PR rtl-optimization/38245 */
-+/* { dg-do run } */
-+/* { dg-additional-sources "pr38245-4.c" } */
-+/* { dg-options "-O2" } */
-+
-+#include "pr38245-3.h"
-+
-+extern void abort (void);
-+
-+struct A { int i, j; union { short s[4]; long long l; }; char pad[512]; } a;
-+int globv = 6;
-+
-+void __attribute__((noinline))
-+f1 (void)
-+{
-+  a.s[2] = b1 (6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-+	       6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f2 (void)
-+{
-+  a.s[2] = b2 (6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-+	       6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f3 (void)
-+{
-+  struct B b = { 30, 31, { 32, 33 } };
-+  a.s[2] = b3 (6, 7, 8, 9, 10, 11, 12, b, 14, b, 16, b, 18, 19, 20, 21,
-+	       6, b, 8, b, 10, 11, 12, 13, 14, b, 16, b, 18, 19, 20, 21);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f4 (void)
-+{
-+  struct B b = { 30, 31, { 32, 33 } };
-+  a.s[2] = b4 (6, 7, 8, 9, 10, 11, 12, b, 14, b, 16, b, 18, 19, 20, 21,
-+	       6, b, 8, b, 10, 11, 12, 13, 14, b, 16, b, 18, 19, 20, 21);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f5 (void)
-+{
-+  a.s[2] = b5 (6.0, 7, 8, 9, 10, 11, 21.0, 22.0, 23.0);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f6 (void)
-+{
-+  a.s[2] = b6 (6.0, 7, 8, 9, 10, 11, 21.0, 22.0, 23.0);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f7 (void)
-+{
-+  a.s[2] = b7 (6, 7);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f8 (void)
-+{
-+  a.s[2] = b8 (6, 7);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f9 (void)
-+{
-+  a.s[2] = b9 (6, 7, 8, 9, 10, 11, 12);
-+  a.l = 6;
-+}
-+
-+void __attribute__((noinline))
-+f10 (void)
-+{
-+  a.s[2] = b10 (6, 7, 8, 9, 10, 11, 12);
-+  a.l = 6;
-+}
-+
-+int
-+main (void)
-+{
-+  char buf[256];
-+  int i;
-+  for (i = 0; i < (int) sizeof buf; i++)
-+    buf[i] = i;
-+  asm volatile ("" : : "r" (buf) : "memory");
-+  f1 ();
-+  f2 ();
-+  f3 ();
-+  f4 ();
-+  f5 ();
-+  f6 ();
-+  f7 ();
-+  f8 ();
-+  f9 ();
-+  f10 ();
-+  asm volatile ("" : : "r" (buf) : "memory");
-+  for (i = 0; i < (int) sizeof buf; i++)
-+    if (buf[i] != (char) i)
-+      abort ();
-+  return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.h gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.h
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.h	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.h	2009-01-30 14:36:22.577619000 -0800
-@@ -0,0 +1,35 @@
-+/* PR rtl-optimization/38245 */
-+
-+struct B { long a, b; char p[32]; };
-+extern int globv;
-+
-+extern int b1 (long long, long, long, long, long, long, long, long,
-+	       long long, long, long, long, long, long, long, long,
-+	       long long, long, long, long, long, long, long, long,
-+	       long long, long, long, long, long, long, long, long)
-+     __attribute__((pure, noinline));
-+extern int b2 (long long, long, long, long, long, long, long, long,
-+	       long long, long, long, long, long, long, long, long,
-+	       long long, long, long, long, long, long, long, long,
-+	       long long, long, long, long, long, long, long, long)
-+     __attribute__((const, noinline));
-+extern int b3 (long long, long, long, long, long, long, long, struct B,
-+	       long long, struct B, long, struct B, long, long, long, long,
-+	       long long, struct B, long, struct B, long, long, long, long,
-+	       long long, struct B, long, struct B, long, long, long, long)
-+     __attribute__((pure, noinline));
-+extern int b4 (long long, long, long, long, long, long, long, struct B,
-+	       long long, struct B, long, struct B, long, long, long, long,
-+	       long long, struct B, long, struct B, long, long, long, long,
-+	       long long, struct B, long, struct B, long, long, long, long)
-+     __attribute__((const, noinline));
-+extern int b5 () __attribute__((pure, noinline));
-+extern int b6 () __attribute__((const, noinline));
-+extern int b7 (int, int)
-+     __attribute__((pure, noinline));
-+extern int b8 (int, int)
-+     __attribute__((const, noinline));
-+extern int b9 (int, int, int, int, int, int, int)
-+     __attribute__((pure, noinline));
-+extern int b10 (int, int, int, int, int, int, int)
-+     __attribute__((const, noinline));
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-4.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-4.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-4.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-4.c	2009-01-30 14:36:22.577619000 -0800
-@@ -0,0 +1,107 @@
-+/* PR rtl-optimization/38245 */
-+/* { dg-do compile } */
-+/* { dg-options "" } */
-+
-+#include "pr38245-3.h"
-+
-+int
-+b1 (long long a1, long a2, long a3, long a4,
-+    long a5, long a6, long a7, long a8,
-+    long long a9, long a10, long a11, long a12,
-+    long a13, long a14, long a15, long a16,
-+    long long a17, long a18, long a19, long a20,
-+    long a21, long a22, long a23, long a24,
-+    long long a25, long a26, long a27, long a28,
-+    long a29, long a30, long a31, long a32)
-+{
-+  return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10
-+	 + a11 + a12 + a13 + a14 + a15 + a16 + a17 + a18 + a19 + a20
-+	 + a21 + a22 + a23 + a24 + a25 + a26 + a27 + a28 + a29 + a30
-+	 + a31 + a32 + globv;
-+}
-+
-+int
-+b2 (long long a1, long a2, long a3, long a4,
-+    long a5, long a6, long a7, long a8,
-+    long long a9, long a10, long a11, long a12,
-+    long a13, long a14, long a15, long a16,
-+    long long a17, long a18, long a19, long a20,
-+    long a21, long a22, long a23, long a24,
-+    long long a25, long a26, long a27, long a28,
-+    long a29, long a30, long a31, long a32)
-+{
-+  return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10
-+	 + a11 + a12 + a13 + a14 + a15 + a16 + a17 + a18 + a19 + a20
-+	 + a21 + a22 + a23 + a24 + a25 + a26 + a27 + a28 + a29 + a30
-+	 + a31 + a32;
-+}
-+
-+int
-+b3 (long long a1, long a2, long a3, long a4,
-+    long a5, long a6, long a7, struct B a8,
-+    long long a9, struct B a10, long a11, struct B a12,
-+    long a13, long a14, long a15, long a16,
-+    long long a17, struct B a18, long a19, struct B a20,
-+    long a21, long a22, long a23, long a24,
-+    long long a25, struct B a26, long a27, struct B a28,
-+    long a29, long a30, long a31, long a32)
-+{
-+  return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8.a + a9 + a10.a
-+	 + a11 + a12.a + a13 + a14 + a15 + a16 + a17 + a18.a + a19 + a20.a
-+	 + a21 + a22 + a23 + a24 + a25 + a26.a + a27 + a28.a + a29 + a30
-+	 + a31 + a32 + globv;
-+}
-+
-+int
-+b4 (long long a1, long a2, long a3, long a4,
-+    long a5, long a6, long a7, struct B a8,
-+    long long a9, struct B a10, long a11, struct B a12,
-+    long a13, long a14, long a15, long a16,
-+    long long a17, struct B a18, long a19, struct B a20,
-+    long a21, long a22, long a23, long a24,
-+    long long a25, struct B a26, long a27, struct B a28,
-+    long a29, long a30, long a31, long a32)
-+{
-+  return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8.a + a9 + a10.a
-+	 + a11 + a12.a + a13 + a14 + a15 + a16 + a17 + a18.a + a19 + a20.a
-+	 + a21 + a22 + a23 + a24 + a25 + a26.a + a27 + a28.a + a29 + a30
-+	 + a31 + a32;
-+}
-+
-+int
-+b5 (double a1, int a2, int a3, int a4, int a5, int a6, double a7,
-+    double a8, double a9)
-+{
-+  return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + globv;
-+}
-+
-+int
-+b6 (double a1, int a2, int a3, int a4, int a5, int a6, double a7,
-+    double a8, double a9)
-+{
-+  return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9;
-+}
-+
-+int
-+b7 (int a1, int a2)
-+{
-+  return a1 + a2 + globv;
-+}
-+
-+int
-+b8 (int a1, int a2)
-+{
-+  return a1 + a2;
-+}
-+
-+int
-+b9 (int a1, int a2, int a3, int a4, int a5, int a6, int a7)
-+{
-+  return a1 + a2 + a3 + a4 + a5 + a6 + a7 + globv;
-+}
-+
-+int
-+b10 (int a1, int a2, int a3, int a4, int a5, int a6, int a7)
-+{
-+  return a1 + a2 + a3 + a4 + a5 + a6 + a7;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38364.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38364.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38364.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38364.c	2009-01-30 14:36:22.577619000 -0800
-@@ -0,0 +1,79 @@
-+/* PR middle-end/38364 */
-+/* { dg-do run } */
-+/* { dg-options "-O2 -ftrapv" } */
-+
-+extern void abort (void);
-+
-+static inline short
-+f1 (short x, short y)
-+{
-+  if (x > 0)
-+    {
-+      if (y > 0)
-+	{
-+	  if (x > __SHRT_MAX__ / y)
-+	    return x;
-+	}
-+      else if (y < (-__SHRT_MAX__ - 1) / x)
-+	return x;
-+    }
-+  else
-+    {
-+      if (y > 0)
-+	{
-+	  if (x < (-__SHRT_MAX__ - 1) / y)
-+	    return x;
-+	}
-+      else if (x != 0 && y < __SHRT_MAX__ / x)
-+	return x;
-+    }
-+  return x * y;
-+}
-+
-+static inline signed char
-+f2 (signed char x, signed char y)
-+{
-+  if (((x ^ y) & (((x ^ ((x ^ y) & (1 << (__CHAR_BIT__ - 1)))) - y) ^ y)) < 0)
-+    return x;
-+  return x - y;
-+}
-+
-+unsigned int v;
-+
-+int
-+f3 (int x, unsigned int y)
-+{
-+  f1 (1, 1);
-+  return 1;
-+}
-+
-+int
-+f4 (unsigned short x)
-+{
-+  v = x;
-+  return 1;
-+}
-+
-+int
-+f5 (int x)
-+{
-+  if (f2 (x, 1))
-+    f1 (1, f4 (1));
-+  return x;
-+}
-+
-+int
-+f6 (unsigned int x)
-+{
-+  f4 (x < (1 != f5 (0)));
-+  return x;
-+}
-+
-+int
-+main (void)
-+{
-+  f6 (1);
-+  if (v != 0)
-+    abort ();
-+  return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38615.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38615.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38615.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38615.c	2009-01-27 10:45:49.519017000 -0800
-@@ -0,0 +1,19 @@
-+/* { dg-do run } */
-+
-+int t;
-+extern void abort (void);
-+
-+int f(int t, const int *a)
-+{
-+ const int b[] = { 1, 2, 3};
-+ if (!t)
-+   return f(1, b);
-+ return b == a;
-+}
-+
-+int main(void)
-+{
-+ if (f(0, 0))
-+   abort ();
-+ return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38902.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38902.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38902.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38902.c	2009-01-24 07:31:13.971031000 -0800
-@@ -0,0 +1,131 @@
-+/* PR target/38902 */
-+/* { dg-do run } */
-+/* { dg-options "-O2 -fstack-protector" } */
-+/* { dg-require-effective-target fstack_protector } */
-+
-+#ifdef DEBUG
-+#include <stdio.h>
-+#define debug(format, args...) printf (format , ## args)
-+#else
-+extern int sprintf (char *, const char *, ...);
-+#define debug(format, args...)
-+#endif
-+
-+extern void abort (void);
-+
-+/*
-+
-+Copyright (C) 2009 Canonical, Ltd.
-+Author: Kees Cook <kees@ubuntu.com>
-+License: GPLv3
-+
-+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38616
-+https://bugs.launchpad.net/ubuntu/+source/gcc-4.3/+bug/316019
-+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38902
-+
-+gcc -O2 -fstack-protector truncate.c -o truncate
-+
-+    Broken:
-+
-+        Only the first operation fails, so create a new function for each test.
-+        Source must be local (literal or stack)
-+
-+        __builtin_memmove
-+        __builtin_memcpy
-+        __builtin_strcpy  (optimized to __builtin_memcpy?)
-+        sprintf (direct)  (optmized to __builtin_strcpy?)
-+        sprintf (via %s)  (optmized to __builtin_strcpy?)
-+
-+    OK:
-+        __builtin_strcat
-+        sprintf (complex format)
-+
-+ */
-+
-+char *heap = "1234567890abcdefghijklmnopqrstuvwxyz";
-+
-+int failed = 0;
-+
-+#define CHECK(count, a...) \
-+void test##count (void) \
-+{ \
-+  char *local = "1234567890abcdefghijklmnopqrstuvwxyz"; \
-+  char buffer[1024]=""; \
-+    a; \
-+    if (__builtin_strcmp(buffer, heap) == 0) { \
-+        debug("Okay(%d):\n\t%s\n", count, # a); \
-+    } \
-+    else { \
-+        debug("Failed(%d):\n\t%s\n", count, # a); \
-+	failed++; \
-+    } \
-+}
-+
-+
-+CHECK( 0, __builtin_memcpy (buffer, "1234567890abcdefghijklmnopqrstuvwxyz", __builtin_strlen("1234567890abcdefghijklmnopqrstuvwxyz")+1);                                        );
-+CHECK( 1, __builtin_memcpy (buffer, local, __builtin_strlen(local)+1);                );
-+CHECK( 2, __builtin_memcpy (buffer, heap, __builtin_strlen(heap)+1);                );
-+
-+CHECK( 3, __builtin_memmove (buffer, "1234567890abcdefghijklmnopqrstuvwxyz", __builtin_strlen("1234567890abcdefghijklmnopqrstuvwxyz")+1);                                       );
-+CHECK( 4, __builtin_memmove (buffer, local, __builtin_strlen(local)+1);               );
-+CHECK( 5, __builtin_memmove (buffer, heap, __builtin_strlen(heap)+1);               );
-+
-+CHECK( 6, __builtin_strcpy (buffer, "1234567890abcdefghijklmnopqrstuvwxyz");          );
-+CHECK( 7, __builtin_strcpy (buffer, local);                                      );
-+CHECK( 8, __builtin_strcpy (buffer, heap);                                      );
-+
-+CHECK( 9,  sprintf (buffer, "1234567890abcdefghijklmnopqrstuvwxyz");         );
-+CHECK(10,  sprintf (buffer, local);                                     );
-+CHECK(11,  sprintf (buffer, heap);                                     );
-+
-+CHECK(12,  sprintf (buffer, "%s", "1234567890abcdefghijklmnopqrstuvwxyz");   );
-+CHECK(13,  sprintf (buffer, "%s", local);                               );
-+CHECK(14,  sprintf (buffer, "%s", heap);                               );
-+
-+CHECK(15, __builtin_strcat (buffer, "1234567890abcdefghijklmnopqrstuvwxyz");          );
-+CHECK(16, __builtin_strcat (buffer, local);                                      );
-+CHECK(17, __builtin_strcat (buffer, heap);                                       );
-+
-+void mongoose(void)
-+{
-+  char buffer[1024]="";
-+  sprintf (buffer, "%s", "1234567890abcdefghijklmnopqrstuvwxyz");;
-+    if (__builtin_strcmp(buffer, heap) == 0) {
-+        debug("Okay(%d):\n\t%s\n", -1, "sprintf (buffer, \"%s\", \"1234567890abcdefghijklmnopqrstuvwxyz\");");
-+    }
-+    else {
-+        debug("Failed(%d):\n\t%s\n", -1, "sprintf (buffer, \"%s\", \"1234567890abcdefghijklmnopqrstuvwxyz\");");
-+	failed++;
-+    }
-+}
-+
-+int main (int argc, char *argv[])
-+{
-+  test0();
-+  test1();
-+  test2();
-+  test3();
-+  test4();
-+  test5();
-+  test6();
-+  test7();
-+  test8();
-+  test9();
-+  test10();
-+  test11();
-+
-+  // wtf, why are these different?!
-+  test12();
-+  mongoose();
-+
-+  test13();
-+  test14();
-+  test15();
-+  test16();
-+  test17();
-+
-+  if (failed)
-+    abort ();
-+
-+  return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38932.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38932.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38932.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38932.c	2009-01-26 07:54:18.800086000 -0800
-@@ -0,0 +1,19 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+/* This variable needed only to exercise FRE instead of CCP.  */
-+unsigned char g;
-+
-+extern void abort();
-+
-+void f (long long int p)
-+{
-+  g = 255;
-+  if (p >= (-9223372036854775807LL - 1) - (signed char) g)
-+    p = 1;
-+
-+  if (p)
-+    abort ();
-+}
-+
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr39084.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr39084.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr39084.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr39084.c	2009-02-10 08:45:37.511311000 -0800
-@@ -0,0 +1,11 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+struct color { int i; };
-+static const struct color col;
-+struct color * f(void)
-+{
-+    return (struct color *) &col;
-+}
-+
-+struct color { int j; }; /* { dg-error "redefinition of" } */
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_global.c gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_global.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_global.c	2007-12-13 05:47:22.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_global.c	2009-02-15 00:09:49.211979000 -0800
-@@ -25,7 +25,9 @@
-   if (str.a != res)
-     abort ();
- 
--  return str.a;
-+  /* POSIX ignores all but the 8 low-order bits, but other
-+     environments may not.  */
-+  return (str.a & 255);
- }
- 
- /*--------------------------------------------------------------------------*/
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_local.c gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_local.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_local.c	2007-12-13 05:47:22.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_local.c	2009-02-15 00:09:49.211979000 -0800
-@@ -25,7 +25,9 @@
-   if (str.a != res)
-     abort ();
- 
--  return str.a;
-+  /* POSIX ignores all but the 8 low-order bits, but other
-+     environments may not.  */
-+  return (str.a & 255);
- }
- 
- /*--------------------------------------------------------------------------*/
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_pointer.c gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_pointer.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_pointer.c	2007-12-13 05:47:22.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_pointer.c	2009-02-15 00:09:49.211979000 -0800
-@@ -29,7 +29,9 @@
-   if (p->a != res)
-     abort ();
-   
--  return p->a;
-+  /* POSIX ignores all but the 8 low-order bits, but other
-+     environments may not.  */
-+  return (p->a & 255);
- }
- 
- /*--------------------------------------------------------------------------*/
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/w_prof_single_str_global.c gcc-4.3.3/gcc/testsuite/gcc.dg/struct/w_prof_single_str_global.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/w_prof_single_str_global.c	2007-12-13 05:47:22.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/struct/w_prof_single_str_global.c	2009-02-15 00:09:49.211979000 -0800
-@@ -22,7 +22,9 @@
-   if (str.a != res)
-     abort ();
- 
--  return str.a;
-+  /* POSIX ignores all but the 8 low-order bits, but other
-+     environments may not.  */
-+  return (str.a & 255);
- }
- 
- /*--------------------------------------------------------------------------*/
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tls/diag-6.c gcc-4.3.3/gcc/testsuite/gcc.dg/tls/diag-6.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tls/diag-6.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/tls/diag-6.c	2009-02-05 04:13:52.859351000 -0800
-@@ -0,0 +1,8 @@
-+/* Invalid tls_model attributes.  PR 35435.  */
-+/* { dg-require-effective-target tls } */
-+
-+int v __attribute__((tls_model("initial-exec"))); /* { dg-warning "attribute ignored" } */
-+typedef int X __attribute__((tls_model("initial-exec"))); /* { dg-warning "attribute ignored" } */
-+void f(int x __attribute__((tls_model("initial-exec")))); /* { dg-warning "attribute ignored" } */
-+__thread int a __attribute__((tls_model(1))); /* { dg-error "tls_model argument not a string" } */
-+__thread int b __attribute__((tls_model("unknown"))); /* { dg-error "tls_model argument must be one of" } */
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/torture/pr39241.c gcc-4.3.3/gcc/testsuite/gcc.dg/torture/pr39241.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/torture/pr39241.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/torture/pr39241.c	2009-02-25 10:55:14.218944000 -0800
-@@ -0,0 +1,16 @@
-+/* { dg-do compile } */
-+/* { dg-options "-w" } */
-+
-+static inline int
-+foo (float f)
-+{
-+  return *((int *) &f) - 1;
-+}
-+
-+float
-+bar (float x, float y, float *z)
-+{
-+  float c = y < 0.002f ? 0.002f : y;
-+  float d = x < c ? c : x;
-+  return z[foo (c)] + z[foo (d * 255.0f)];
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c gcc-4.3.3/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c	2009-01-30 09:31:24.050790000 -0800
-@@ -0,0 +1,15 @@
-+/* { dg-do "compile" } */
-+/* { dg-options "-O2 -fdump-tree-fre" } */
-+
-+struct S { float f; };
-+int __attribute__((noinline))
-+foo (float *r, struct S *p)
-+{
-+  int *q = (int *)&p->f;
-+  int i = *q;
-+  *r = 0.0;
-+  return i + *q;
-+}
-+
-+/* { dg-final { scan-tree-dump-times "\\\*q" 1 "fre" } } */
-+/* { dg-final { cleanup-tree-dump "fre" } } */
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr36578-1.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr36578-1.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr36578-1.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr36578-1.c	2009-02-25 14:08:55.493777000 -0800
-@@ -0,0 +1,22 @@
-+/* Test for unsafe floating-point conversions.  PR 36578.  */
-+/* { dg-do run } */
-+/* { dg-options "-msse2 -mfpmath=sse" } */
-+
-+#include "sse2-check.h"
-+
-+extern void abort (void);
-+extern void exit (int);
-+extern int printf(const char *, ...);
-+
-+volatile double d1 = 1.0;
-+volatile double d2 = 0x1.00001p-53;
-+volatile double d3;
-+
-+static void
-+sse2_test (void)
-+{
-+  d3 = (double)((long double)d1 + (long double)d2);
-+  if (d3 != d1)
-+    abort ();
-+  exit (0);
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr36578-2.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr36578-2.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr36578-2.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr36578-2.c	2009-02-25 14:08:55.493777000 -0800
-@@ -0,0 +1,23 @@
-+/* Test for unsafe floating-point conversions.  */
-+/* { dg-do run } */
-+/* { dg-options "-msse2 -mfpmath=sse" } */
-+
-+#include "sse2-check.h"
-+
-+extern void abort (void);
-+extern void exit (int);
-+extern int printf(const char *, ...);
-+
-+volatile double d1 = 0x1.000001p0;
-+volatile double d2 = 0x1p-54;
-+volatile float f = 0x1.000002p0f;
-+volatile float f2;
-+
-+static void
-+sse2_test (void)
-+{
-+  f2 = (float)((long double)d1 + (long double)d2);
-+  if (f != f2)
-+    abort ();
-+  exit (0);
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38931.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38931.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38931.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38931.c	2009-01-25 04:26:15.714544000 -0800
-@@ -0,0 +1,23 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O2 -msse" } */
-+
-+typedef int __m64 __attribute__ ((__vector_size__ (8)));
-+
-+extern __m64 foo () ;
-+
-+void bar (const int input_bpl, const unsigned char *input,
-+	  unsigned char *output, unsigned long x1)
-+{
-+  unsigned char *pix_end_ptr = output + x1 * 4;
-+  __m64 m_original = { 0, 0 };
-+  __m64 m_base_addr = __builtin_ia32_vec_init_v2si (0, input_bpl);
-+  __m64 m_addr = __builtin_ia32_paddd (m_original, m_base_addr);
-+  __m64 *a0 = (__m64 *) input;
-+
-+  for (; output < pix_end_ptr; output += 4)
-+    {
-+      a0 = (__m64 *) (input + __builtin_ia32_vec_ext_v2si (m_addr, 0));
-+      m_addr = foo ();
-+      __builtin_prefetch (a0, 0);
-+    }
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38988.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38988.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38988.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38988.c	2009-01-29 02:05:17.651873000 -0800
-@@ -0,0 +1,24 @@
-+/* { dg-do compile } */
-+/* { dg-require-effective-target lp64 } */
-+/* { dg-require-effective-target fpic } */
-+/* { dg-options "-O2 -fpic -mcmodel=large" } */
-+
-+typedef long unsigned int size_t;
-+typedef void (*func_ptr) (void);
-+
-+static func_ptr __DTOR_LIST__[1] = { (func_ptr) (-1) };
-+
-+void
-+__do_global_dtors_aux (void)
-+{
-+  extern func_ptr __DTOR_END__[];
-+  size_t dtor_idx = 0;
-+  const size_t max_idx = __DTOR_END__ - __DTOR_LIST__ - 1;
-+  func_ptr f;
-+
-+  while (dtor_idx < max_idx)
-+    {
-+      f = __DTOR_LIST__[++dtor_idx];
-+      f ();
-+    }
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr39058.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr39058.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr39058.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr39058.c	2009-02-25 23:06:48.803473000 -0800
-@@ -0,0 +1,34 @@
-+/* PR inline-asm/39058 */
-+/* { dg-options "-O2" } */
-+
-+double
-+f1 ()
-+{
-+  double x;
-+  asm ("" : "=r,r" (x) : "0,0" (x));
-+  return x;
-+}
-+
-+double
-+f2 ()
-+{
-+  double x;
-+  asm ("" : "=r" (x) : "0" (x));
-+  return x;
-+}
-+
-+double
-+f3 ()
-+{
-+  double x, y;
-+  asm ("" : "=r,r" (x), "=r,r" (y) : "%0,0" (x), "r,r" (0));
-+  return x;
-+}
-+
-+double
-+f4 ()
-+{
-+  double x, y;
-+  asm ("" : "=r" (x), "=r" (y) : "0" (x), "r" (0));
-+  return x;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/ia64/sibcall-opt-1.c gcc-4.3.3/gcc/testsuite/gcc.target/ia64/sibcall-opt-1.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.target/ia64/sibcall-opt-1.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.target/ia64/sibcall-opt-1.c	2009-02-20 09:18:20.718912000 -0800
-@@ -0,0 +1,12 @@
-+/* PR target/38056.  Do not do sibcall optimization across object file
-+   boundery when -mconstant-gp is not used.  */
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+/* { dg-final { scan-assembler "br.call.*bar" } } */
-+
-+int bar(int x);
-+
-+int foo(int x)
-+{
-+  return (bar(x + 1));
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/ia64/sibcall-opt-2.c gcc-4.3.3/gcc/testsuite/gcc.target/ia64/sibcall-opt-2.c
---- gcc-4.3.3.orig/gcc/testsuite/gcc.target/ia64/sibcall-opt-2.c	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gcc.target/ia64/sibcall-opt-2.c	2009-02-20 09:18:20.718912000 -0800
-@@ -0,0 +1,12 @@
-+/* PR target/38056.  Do sibcall optimization across object file
-+   boundery when -mconstant-gp is used.  */
-+/* { dg-do compile } */
-+/* { dg-options "-O2 -mconstant-gp" } */
-+/* { dg-final { scan-assembler-not "br.call.*bar" } } */
-+
-+int bar(int x);
-+
-+int foo(int x)
-+{
-+  return (bar(x + 1));
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/cpp0x/decltype16.C gcc-4.3.3/gcc/testsuite/g++.dg/cpp0x/decltype16.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/cpp0x/decltype16.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/cpp0x/decltype16.C	2009-02-13 13:53:38.261573000 -0800
-@@ -0,0 +1,10 @@
-+// PR c++/39070
-+// { dg-options "-std=c++0x" }
-+
-+template<typename X> struct junk {
-+   template<typename Z> static Z y();
-+   template<typename Y> static int  test(...);
-+   template<typename Y> static char test(decltype(y<Y>())*);
-+   static int const value=sizeof(test<X>(0));
-+};
-+typedef char type[junk<int>::value==sizeof(char) ? 1 : -1];
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/other/pr38706.C gcc-4.3.3/gcc/testsuite/g++.dg/other/pr38706.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/other/pr38706.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/other/pr38706.C	2009-01-27 03:39:42.241832000 -0800
-@@ -0,0 +1,19 @@
-+// PR target/38706
-+// { dg-do compile }
-+// { dg-options "-O2" }
-+
-+class ios_base
-+{
-+public:
-+  virtual ~ios_base ();
-+
-+};
-+
-+class istrstream:virtual public ios_base
-+{
-+public:
-+  virtual ~istrstream ();
-+
-+};
-+
-+istrstream::~istrstream () {}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor14.C gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor14.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor14.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor14.C	2009-02-02 11:57:29.682708000 -0800
-@@ -0,0 +1,8 @@
-+// PR c++/39054
-+
-+struct A {};
-+
-+template<typename> void foo()
-+{ 
-+  A().~int();			// { dg-error "expected" }
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor15.C gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor15.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor15.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor15.C	2009-02-20 07:21:51.443104000 -0800
-@@ -0,0 +1,16 @@
-+// PR c++/39225
-+
-+template <class T>
-+class A
-+{
-+public:
-+    A() {}
-+    ~B() {}			// { dg-error "~B" }
-+};
-+
-+int main()
-+{
-+    A<int> *a = new A<int>;
-+
-+    return 0;
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/array20.C gcc-4.3.3/gcc/testsuite/g++.dg/template/array20.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/array20.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/array20.C	2009-02-17 10:27:32.576290000 -0800
-@@ -0,0 +1,10 @@
-+// PR c++/38950
-+
-+template <typename T, T N> void f(T(&)[N]);
-+
-+int main() {
-+    int x[2];
-+    unsigned int y[2];
-+    f(x); // works
-+    f(y); // ICE
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dependent-name5.C gcc-4.3.3/gcc/testsuite/g++.dg/template/dependent-name5.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dependent-name5.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/dependent-name5.C	2009-03-04 11:37:43.898064000 -0800
-@@ -0,0 +1,45 @@
-+// PR c++/9634, c++/29469, c++/29607
-+// Contributed by: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
-+// DR224: Make sure that a name is *truly* semantically dependent.
-+
-+struct D {
-+  typedef int K;
-+};
-+
-+template <typename T>
-+struct A
-+{
-+  typedef int Bar;
-+
-+  template <typename>
-+  struct N {};
-+
-+  typedef Bar          type1;
-+  typedef A::Bar       type2;
-+  typedef A<T>::Bar    type3;
-+  typedef A<T*>::Bar    type4;  // { dg-error "" }
-+  typedef typename A<T*>::Bar type5;
-+
-+  typedef N<int>       type6;
-+  typedef A::N<int>    type7;
-+  typedef A<T>::N<int> type8;
-+  typedef A<T*>::template N<int> type9;  // { dg-error "" }
-+  typedef typename A<T*>::template N<int> type10;
-+
-+  typedef D Bar2;
-+  struct N2 { typedef int K; };
-+
-+  // Check that A::N2 is still considered dependent (because it
-+  //  could be specialized), while A::Bar2 (being just ::D) is not.
-+  typedef A::Bar2 type11;
-+  typedef type11::K k3;
-+
-+  typedef A::N2 type12;
-+  typedef typename type12::K k2;
-+  typedef type12::K k1;  // { dg-error "" }
-+
-+  // Check that A::Bar2 is not considered dependent even if we use
-+  // the typename keyword.
-+  typedef typename A::Bar2 type13;
-+  typedef type13::K k4;
-+};
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dtor5.C gcc-4.3.3/gcc/testsuite/g++.dg/template/dtor5.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dtor5.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/dtor5.C	2009-01-26 10:24:45.754928000 -0800
-@@ -0,0 +1,21 @@
-+// PR c++/23287
-+
-+template <class T> struct A
-+{
-+  int i;
-+  ~A();
-+}; 
-+
-+template <class T> void f(A<T> *ap) {
-+  ap->~A(); 
-+} 
-+
-+template <class T> void g(A<T> *ap) {
-+  ap->~B(); 			// { dg-error "destructor name" }
-+} 
-+
-+int main()
-+{
-+  f(new A<int>);
-+  g(new A<int>);
-+}
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/func2.C gcc-4.3.3/gcc/testsuite/g++.dg/template/func2.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/func2.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/func2.C	2009-02-03 07:56:05.128711000 -0800
-@@ -0,0 +1,12 @@
-+// { dg-do compile }
-+
-+typedef void (*fptr)();
-+fptr zeroptr = 0;
-+template<typename T, fptr F> struct foo { };
-+template<typename T> struct foo<T,zeroptr> { };
-+// { dg-error "not a valid template argument" "not valid" { target *-*-* } 6 } 
-+// { dg-error "must be the address" "must be the address " { target *-*-* } 6 }
-+
-+// The rest is needed to trigger the ICE in 4.0 to 4.3:
-+void f() { }
-+foo<int,&f> m_foo;
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/pr39425.C gcc-4.3.3/gcc/testsuite/g++.dg/template/pr39425.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/pr39425.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/pr39425.C	2009-03-18 08:00:32.834440000 -0700
-@@ -0,0 +1,18 @@
-+// PR c++/39425
-+// { dg-do compile }
-+
-+class a {
-+
-+  template<unsigned int s>
-+    struct _rec {
-+      static const char size = _rec< (s >> 1) >::size;
-+    };
-+
-+  template<>	// { dg-error "explicit" }
-+  struct _rec <0> {
-+    static const char size = 0;
-+  };
-+
-+  static const unsigned int value = _rec < 1 >::size;
-+
-+}		// { dg-error "unqualified-id" }
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/spec33.C gcc-4.3.3/gcc/testsuite/g++.dg/template/spec33.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/spec33.C	2006-09-25 12:58:10.000000000 -0700
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/spec33.C	2009-03-18 08:00:32.834440000 -0700
-@@ -3,5 +3,5 @@
- struct A
- {
-     template<int> static void foo   () {}
--    template<>    static void foo<0>() {}  // { dg-error "explicit" }
-+    template<>    static void foo<0>() {}  // { dg-error "explicit|template" }
- }; 
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename15.C gcc-4.3.3/gcc/testsuite/g++.dg/template/typename15.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename15.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/typename15.C	2009-02-03 07:56:05.128711000 -0800
-@@ -0,0 +1,12 @@
-+// PR37314 ice-on-valid-code, from w.doeringer
-+template <typename T>
-+class Cdeque {
-+    typedef T *pointer;
-+    class iterator {
-+        typedef typename Cdeque<T>::pointer pointer;
-+        pointer operator->();
-+    };
-+};
-+template <typename T> T* Cdeque<T>::iterator::operator->() { }
-+
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename16.C gcc-4.3.3/gcc/testsuite/g++.dg/template/typename16.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename16.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/typename16.C	2009-02-03 07:56:05.128711000 -0800
-@@ -0,0 +1,25 @@
-+// PR37314 rejects-valid, from w.doeringer
-+template <typename T>
-+struct A {
-+  typedef __PTRDIFF_TYPE__ difference_type;
-+  struct B {
-+    typedef typename A<T>::difference_type difference_type;
-+    difference_type operator-(B const&) const; 
-+    T t;
-+  };
-+};
-+// 
-+
-+template <typename T>
-+typename A<T>::B::difference_type A<T>::B::operator-(B const&) const {
-+  return -1;
-+} 
-+
-+//
-+int main() {
-+  A<int>::B i;
-+  ++i.t;
-+  return 0;
-+}
-+
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/torture/pr38745.C gcc-4.3.3/gcc/testsuite/g++.dg/torture/pr38745.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/torture/pr38745.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/torture/pr38745.C	2009-01-30 09:31:24.050790000 -0800
-@@ -0,0 +1,36 @@
-+/* { dg-do compile } */
-+
-+union u_u16
-+{
-+  unsigned short v;
-+  struct
-+    {
-+      unsigned char lo8, hi8;
-+    } __attribute__ ((__may_alias__)) u;
-+} __attribute__ ((__may_alias__));
-+union u_u32
-+{
-+  unsigned int v;
-+  struct
-+    {
-+      u_u16 lo16, hi16;
-+    } u;
-+} __attribute__ ((__may_alias__));
-+union u_u64
-+{
-+  struct
-+    {
-+      u_u32 lo32, hi32;
-+    } u;
-+};
-+struct Record
-+{
-+};
-+long long
-+UnpackFullKey (Record & rec, const char *&p)
-+{
-+  long long c64 = 0;
-+  (*(u_u16 *) & (*(u_u32 *) & ( *(u_u64*)&c64).u.lo32.v).u.lo16.v).u.hi8 = 1;
-+  return c64;
-+}
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C	2009-01-30 09:31:24.050790000 -0800
-@@ -0,0 +1,29 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O2 -Wstrict-aliasing" } */
-+
-+inline void *operator new (__SIZE_TYPE__, void *__p) throw() { return __p; }
-+
-+struct Y {
-+  Y() {}
-+  int i;
-+};
-+
-+struct X {
-+  X() {}
-+  void construct(const Y& y)
-+  {
-+    new (&m_data[0]) Y(y);
-+  }
-+  bool initialized;
-+  char m_data[sizeof (Y)];
-+};
-+
-+void bar(const X&);
-+void foo(Y& y)
-+{
-+  X x;
-+  x.construct(y);
-+  x.initialized = true;
-+  bar(x);
-+}
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C	2009-01-30 09:31:24.050790000 -0800
-@@ -0,0 +1,15 @@
-+/* { dg-options "-O2 -Wuninitialized" } */
-+
-+struct Empty { Empty() {} }; /* { dg-bogus "uninitialized" } */
-+struct Other {
-+    Other(const Empty& e_) : e(e_) {}
-+    Empty e;
-+};
-+void bar(Other&);
-+void foo()
-+{
-+  Empty e;
-+  Other o(e);
-+  bar(o);
-+}
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C	2009-01-29 09:43:14.166860000 -0800
-@@ -0,0 +1,53 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O -Wuninitialized" } */
-+
-+struct S8 { template<typename T> S8(T) { } };
-+
-+template<typename T> struct S10;
-+template<typename T> struct S10<T()> { typedef T S12; typedef S8 S1(); };
-+
-+template<typename T> struct S3 { };
-+template<typename T> struct S11 { S11(S3<T>); };
-+
-+struct S2
-+{
-+  template<typename T> operator S11<T>() { return S11<T>(S5<T>()); }
-+  template<typename T> struct S5:public S3<T>
-+  {
-+    virtual typename S10<T>::S12 S13() {
-+      return 0;
-+    }
-+  };
-+};
-+
-+template<typename T> S11<T> S6(S3<T>) { return S11<T>(S3<T>()); }
-+template<typename S12> struct S7 { typedef S12 S15(); };
-+
-+struct S4
-+{
-+  template<typename T> operator S11<T>()
-+  {
-+    struct S14:public S3<T>
-+    { 
-+      S14(S2 x):S11_(x) { }
-+      S11<typename S7<typename S10<T>::S12>::S15> S11_;
-+    };
-+    return S6(S14(S11_));
-+  }
-+  S2 S11_;
-+};
-+
-+struct S9
-+{
-+  template<typename F> operator S11<F>() { return S11<F>(S14<F>(S11_)); }
-+  template<typename F> struct S14:public S3<F>
-+  {
-+    S14(S4 x):S11_(x) { }
-+    S11<typename S10<F>::S1> S11_;
-+  };
-+  S4 S11_;
-+};
-+
-+void S15(S11<void()>);
-+void S16() { S9 x; S15(x); }
-+
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bound_6.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/bound_6.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bound_6.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/bound_6.f90	2009-02-18 22:43:15.919035000 -0800
-@@ -0,0 +1,48 @@
-+! { dg-do run }
-+! Test the fix for PR38852 and PR39006 in which LBOUND did not work
-+! for some arrays with negative strides.
-+!
-+! Contributed by Dick Hendrickson  <dick.hendrickson@gmail.com>
-+! and Clive Page <clivegpage@googlemail.com>
-+!
-+program try_je0031
-+  integer ida(4)
-+  real dda(5,5,5,5,5)
-+  integer, parameter :: nx = 4, ny = 3
-+  integer :: array1(nx,ny), array2(nx,ny) 
-+  data array2 / 1,2,3,4, 10,20,30,40, 100,200,300,400 /
-+  array1 = array2
-+  call PR38852(IDA,DDA,2,5,-2)
-+  call PR39006(array1, array2(:,ny:1:-1))
-+contains
-+  subroutine PR39006(array1, array2)
-+    integer, intent(in) :: array1(:,:), array2(:,:)
-+    integer :: j
-+    do j = 1, ubound(array2,2)
-+      if (any (array1(:,j) .ne. array2(:,4-j))) call abort
-+    end do
-+  end subroutine
-+end 
-+
-+SUBROUTINE PR38852(IDA,DDA,nf2,nf5,mf2)
-+  INTEGER IDA(4)
-+  REAL DLA(:,:,:,:)
-+  REAL DDA(5,5,5,5,5)
-+  POINTER DLA
-+  TARGET DDA
-+  DLA => DDA(2:3, 1:3:2, 5:4:-1, NF2, NF5:NF2:MF2)
-+  IDA = UBOUND(DLA)
-+  if (any(ida /= 2)) call abort
-+  DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2)
-+  IDA = UBOUND(DLA)
-+  if (any(ida /= 2)) call abort
-+!
-+! These worked.
-+!
-+  DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2)
-+  IDA = shape(DLA)
-+  if (any(ida /= 2)) call abort
-+  DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2)
-+  IDA = LBOUND(DLA)
-+  if (any(ida /= 1)) call abort
-+END SUBROUTINE
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bounds_5.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/bounds_5.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bounds_5.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/bounds_5.f90	2009-01-25 21:43:44.109708000 -0800
-@@ -0,0 +1,26 @@
-+! { dg-do run }
-+!
-+! PR fortran/38859
-+! Wrong bounds simplification
-+!
-+! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
-+
-+       type x
-+         integer I
-+       end type x
-+       type (x) A(0:5, 2:8)
-+       integer ida(2)
-+
-+       ida = lbound(a)
-+       if (any(ida /= (/0,2/))) call abort
-+
-+       ida = lbound(a%i)
-+       if (any(ida /= (/1,1/))) call abort
-+
-+       ida = ubound(a)
-+       if (any(ida /= (/5,8/))) call abort
-+       
-+       ida = ubound(a%i)
-+       if (any(ida /= (/6,7/))) call abort
-+
-+       end
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90	2009-01-24 13:49:28.036442000 -0800
-@@ -0,0 +1,11 @@
-+! { dg-do compile }
-+! PR 38672 - this used to ICE.
-+MODULE globals
-+  TYPE :: type1
-+     integer :: x
-+  END TYPE type1
-+  TYPE (type1) :: pdm_bps
-+END module globals
-+BLOCK DATA
-+   use globals
-+END BLOCK DATA
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90	2009-01-24 13:49:28.036442000 -0800
-@@ -0,0 +1,17 @@
-+! { dg-do compile }
-+MODULE globals
-+  TYPE :: type1
-+     sequence
-+     integer :: x
-+  END TYPE type1
-+  TYPE (type1) :: pdm_bps
-+  common /co/ pdm_bps
-+END module globals
-+BLOCK DATA
-+   use globals
-+END BLOCK DATA
-+
-+program main
-+  use globals
-+  common /co/ pdm_bps ! { dg-error "already in a COMMON block" }
-+end program main
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90	2009-01-25 22:15:41.225652000 -0800
-@@ -0,0 +1,41 @@
-+! { dg-do run }
-+! Tests the fix for PR38907, in which any expressions, including unary plus,
-+! in front of the call to S_REAL_SUM_I (marked) would throw the mechanism
-+! for correcting invalid host association.
-+!
-+! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
-+!
-+module sa0054_stuff
-+  REAL :: S_REAL_SUM_2(10) = [(REAL (I), I = 1, 10)]
-+contains
-+  ELEMENTAL FUNCTION S_REAL_SUM_I (A)
-+    REAL  ::  S_REAL_SUM_I
-+    REAL, INTENT(IN)  ::  A
-+    X = 1.0
-+    S_REAL_SUM_I = X
-+  END FUNCTION S_REAL_SUM_I
-+  SUBROUTINE SA0054 (RDA)
-+    REAL RDA(:)
-+    RDA =  + S_REAL_SUM_I (RDA)          ! Reported problem => ICE
-+    RDA = RDA + S_REAL_SUM_2 (INT (RDA)) ! Also failed
-+  CONTAINS
-+    ELEMENTAL FUNCTION S_REAL_SUM_I (A)
-+      REAL  ::  S_REAL_SUM_I
-+      REAL, INTENT(IN)  ::  A
-+      S_REAL_SUM_I = 2.0 * A
-+    END FUNCTION S_REAL_SUM_I
-+    ELEMENTAL FUNCTION S_REAL_SUM_2 (A)
-+      REAL  ::  S_REAL_SUM_2
-+      INTEGER, INTENT(IN)  ::  A
-+      S_REAL_SUM_2 = 2.0 * A
-+    END FUNCTION S_REAL_SUM_2
-+  END SUBROUTINE
-+end module sa0054_stuff
-+
-+  use sa0054_stuff
-+  REAL :: RDA(10) = [(REAL(I), I = 1, 10)]
-+  call SA0054 (RDA)
-+  IF (ANY (INT (RDA) .ne. [(6 * I, I = 1, 10)])) print *, rda
-+END
-+
-+! { dg-final { cleanup-modules "sa0054_stuff" } }
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/initialization_22.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/initialization_22.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/initialization_22.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/initialization_22.f90	2009-03-07 07:56:37.773017000 -0800
-@@ -0,0 +1,10 @@
-+! { dg-do run }
-+! tests the fix for PR39292, where the intitialization expression
-+! did not simplify and caused an ICE in gfc_conv_array_initializer.
-+!
-+! Contributed by Richard Guenther <rguenth@gcc.gnu.org>
-+!
-+  integer :: n
-+  real, dimension(2) :: a = (/ ( (float(n))**(1.0), n=1,2) /)
-+  if (any (a .ne. (/ ( (float(n))**(1.0), n=1,2) /))) call abort
-+end
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/interface_25.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/interface_25.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/interface_25.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/interface_25.f90	2009-03-07 07:58:49.569600000 -0800
-@@ -0,0 +1,45 @@
-+! { dg-do compile }
-+! Tests the fix for PR39295, in which the check of the interfaces
-+! at lines 25 and 42 failed because opfunc1 is identified as a 
-+! function by usage, whereas opfunc2 is not.
-+!
-+! Contributed by Jon Hurst <jhurst@ucar.edu>
-+!
-+MODULE  funcs
-+CONTAINS
-+  INTEGER FUNCTION test1(a,b,opfunc1) 
-+    INTEGER :: a,b
-+    INTEGER, EXTERNAL :: opfunc1
-+    test1 = opfunc1( a, b ) 
-+  END FUNCTION test1
-+  INTEGER FUNCTION sumInts(a,b)
-+    INTEGER :: a,b
-+    sumInts = a + b
-+  END FUNCTION sumInts
-+END MODULE funcs
-+
-+PROGRAM test
-+  USE funcs 
-+  INTEGER :: rs
-+  INTEGER, PARAMETER :: a = 2, b = 1
-+  rs = recSum( a, b, test1, sumInts )
-+  write(*,*) "Results", rs
-+CONTAINS
-+  RECURSIVE INTEGER FUNCTION recSum( a,b,UserFunction,UserOp ) RESULT( res )
-+    IMPLICIT NONE
-+    INTEGER :: a,b
-+    INTERFACE 
-+       INTEGER FUNCTION UserFunction(a,b,opfunc2) 
-+         INTEGER :: a,b
-+         INTEGER, EXTERNAL :: opfunc2
-+       END FUNCTION UserFunction
-+    END INTERFACE
-+    INTEGER, EXTERNAL :: UserOp 
-+
-+    res = UserFunction( a,b, UserOp )
-+
-+    if( res .lt. 10 ) then
-+       res = recSum( a, res, UserFunction, UserOp ) 
-+    end if
-+  END FUNCTION recSum
-+END PROGRAM test
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/interface_26.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/interface_26.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/interface_26.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/interface_26.f90	2009-03-07 07:58:49.569600000 -0800
-@@ -0,0 +1,46 @@
-+! { dg-do compile }
-+! Tests the fix for PR39295, in which the check of the interfaces
-+! at lines 26 and 43 failed because opfunc1 is identified as a 
-+! function by usage, whereas opfunc2 is not. This testcase checks
-+! that TKR is stll OK in these cases.
-+!
-+! Contributed by Jon Hurst <jhurst@ucar.edu>
-+!
-+MODULE  funcs
-+CONTAINS
-+  INTEGER FUNCTION test1(a,b,opfunc1) 
-+    INTEGER :: a,b
-+    INTEGER, EXTERNAL :: opfunc1
-+    test1 = opfunc1( a, b ) 
-+  END FUNCTION test1
-+  INTEGER FUNCTION sumInts(a,b)
-+    INTEGER :: a,b
-+    sumInts = a + b
-+  END FUNCTION sumInts
-+END MODULE funcs
-+
-+PROGRAM test
-+  USE funcs 
-+  INTEGER :: rs
-+  INTEGER, PARAMETER :: a = 2, b = 1
-+  rs = recSum( a, b, test1, sumInts ) ! { dg-error "Type/rank mismatch in argument" }
-+  write(*,*) "Results", rs
-+CONTAINS
-+  RECURSIVE INTEGER FUNCTION recSum( a,b,UserFunction,UserOp ) RESULT( res )
-+    IMPLICIT NONE
-+    INTEGER :: a,b
-+    INTERFACE 
-+       INTEGER FUNCTION UserFunction(a,b,opfunc2) 
-+         INTEGER :: a,b
-+         REAL, EXTERNAL :: opfunc2
-+       END FUNCTION UserFunction
-+    END INTERFACE
-+    INTEGER, EXTERNAL :: UserOp 
-+
-+    res = UserFunction( a,b, UserOp )
-+
-+    if( res .lt. 10 ) then
-+       res = recSum( a, res, UserFunction, UserOp ) 
-+    end if
-+  END FUNCTION recSum
-+END PROGRAM test
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/module_commons_3.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/module_commons_3.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/module_commons_3.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/module_commons_3.f90	2009-01-25 21:12:03.141287000 -0800
-@@ -0,0 +1,57 @@
-+! { dg-do run }
-+!
-+! PR fortran/38657, in which the mixture of PRIVATE and
-+! COMMON in TEST4, would mess up the association with
-+! TESTCHAR in TEST2.
-+!
-+! Contributed by Paul Thomas <pault@gcc.gnu.org>
-+! From a report in clf by Chris Bradley.
-+!
-+MODULE TEST4
-+  PRIVATE
-+  CHARACTER(LEN=80) :: T1 = &
-+    "Mary had a little lamb, Its fleece was white as snow;"
-+  CHARACTER(LEN=80) :: T2 = &
-+    "And everywhere that Mary went, The lamb was sure to go."
-+  CHARACTER(LEN=80) :: TESTCHAR
-+  COMMON /TESTCOMMON1/ TESTCHAR
-+  PUBLIC T1, T2, FOOBAR
-+CONTAINS
-+  subroutine FOOBAR (CHECK)
-+    CHARACTER(LEN=80) :: CHECK
-+    IF (TESTCHAR .NE. CHECK) CALL ABORT
-+  end subroutine
-+END MODULE TEST4
-+
-+MODULE TEST3
-+  CHARACTER(LEN=80) :: TESTCHAR
-+  COMMON /TESTCOMMON1/ TESTCHAR
-+END MODULE TEST3
-+
-+MODULE TEST2
-+  use TEST4
-+  USE TEST3, chr => testchar
-+  PRIVATE
-+  CHARACTER(LEN=80) :: TESTCHAR
-+  COMMON /TESTCOMMON1/ TESTCHAR
-+  PUBLIC TESTCHAR, FOO, BAR, CHR, T1, T2, FOOBAR
-+contains
-+  subroutine FOO
-+    TESTCHAR = T1
-+  end subroutine
-+  subroutine BAR (CHECK)
-+    CHARACTER(LEN=80) :: CHECK
-+    IF (TESTCHAR .NE. CHECK) CALL ABORT
-+    IF (CHR .NE. CHECK) CALL ABORT
-+  end subroutine
-+END MODULE TEST2
-+
-+PROGRAM TEST1
-+  USE TEST2
-+  call FOO
-+  call BAR (T1)
-+  TESTCHAR = T2
-+  call BAR (T2)
-+  CALL FOOBAR (T2)
-+END PROGRAM TEST1
-+! { dg-final { cleanup-modules "TEST2 TEST3 TEST4" } }
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_5.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_5.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_5.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_5.f90	2009-01-29 09:43:14.166860000 -0800
-@@ -0,0 +1,17 @@
-+! { dg-do run }
-+
-+! PR fortran/38887
-+! This aborted at runtime for the runtime zero-sized array arguments.
-+
-+! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
-+
-+program try_ya0013
-+  integer ida(9)
-+  call ya0013(ida,1,5,6)
-+end program
-+
-+SUBROUTINE YA0013(IDA,nf1,nf5,nf6)
-+  INTEGER IDA(9)
-+  IDA = 1
-+  CALL MVBITS(IDA(NF5:NF1), 0, 1, IDA(NF6:NF1),2)
-+END SUBROUTINE
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_6.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_6.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_6.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_6.f90	2009-01-29 09:43:14.166860000 -0800
-@@ -0,0 +1,33 @@
-+! { dg-do compile }
-+
-+! PR fortran/38883
-+! This ICE'd because the temporary-creation in the MVBITS call was wrong.
-+! This is the original test from the PR, the complicated version.
-+
-+! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
-+
-+     module yg0009_stuff
-+
-+      type unseq
-+         integer I
-+      end type
-+
-+      contains
-+
-+      SUBROUTINE YG0009(TDA2L,NF4,NF3,NF1,MF1,MF4,MF3)
-+        TYPE(UNSEQ) TDA2L(NF4,NF3)
-+
-+        CALL MVBITS (TDA2L(NF4:NF1:MF1,NF1:NF3)%I,2, &
-+          4, TDA2L(-MF4:-MF1:-NF1,-MF1:-MF3)%I, 3)
-+
-+      END SUBROUTINE
-+
-+      end module yg0009_stuff
-+
-+      program try_yg0009
-+      use yg0009_stuff
-+      type(unseq)  tda2l(4,3)
-+
-+      call yg0009(tda2l,4,3,1,-1,-4,-3)
-+
-+      end
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_7.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_7.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_7.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_7.f90	2009-01-29 09:43:14.166860000 -0800
-@@ -0,0 +1,30 @@
-+! { dg-do run }
-+
-+! PR fortran/38883
-+! This ICE'd because the temporary-creation in the MVBITS call was wrong.
-+
-+! Contributed by Paul Richard Thomas <paul.richard.thomas@gmail.com>
-+
-+  type t
-+    integer  ::  I
-+    character(9)  :: chr
-+  end type
-+  type(t) :: x(4,3)
-+  type(t) :: y(4,3)
-+  x = reshape ([((t (i*j, "a"),i = 1,4), j=1,3)], [4,3])
-+  call foo (x)
-+  y = reshape ([((t (i*j*2, "a"),i = 1,4), j=1,3)], [4,3])
-+  call bar(y, 4, 3, 1, -1, -4, -3)
-+  if (any (x%i .ne. y%i)) call abort
-+contains
-+  SUBROUTINE foo (x)
-+    TYPE(t) x(4, 3)      ! No dependency at all
-+    CALL MVBITS (x%i, 0, 6, x%i, 8)
-+    x%i = x%i * 2
-+  END SUBROUTINE
-+  SUBROUTINE bar (x, NF4, NF3, NF1, MF1, MF4, MF3)
-+    TYPE(t) x(NF4, NF3)  ! Dependency through variable indices
-+    CALL MVBITS (x(NF4:NF1:MF1, NF1:NF3)%i, 1, &
-+                 6, x(-MF4:-MF1:-NF1, -MF1:-MF3)%i, 9)
-+  END SUBROUTINE
-+end
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_8.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_8.f90
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_8.f90	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_8.f90	2009-01-29 09:43:14.166860000 -0800
-@@ -0,0 +1,36 @@
-+! { dg-do run }
-+
-+! PR fortran/38883
-+! This ICE'd because the temporary-creation in the MVBITS call was wrong.
-+
-+PROGRAM main
-+  IMPLICIT NONE
-+
-+  TYPE inner
-+    INTEGER :: i
-+    INTEGER :: j
-+  END TYPE inner
-+
-+  TYPE outer
-+    TYPE(inner) :: comp(2)
-+  END TYPE outer
-+
-+  TYPE(outer) :: var
-+
-+  var%comp%i = (/ 1, 2 /)
-+  var%comp%j = (/ 3, 4 /)
-+
-+  CALL foobar (var, 1, 2)
-+
-+  IF (ANY (var%comp%i /= (/ 1, 2 /))) CALL abort ()
-+  IF (ANY (var%comp%j /= (/ 3, 4 /))) CALL abort ()
-+
-+CONTAINS
-+
-+  SUBROUTINE foobar (x, lower, upper)
-+    TYPE(outer), INTENT(INOUT) :: x
-+    INTEGER, INTENT(IN) :: lower, upper
-+    CALL MVBITS (x%comp%i, 1, 2, x%comp(lower:upper)%i, 1)
-+  END SUBROUTINE foobar
-+
-+END PROGRAM main
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/pr38868.f gcc-4.3.3/gcc/testsuite/gfortran.dg/pr38868.f
---- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/pr38868.f	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/pr38868.f	2009-01-24 07:26:14.936448000 -0800
-@@ -0,0 +1,17 @@
-+! { dg-do compile }
-+! { dg-options "-O2 -fdump-rtl-expand" }
-+      PROGRAM testcase
-+      IMPLICIT NONE
-+
-+      CHARACTER*4 ANER(18)
-+      CHARACTER*80 LINE
-+      aner = ''
-+      ANER(1)='A   '
-+      ANER(2)='    '
-+      LINE=' '
-+      LINE(78:80)='xyz'
-+      WRITE(*,'(A82)') "'"//LINE//"'"
-+      END
-+
-+! { dg-final { scan-rtl-dump-times "line\\\+80" 0 "expand" } }
-+! { dg-final { cleanup-rtl-dump "expand" } } */
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.old-deja/g++.jason/thunk2.C gcc-4.3.3/gcc/testsuite/g++.old-deja/g++.jason/thunk2.C
---- gcc-4.3.3.orig/gcc/testsuite/g++.old-deja/g++.jason/thunk2.C	2005-10-22 13:57:01.000000000 -0700
-+++ gcc-4.3.3/gcc/testsuite/g++.old-deja/g++.jason/thunk2.C	2009-03-11 10:53:13.287573000 -0700
-@@ -1,6 +1,7 @@
- // { dg-do run { target fpic } }
- // { dg-options "-fPIC" }
- // { dg-bogus "\[Uu\]nresolved symbol .(_GLOBAL_OFFSET_TABLE_|\[_.A-Za-z\]\[_.0-9A-Za-z\]*@(PLT|GOT|GOTOFF))|\[Bb\]ad fixup at .DATA.:" "PIC unsupported" { xfail *-*-netware* } 0 }
-+// { dg-skip-if "requires unsupported run-time relocation" { spu-*-* } { "*" } { "" } }
- // Test that non-variadic function calls using thunks and PIC work right.
- 
- struct A {
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp gcc-4.3.3/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp
---- gcc-4.3.3.orig/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp	2007-08-01 09:25:11.000000000 -0700
-+++ gcc-4.3.3/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp	2009-01-26 10:13:58.227740000 -0800
-@@ -37,8 +37,20 @@
- set generator_src "$generator_src $srcdir/$subdir/generate-random.c"
- set generator_src "$generator_src $srcdir/$subdir/generate-random_r.c"
- set generator_cmd "-o $generator $generator_src"
-+# Temporarily unset GCC_EXEC_PREFIX from environment, as that might
-+# confuse the $HOSTCC.
-+set orig_gcc_exec_prefix_saved 0
-+if [info exists env(GCC_EXEC_PREFIX)] {
-+     set orig_gcc_exec_prefix "$env(GCC_EXEC_PREFIX)"
-+     set orig_gcc_exec_prefix_saved 1
-+     unsetenv GCC_EXEC_PREFIX
-+}
- set status [remote_exec host "$HOSTCC $HOSTCFLAGS $generator_cmd"]
- set status [lindex $status 0]
-+if { $orig_gcc_exec_prefix_saved } {
-+     set orig_gcc_exec_prefix_saved 0
-+     setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix"
-+}
- if { $status == 0 } then {
-     file delete -force $tstobjdir
-     file mkdir $tstobjdir
-diff -Naur gcc-4.3.3.orig/gcc/tree.h gcc-4.3.3/gcc/tree.h
---- gcc-4.3.3.orig/gcc/tree.h	2008-02-08 11:10:25.000000000 -0800
-+++ gcc-4.3.3/gcc/tree.h	2009-01-26 07:54:18.800086000 -0800
-@@ -4753,6 +4753,7 @@
- 
- extern tree fold (tree);
- extern tree fold_unary (enum tree_code, tree, tree);
-+extern tree fold_unary_ignore_overflow (enum tree_code, tree, tree);
- extern tree fold_binary (enum tree_code, tree, tree, tree);
- extern tree fold_ternary (enum tree_code, tree, tree, tree, tree);
- extern tree fold_build1_stat (enum tree_code, tree, tree MEM_STAT_DECL);
-diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-ccp.c gcc-4.3.3/gcc/tree-ssa-ccp.c
---- gcc-4.3.3.orig/gcc/tree-ssa-ccp.c	2008-05-11 11:54:15.000000000 -0700
-+++ gcc-4.3.3/gcc/tree-ssa-ccp.c	2009-01-26 07:54:18.800086000 -0800
-@@ -938,7 +938,7 @@
-       if ((code == NOP_EXPR || code == CONVERT_EXPR)
- 	  && useless_type_conversion_p (TREE_TYPE (rhs), TREE_TYPE (op0)))
- 	return op0;
--      return fold_unary (code, TREE_TYPE (rhs), op0);
-+      return fold_unary_ignore_overflow (code, TREE_TYPE (rhs), op0);
-     }
- 
-   /* Binary and comparison operators.  We know one or both of the
-diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-forwprop.c gcc-4.3.3/gcc/tree-ssa-forwprop.c
---- gcc-4.3.3.orig/gcc/tree-ssa-forwprop.c	2008-03-14 09:34:11.000000000 -0700
-+++ gcc-4.3.3/gcc/tree-ssa-forwprop.c	2009-02-28 10:33:27.113860000 -0800
-@@ -487,28 +487,36 @@
- forward_propagate_addr_into_variable_array_index (tree offset,
- 						  tree def_rhs, tree use_stmt)
- {
--  tree index;
-+  tree index, offset_def;
- 
--  /* Try to find an expression for a proper index.  This is either
--     a multiplication expression by the element size or just the
--     ssa name we came along in case the element size is one.  */
-+  /* Get the offset's defining statement.  */
-+  offset_def = SSA_NAME_DEF_STMT (offset);
-+
-+  /* Try to find an expression for a proper index.  This is either a
-+     multiplication expression by the element size or just the ssa name we came
-+     along in case the element size is one. In that case, however, we do not
-+     allow multiplications because they can be computing index to a higher
-+     level dimension (PR 37861). */
-   if (integer_onep (TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (def_rhs)))))
--    index = offset;
--  else
-     {
--      /* Get the offset's defining statement.  */
--      offset = SSA_NAME_DEF_STMT (offset);
-+      if (TREE_CODE (offset_def) == GIMPLE_MODIFY_STMT
-+	  && TREE_CODE (GIMPLE_STMT_OPERAND (offset_def, 1)) == MULT_EXPR)
-+	return false;
- 
-+      index = offset;
-+    }
-+  else
-+    {
-       /* The statement which defines OFFSET before type conversion
-          must be a simple GIMPLE_MODIFY_STMT.  */
--      if (TREE_CODE (offset) != GIMPLE_MODIFY_STMT)
-+      if (TREE_CODE (offset_def) != GIMPLE_MODIFY_STMT)
- 	return false;
- 
-       /* The RHS of the statement which defines OFFSET must be a
- 	 multiplication of an object by the size of the array elements. 
- 	 This implicitly verifies that the size of the array elements
- 	 is constant.  */
--     offset = GIMPLE_STMT_OPERAND (offset, 1);
-+     offset = GIMPLE_STMT_OPERAND (offset_def, 1);
-       if (TREE_CODE (offset) != MULT_EXPR
- 	  || TREE_CODE (TREE_OPERAND (offset, 1)) != INTEGER_CST
- 	  || !simple_cst_equal (TREE_OPERAND (offset, 1),
-@@ -677,6 +685,7 @@
-      array elements, then the result is converted into the proper
-      type for the arithmetic.  */
-   if (TREE_CODE (TREE_OPERAND (rhs, 1)) == SSA_NAME
-+      && useless_type_conversion_p (TREE_TYPE (name), TREE_TYPE (def_rhs))
-       /* Avoid problems with IVopts creating PLUS_EXPRs with a
- 	 different type than their operands.  */
-       && useless_type_conversion_p (TREE_TYPE (rhs), TREE_TYPE (name)))
-diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-sccvn.c gcc-4.3.3/gcc/tree-ssa-sccvn.c
---- gcc-4.3.3.orig/gcc/tree-ssa-sccvn.c	2008-07-11 13:55:45.000000000 -0700
-+++ gcc-4.3.3/gcc/tree-ssa-sccvn.c	2009-01-26 07:54:18.800086000 -0800
-@@ -1507,7 +1507,7 @@
-   if (op0 == TREE_OPERAND (rhs, 0))
-     return rhs;
- 
--  result = fold_unary (TREE_CODE (rhs), TREE_TYPE (rhs), op0);
-+  result = fold_unary_ignore_overflow (TREE_CODE (rhs), TREE_TYPE (rhs), op0);
-   if (result)
-     {
-       STRIP_USELESS_TYPE_CONVERSION (result);
-diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-structalias.c gcc-4.3.3/gcc/tree-ssa-structalias.c
---- gcc-4.3.3.orig/gcc/tree-ssa-structalias.c	2009-01-07 05:12:17.000000000 -0800
-+++ gcc-4.3.3/gcc/tree-ssa-structalias.c	2009-02-05 03:10:02.086542000 -0800
-@@ -1509,24 +1509,23 @@
- 	  varinfo_t v;
- 	  unsigned int t;
- 	  unsigned HOST_WIDE_INT fieldoffset = get_varinfo (j)->offset + loff;
--	  bitmap tmp;
- 
- 	  v = first_vi_for_offset (get_varinfo (j), fieldoffset);
- 	  /* If the access is outside of the variable we can ignore it.  */
- 	  if (!v)
- 	    continue;
- 	  t = find (v->id);
--	  tmp = get_varinfo (t)->solution;
--
--	  if (set_union_with_increment (tmp, sol, 0))
-+	  if (add_graph_edge (graph, t, rhs))
- 	    {
--	      get_varinfo (t)->solution = tmp;
--	      if (t == rhs)
--		sol = get_varinfo (rhs)->solution;
--	      if (!TEST_BIT (changed, t))
-+	      if (bitmap_ior_into (get_varinfo (t)->solution, sol))
- 		{
--		  SET_BIT (changed, t);
--		  changed_count++;
-+		  if (t == rhs)
-+		    sol = get_varinfo (rhs)->solution;
-+		  if (!TEST_BIT (changed, t))
-+		    {
-+		      SET_BIT (changed, t);
-+		      changed_count++;
-+		    }
- 		}
- 	    }
- 	}
-diff -Naur gcc-4.3.3.orig/gcc/version.c gcc-4.3.3/gcc/version.c
---- gcc-4.3.3.orig/gcc/version.c	2007-08-21 08:35:30.000000000 -0700
-+++ gcc-4.3.3/gcc/version.c	2009-03-23 00:37:55.451673138 -0700
-@@ -14,4 +14,4 @@
-    Makefile.  */
- 
- const char version_string[] = BASEVER DATESTAMP DEVPHASE REVISION;
--const char pkgversion_string[] = PKGVERSION;
-+const char pkgversion_string[] = "(GCC for Cross-LFS 4.3.3.20090323) ";
-diff -Naur gcc-4.3.3.orig/libjava/ChangeLog gcc-4.3.3/libjava/ChangeLog
---- gcc-4.3.3.orig/libjava/ChangeLog	2009-01-24 02:18:16.000000000 -0800
-+++ gcc-4.3.3/libjava/ChangeLog	2009-03-13 11:19:59.111425000 -0700
-@@ -1,3 +1,8 @@
-+2009-03-13  Andrew Haley  <aph@redhat.com>
-+
-+	* java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault): Clear
-+	INTERPRETED access modifier.
-+
- 2009-01-24  Release Manager
- 
- 	* GCC 4.3.3 released.
-diff -Naur gcc-4.3.3.orig/libjava/classpath/ChangeLog.gcj gcc-4.3.3/libjava/classpath/ChangeLog.gcj
---- gcc-4.3.3.orig/libjava/classpath/ChangeLog.gcj	2008-09-14 11:27:33.000000000 -0700
-+++ gcc-4.3.3/libjava/classpath/ChangeLog.gcj	2009-03-16 05:11:32.360447000 -0700
-@@ -1,3 +1,8 @@
-+2009-03-16  Matthias Klose  <doko@ubuntu.com>
-+
-+	* configure.ac: Detect xulrunner-1.9.
-+	* configure: Regenerate.
-+
- 2008-09-14  Matthias Klose  <doko@ubuntu.com>
- 
- 	Merge from classpath:
-diff -Naur gcc-4.3.3.orig/libjava/classpath/configure gcc-4.3.3/libjava/classpath/configure
---- gcc-4.3.3.orig/libjava/classpath/configure	2008-02-29 15:47:54.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/configure	2009-03-16 05:11:32.360447000 -0700
-@@ -22904,6 +22904,103 @@
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+        echo "$as_me:$LINENO: checking for mozilla-plugin libxul-unstable" >&5
-+echo $ECHO_N "checking for mozilla-plugin libxul-unstable... $ECHO_C" >&6
-+
-+        if $PKG_CONFIG --exists "mozilla-plugin libxul-unstable" ; then
-+            echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+            succeeded=yes
-+
-+            echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
-+echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
-+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin libxul-unstable"`
-+            echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
-+echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
-+
-+            echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
-+echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
-+            MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin libxul-unstable"`
-+            echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
-+echo "${ECHO_T}$MOZILLA_LIBS" >&6
-+        else
-+            MOZILLA_CFLAGS=""
-+            MOZILLA_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but
-+            ## do set a variable so people can do so.
-+            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin libxul-unstable"`
-+
-+        fi
-+
-+
-+
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
-+
-+  if test $succeeded = yes; then
-+     MOZILLA_FOUND=yes
-+  else
-+     MOZILLA_FOUND=no
-+  fi
-+
-+    if test "x${MOZILLA_FOUND}" = xno; then
-+
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+
-+if test -n "$PKG_CONFIG"; then
-+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-         echo "$as_me:$LINENO: checking for mozilla-plugin" >&5
- echo $ECHO_N "checking for mozilla-plugin... $ECHO_C" >&6
- 
-@@ -22946,6 +23043,7 @@
-      MOZILLA_FOUND=no
-   fi
- 
-+    fi
-     if test "x${MOZILLA_FOUND}" = xno; then
- 
-   succeeded=no
-diff -Naur gcc-4.3.3.orig/libjava/classpath/configure.ac gcc-4.3.3/libjava/classpath/configure.ac
---- gcc-4.3.3.orig/libjava/classpath/configure.ac	2007-09-05 00:45:09.000000000 -0700
-+++ gcc-4.3.3/libjava/classpath/configure.ac	2009-03-16 05:11:32.360447000 -0700
-@@ -702,7 +702,10 @@
- 
-   dnl Check for plugin support headers and libraries.
-   if test "x${COMPILE_PLUGIN}" = xyes; then
--    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+    if test "x${MOZILLA_FOUND}" = xno; then
-+      PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+    fi
-     if test "x${MOZILLA_FOUND}" = xno; then
-       PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-     fi
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/cp-tools.info gcc-4.3.3/libjava/classpath/doc/cp-tools.info
---- gcc-4.3.3.orig/libjava/classpath/doc/cp-tools.info	2009-01-24 04:05:54.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/cp-tools.info	1969-12-31 16:00:00.000000000 -0800
-@@ -1,1852 +0,0 @@
--This is cp-tools.info, produced by makeinfo version 4.12 from
--/abuild/rguenther/tmp/gcc-4.3.3/gcc-4.3.3/libjava/classpath/doc/cp-tools.texinfo.
--
--This file documents the Tools included in a standard distribution of
--the GNU Classpath project deliverables.
--
--   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
--
--INFO-DIR-SECTION GNU Libraries
--START-INFO-DIR-ENTRY
--* Classpath Tools: (cp-tools).  GNU Classpath Tools Guide
--END-INFO-DIR-ENTRY
--
--
--File: cp-tools.info,  Node: Top,  Next: Applet Tools,  Prev: (dir),  Up: (dir)
--
--GNU Classpath Tools Guide
--*************************
--
--This document contains important information you need to know in order
--to use the tools included in the GNU Classpath project deliverables.
--
--   The Tools aim at providing a free replacement, similar in their
--behavior, to their counter-parts found in the Reference Implementation
--(RI) of the Java Software Development Kit (SDK).
--
--* Menu:
--
--* Applet Tools::               Work with applets
--* Security Tools::             Work securely with Java applications
--* Other Tools::                Other tools in classpath
--* I18N Issues::                How to add support for non-English languages
--
-- --- The Detailed Node Listing ---
--
--Applet Tools
--
--* appletviewer Tool::          Load applets
--* gcjwebplugin::               Load applets in a web browser
--
--Security Tools
--
--* jarsigner Tool::             Sign and verify .JAR files
--* keytool Tool::               Manage private keys and public certificates
--
--jarsigner Tool
--
--* Common jarsigner Options::   Options used when signing or verifying a file
--* Signing Options::            Options only used when signing a .JAR file
--* Verification Options::       Options only used when verifying a .JAR file
--
--keytool Tool
--
--* Getting Help::               How to get help with keytool commands
--* Common keytool Options::     Options used in more than one command
--* Distinguished Names::        X.500 Distinguished Names used in certificates
--* Add/Update Commands::        Commands for adding data to a Key Store
--* Export Commands::            Commands for exporting data from a Key Store
--* Display Commands::           Commands for displaying data in a Key Store
--* Management Commands::        Commands for managing a Key Store
--
--Add/Update Commands
--
--* Command -genkey::            Generate private key and self-signed certificate
--* Command -import::            Import certificates and certificate replies
--* Command -selfcert::          Generate self-signed certificate
--* Command -cacert::            Import a CA Trusted Certificate
--* Command -identitydb::        Import JDK-1 style identities
--
--Export Commands
--
--* Command -certreq::           Generate Certificate Signing Requests (CSR)
--* Command -export::            Export a certificate in a Key Store
--
--Display Commands
--
--* Command -list::              Display information about one or all Aliases
--* Command -printcert::         Print a certificate or a certificate fingerprint
--
--Management Commands
--
--* Command -keyclone::          Clone a Key Entry in a Key Store
--* Command -storepasswd::       Change the password protecting a Key Store
--* Command -keypasswd::         Change the password protecting a Key Entry
--* Command -delete::            Remove an entry in a Key Store
--
--Other Tools
--
--* jar Tool::                   Archive tool for Java archives
--* javah Tool::                 A java header compiler
--* gcjh Tool::                  A java header compiler (old version)
--* native2ascii Tool::          An encoding converter
--* orbd Tool::                  An object request broker daemon
--* serialver Tool::             A serial version command
--* rmid Tool::                  RMI activation daemon
--* rmiregistry Tool::           Remote object registry
--* tnameserv Tool::             Naming service
--
--I18N Issues
--
--* Language Resources::         Where resources are located
--* Message Formats::            How messages are internationalized
--
--
--File: cp-tools.info,  Node: Applet Tools,  Next: Security Tools,  Prev: Top,  Up: Top
--
--1 Applet Tools
--**************
--
--Two Applet Tools are available with GNU Classpath: appletviewer and
--gcjwebplugin.
--
--   To avoid conflicts with other implementations, the appletviewer
--executable is called "gappletviewer".
--
--* Menu:
--
--* appletviewer Tool::          Load applets
--* gcjwebplugin::               Load applets in a web browser
--
--   If while using these tools you think you found a bug, then please
--report it at classpath-bugs
--(http://www.gnu.org/software/classpath/bugs.html).
--
--
--File: cp-tools.info,  Node: appletviewer Tool,  Next: gcjwebplugin,  Prev: Applet Tools,  Up: Applet Tools
--
--1.1 The `appletviewer' Tool
--===========================
--
--SYNOPSIS
--
--   appletviewer [OPTION]... URL...
--appletviewer [OPTION]... `-code' CODE
--appletviewer [OPTION]... `-plugin' INPUT,OUTPUT
--
--   DESCRIPTION The `appletviewer' tool loads and runs an applet.
--
--   Use the first form to test applets specified by tag.  The URL should
--resolve to an HTML document from which the `appletviewer' will extract
--applet tags.  The APPLET, EMBED and OBJECT tags are supported.  If a
--given document contains multiple applet tags, all the applets will be
--loaded, with each applet appearing in its own window.  Likewise, when
--multiple URLs are specified, each applet tag instance is given its own
--window.  If a given document contains no recognized tags the
--`appletviewer' does nothing.
--
--     appletviewer http://www.gnu.org/software/classpath/
--
--   Use the second form to test an applet in development.  This form
--allows applet tag attributes to be supplied on the command line.  Only
--one applet may be specified using the `-code' option.  The `-code'
--option overrides the URL form - any URLs specified will be ignored.
--
--     appletviewer -code Test.class -param datafile,data.txt
--
--   `gcjwebplugin' uses the third form to communicate with the
--`appletviewer' through named pipes.
--
--   URL OPTIONS
--`-debug'
--     This option is not yet implemented but is provided for
--     compatibility.
--
--`-encoding CHARSET'
--     Use this option to specify an alternate character encoding for the
--     specified HTML page.
--
--
--   APPLET TAG OPTIONS
--`-code CODE'
--     Use the `-code' option to specify the value of the applet tag CODE
--     attribute.
--
--`-codebase CODEBASE'
--     Use the `-codebase' option to specify the value of the applet tag
--     CODEBASE attribute.
--
--`-archive ARCHIVE'
--     Use the `-archive' option to specify the value of the applet tag
--     ARCHIVE attribute.
--
--`-width WIDTH'
--     Use the `-width' option to specify the value of the applet tag
--     WIDTH attribute.
--
--`-height HEIGHT'
--     Use the `-height' option to specify the value of the applet tag
--     HEIGHT attribute.
--
--`-param NAME,VALUE'
--     Use the `-param' option to specify values for the NAME and VALUE
--     attributes of an applet PARAM tag.
--
--
--   PLUGIN OPTION
--`-plugin INPUT,OUTPUT'
--     `gcjwebplugin' uses the `-plugin' option to specify the named pipe
--     the `appletviewer' should use for receiving commands (INPUT) and
--     the one it should use for sending commands to `gcjwebplugin'
--     (OUTPUT).
--
--
--   DEBUGGING OPTION
--`-verbose'
--     Use the `-verbose' option to have the `appletviewer' print
--     debugging messages.
--
--
--   STANDARD OPTIONS
--
--`-help'
--     Use the `-help' option to have the `appletviewer' print a usage
--     message, then exit.
--
--`-version'
--     Use the `-version' option to have the `appletviewer' print its
--     version, then exit.
--
--`-JOPTION'
--     Use the `-J' option to pass OPTION to the virtual machine that
--     will run the `appletviewer'.  Unlike other options, there must not
--     be a space between the `-J' and OPTION.
--
--
--
--File: cp-tools.info,  Node: gcjwebplugin,  Prev: appletviewer Tool,  Up: Applet Tools
--
--1.2 The `gcjwebplugin' Tool
--===========================
--
--`gcjwebplugin' is a plugin that adds applet support to web browsers.
--Currently `gcjwebplugin' only supports Mozilla-based browsers (e.g.,
--Firefox, Galeon, Mozilla).
--
--
--File: cp-tools.info,  Node: Security Tools,  Next: Other Tools,  Prev: Applet Tools,  Up: Top
--
--2 Security Tools
--****************
--
--Two Security Tools are available with GNU Classpath: `jarsigner' and
--`keytool'.
--
--   To avoid conflicts with other implementations, the jarsigner
--executable is called `gjarsigner' and the keytool executable is called
--`gkeytool'.
--
--* Menu:
--
--* jarsigner Tool::             Sign and verify .JAR files
--* keytool Tool::               Manage private keys and public certificates
--
--   If while using these tools you think you found a bug, then please
--report it at classpath-bugs
--(http://www.gnu.org/software/classpath/bugs.html).
--
--
--File: cp-tools.info,  Node: jarsigner Tool,  Next: keytool Tool,  Prev: Security Tools,  Up: Security Tools
--
--2.1 The `jarsigner' Tool
--========================
--
--The `jarsigner' tool is invoked from the command line, in one of two
--forms, as follows:
--
--     jarsigner [OPTION]... FILE ALIAS
--
--     jarsigner `-verify' [OPTION]... FILE
--
--   When the first form is used, the tool signs the designated JAR file.
--The second form, on the other hand, is used to verify a previously
--signed JAR file.
--
--   FILE is the .JAR file to process; i.e. to sign if the first syntax
--form is used, or to verify if the second syntax form is used instead.
--
--   ALIAS must be a known Alias of a Key Entry in the designated Key
--Store. The private key material associated with this Alias is then used
--for signing the designated .JAR file.
--
--* Menu:
--
--* Common jarsigner Options::   Options used when signing or verifying a file
--* Signing Options::            Options only used when signing a .JAR file
--* Verification Options::       Options only used when verifying a .JAR file
--
--
--File: cp-tools.info,  Node: Common jarsigner Options,  Next: Signing Options,  Prev: jarsigner Tool,  Up: jarsigner Tool
--
--2.1.1 Common options
----------------------
--
--The following options may be used when the tool is used for either
--signing, or verifying, a .JAR file.
--
--`-verbose'
--     Use this option to force the tool to generate more verbose
--     messages, during its processing.
--
--`-internalsf'
--     When present, the tool will include -which otherwise it does not-
--     the `.SF' file in the `.DSA' generated file.
--
--`-sectionsonly'
--     When present, the tool will include in the `.SF' generated file
--     -which otherwise it does not- a header containing a hash of the
--     whole manifest file.  When that header is included, the tool can
--     quickly check, during verification, if the hash (in the header)
--     matches or not the manifest file.
--
--`-provider PROVIDER_CLASS_NAME'
--     A fully qualified class name of a Security Provider to add to the
--     current list of Security Providers already installed in the JVM
--     in-use. If a provider class is specified with this option, and was
--     successfully added to the runtime -i.e. it was not already
--     installed- then the tool will attempt to remove this Security
--     Provider before exiting.
--
--`-help'
--     Prints a help text similar to this one.
--
--
--
--File: cp-tools.info,  Node: Signing Options,  Next: Verification Options,  Prev: Common jarsigner Options,  Up: jarsigner Tool
--
--2.1.2 Signing options
-----------------------
--
--The following options may be specified when using the tool for signing
--purposes.
--
--`-keystore URL'
--     Use this option to specify the location of the key store to use.
--     The default value is a file URL referencing the file named
--     `.keystore' located in the path returned by the call to
--     `java.lang.System#getProperty(String)' using `user.home' as
--     argument.
--
--     If a URL was specified, but was found to be malformed -e.g.
--     missing protocol element- the tool will attempt to use the URL
--     value as a file-name (with absolute or relative path-name) of a
--     key store -as if the protocol was `file:'.
--
--`-storetype STORE_TYPE'
--     Use this option to specify the type of the key store to use. The
--     default value, if this option is omitted, is that of the property
--     `keystore.type' in the security properties file, which is obtained
--     by invoking the static method call `getDefaultType()' in
--     `java.security.KeyStore'.
--
--`-storepass PASSWORD'
--     Use this option to specify the password which will be used to
--     unlock the key store. If this option is missing, the User will be
--     prompted to provide a password.
--
--`-keypass PASSWORD'
--     Use this option to specify the password which the tool will use to
--     unlock the Key Entry associated with the designated Alias.
--
--     If this option is omitted, the tool will first attempt to unlock
--     the Key Entry using the same password protecting the key store. If
--     this fails, you will then be prompted to provide a password.
--
--`-sigfile NAME'
--     Use this option to designate a literal that will be used to
--     construct file names for both the `.SF' and `.DSA' signature
--     files. These files  will be generated, by the tool, and placed in
--     the `META-INF' directory of the signed JAR.  Permissible
--     characters for NAME must be in the range "a-zA-Z0-9_-".  All
--     characters will be converted to upper-case ones.
--
--     If this option is missing, the first eight characters of the ALIAS
--     argument will be used. When this is the case, any character in
--     ALIAS that is outside the permissible range of characters will be
--     replaced by an underscore.
--
--`-signedjar FILE'
--     Use this option to specify the file name of the signed JAR. If
--     this option is omitted, then the signed JAR will be named the same
--     as FILE; i.e. the input JAR file will be replaced with the signed
--     copy.
--
--
--
--File: cp-tools.info,  Node: Verification Options,  Prev: Signing Options,  Up: jarsigner Tool
--
--2.1.3 Verification options
----------------------------
--
--The following options may be specified when using the tool for
--verification purposes.
--
--`-verify'
--     Use this option to indicate that the tool is to be used for
--     verification purposes.
--
--`-certs'
--     This option is used in conjunction with the `-verbose' option.
--     When present, along with the `-verbose' option, the tool will
--     print more detailed information about the certificates of the
--     signer(s) being processed.
--
--
--
--File: cp-tools.info,  Node: keytool Tool,  Prev: jarsigner Tool,  Up: Security Tools
--
--2.2 The `keytool' Tool
--======================
--
--Cryptographic credentials, in a Java environment, are usually stored in
--a Key Store. The Java SDK specifies a Key Store as a persistent
--container of two types of objects: Key Entries and Trusted
--Certificates. The security tool `keytool' is a Java-based application
--for managing those types of objects.
--
--   A Key Entry represents the private key part of a key-pair used in
--Public-Key Cryptography, and a signed X.509 certificate which
--authenticates the public key part for a known entity; i.e. the owner of
--the key-pair. The X.509 certificate itself contains the public key part
--of the key-pair.
--
--   A Trusted Certificate is a signed X.509 certificate issued by a
--trusted entity. The Trust in this context is relative to the User of
--the `keytool'. In other words, the existence of a Trusted Certificate
--in the Key Store processed by a `keytool' command implies that the User
--trusts the Issuer of that Trusted Certificate to also sign, and hence
--authenticates, other Subjects the tool may process.
--
--   Trusted Certificates are important because they allow the tool to
--mechanically construct Chains of Trust starting from one of the Trusted
--Certificates in a Key Store and ending with a certificate whose Issuer
--is potentially unknown. A valid chain is an ordered list, starting with
--a Trusted Certificate (also called the anchor), ending with the target
--certificate, and satisfying the condition that the Subject of
--certificate `#i' is the Issuer of certificate `#i + 1'.
--
--   The `keytool' is invoked from the command line as follows:
--
--     keytool [COMMAND] ...
--
--   Multiple COMMANDs may be specified at once, each complete with its
--own options. `keytool' will parse all the arguments, before processing,
--and executing, each `COMMAND'. If an exception occurs while executing
--one COMMAND `keytool' will abort. Note however that because the
--implementation of the tool uses code to parse command line options that
--also supports GNU-style options, you have to separate each command
--group with a double-hyphen; e.g
--
--     keytool -list -- -printcert -alias mykey
--
--   Here is a summary of the commands supported by the tool:
--
--  1. Add/Update commands
--    `-genkey [OPTION]...'
--          Generate a new Key Entry, eventually creating a new key store.
--
--    `-import [OPTION]...'
--          Add, to a key store, Key Entries (private keys and
--          certificate chains authenticating the public keys) and
--          Trusted Certificates (3rd party certificates which can be
--          used as Trust Anchors when building chains-of-trust).
--
--    `-selfcert [OPTION]...'
--          Generate a new self-signed Trusted Certificate.
--
--    `-cacert [OPTION]...'
--          Import a CA Trusted Certificate.
--
--    `-identitydb [OPTION]...'
--          NOT IMPLEMENTED YET.
--          Import a JDK 1.1 style Identity Database.
--
--  2. Export commands
--    `-certreq [OPTION]...'
--          Issue a Certificate Signing Request (CSR) which can be then
--          sent to a Certification Authority (CA) to issue a certificate
--          signed (by the CA) and authenticating the Subject of the
--          request.
--
--    `-export [OPTION]...'
--          Export a certificate from a key store.
--
--  3. Display commands
--    `-list [OPTION]...'
--          Print one or all certificates in a key store to `STDOUT'.
--
--    `-printcert [OPTION]...'
--          Print a human-readable form of a certificate, in a designated
--          file, to `STDOUT'.
--
--  4. Management commands
--    `-keyclone [OPTION]...'
--          Clone a Key Entry in a key store.
--
--    `-storepasswd [OPTION]...'
--          Change the password protecting a key store.
--
--    `-keypasswd [OPTION]...'
--          Change the password protecting a Key Entry in a key store.
--
--    `-delete [OPTION]...'
--          Delete a Key Entry or a Trusted Certificate from a key store.
--
--* Menu:
--
--* Getting Help::               How to get help with keytool commands
--* Common keytool Options::     Options used in more than one command
--* Distinguished Names::        X.500 Distinguished Names used in certificates
--* Add/Update Commands::        Commands for adding data to a Key Store
--* Export Commands::            Commands for exporting data from a Key Store
--* Display Commands::           Commands for displaying data in a Key Store
--* Management Commands::        Commands for managing a Key Store
--
--
--File: cp-tools.info,  Node: Getting Help,  Next: Common keytool Options,  Prev: keytool Tool,  Up: keytool Tool
--
--2.2.1 Getting help
--------------------
--
--To get a general help text about the tool, use the `-help' option; e.g.
--
--     `keytool -help'
--
--   To get more specific help text about one of the tool's command use
--the `-help' option for that command; e.g.
--
--     `keytool -genkey -help'
--
--   In both instances, the tool will print a help text and then will
--exit the running JVM.
--
--   It is worth noting here that the help messages printed by the tool
--are I18N-ready. This means that if/when the contents of the tool's
--Message Bundle properties file are available in languages other than
--English, you may see those messages in that language.
--
--
--File: cp-tools.info,  Node: Common keytool Options,  Next: Distinguished Names,  Prev: Getting Help,  Up: keytool Tool
--
--2.2.2 Common options
----------------------
--
--The following `OPTION's are used in more than one `COMMAND'. They are
--described here to reduce redundancy.
--
--`-alias ALIAS'
--     Every entry, be it a Key Entry or a Trusted Certificate, in a key
--     store is uniquely identified by a user-defined ALIAS string. Use
--     this option to specify the ALIAS to use when referring to an entry
--     in the key store. Unless specified otherwise, a default value of
--     `mykey' shall be used when this option is omitted from the command
--     line.
--
--`-keyalg ALGORITHM'
--     Use this option to specify the canonical name of the key-pair
--     generation algorithm. The default value for this option is `DSS'
--     (a synonym for the Digital Signature Algorithm also known as DSA).
--
--`-keysize SIZE'
--     Use this option to specify the number of bits of the shared
--     modulus (for both the public and private keys) to use when
--     generating new keys. A default value of `1024' will be used if
--     this option is omitted from the command line.
--
--`-validity DAY_COUNT'
--     Use this option to specify the number of days a newly generated
--     certificate will be valid for. The default value is `90' (days) if
--     this option is omitted from the command line.
--
--`-storetype STORE_TYPE'
--     Use this option to specify the type of the key store to use. The
--     default value, if this option is omitted, is that of the property
--     `keystore.type' in the security properties file, which is obtained
--     by invoking the static method call `getDefaultType()' in
--     `java.security.KeyStore'.
--
--`-storepass PASSWORD'
--     Use this option to specify the password protecting the key store.
--     If this option is omitted from the command line, you will be
--     prompted to provide a password.
--
--`-keystore URL'
--     Use this option to specify the location of the key store to use.
--     The default value is a file URL referencing the file named
--     `.keystore' located in the path returned by the call to
--     `java.lang.System#getProperty(String)' using `user.home' as
--     argument.
--
--     If a URL was specified, but was found to be malformed -e.g.
--     missing protocol element- the tool will attempt to use the URL
--     value as a file-name (with absolute or relative path-name) of a
--     key store -as if the protocol was `file:'.
--
--`-provider PROVIDER_CLASS_NAME'
--     A fully qualified class name of a Security Provider to add to the
--     current list of Security Providers already installed in the JVM
--     in-use. If a provider class is specified with this option, and was
--     successfully added to the runtime -i.e. it was not already
--     installed- then the tool will attempt to removed this Security
--     Provider before exiting.
--
--`-file FILE'
--     Use this option to designate a file to use with a command. When
--     specified with this option, the value is expected to be the fully
--     qualified path of a file accessible by the File System. Depending
--     on the command, the file may be used as input or as output. When
--     this option is omitted from the command line, `STDIN' will be used
--     instead, as the source of input, and `STDOUT' will be used instead
--     as the output destination.
--
--`-v'
--     Unless specified otherwise, use this option to enable more verbose
--     output.
--
--
--
--File: cp-tools.info,  Node: Distinguished Names,  Next: Add/Update Commands,  Prev: Common keytool Options,  Up: keytool Tool
--
--2.2.3 X.500 Distinguished Names
---------------------------------
--
--A Distinguished Name (or DN) MUST be supplied with some of the
--`COMMAND's using a `-dname' option. The syntax of a valid value for
--this option MUST follow RFC-2253 specifications. Namely the following
--components (with their accepted meaning) will be recognized. Note that
--the component name is case-insensitive:
--
--CN
--     The Common Name; e.g. `host.domain.com'
--
--OU
--     The Organizational Unit; e.g. `IT Department'
--
--O
--     The Organization Name; e.g. `The Sample Company'
--
--L
--     The Locality Name; e.g. `Sydney'
--
--ST
--     The State Name; e.g. `New South Wales'
--
--C
--     The 2-letter Country identifier; e.g. `AU'
--
--   When specified with a `-dname' option, each pair of component/value
--will be separated from the other with a comma. Each component and value
--pair MUST be separated by an equal sign. For example, the following is
--a valid DN value:
--CN=host.domain.com, O=The Sample Company, L=Sydney, ST=NSW, C=AU
--
--If the Distinguished Name is required, and no valid default value can
--be used, the tool will prompt you to enter the information through the
--console.
--
--
--File: cp-tools.info,  Node: Add/Update Commands,  Next: Export Commands,  Prev: Distinguished Names,  Up: keytool Tool
--
--2.2.4 Add/Update commands
---------------------------
--
--* Menu:
--
--* Command -genkey::            Generate private key and self-signed certificate
--* Command -import::            Import certificates and certificate replies
--* Command -selfcert::          Generate self-signed certificate
--* Command -cacert::            Import a CA Trusted Certificate
--* Command -identitydb::        Import JDK-1 style identities
--
--
--File: cp-tools.info,  Node: Command -genkey,  Next: Command -import,  Prev: Add/Update Commands,  Up: Add/Update Commands
--
--2.2.4.1 The `-genkey' command
--.............................
--
--Use this command to generate a new key-pair (both private and public
--keys), and save these credentials in the key store as a Key Entry,
--associated with the designated (if was specified with the `-alias'
--option) or default (if the `-alias' option is omitted) Alias.
--
--   The private key material will be protected with a user-defined
--password (see `-keypass' option). The public key on the other hand will
--be part of a self-signed X.509 certificate, which will form a 1-element
--chain and will be saved in the key store.
--
--`-alias ALIAS'
--     For more details *note ALIAS: alias.
--
--`-keyalg ALGORITHM'
--     For more details *note ALGORITHM: keyalg.
--
--`-keysize KEY_SIZE'
--     For more details *note KEY_SIZE: keysize.
--
--`-sigalg ALGORITHM'
--     The canonical name of the digital signature algorithm to use for
--     signing certificates. If this option is omitted, a default value
--     will be chosen based on the type of the key-pair; i.e. the
--     algorithm that ends up being used by the -keyalg option. If the
--     key-pair generation algorithm is `DSA', the value for the
--     signature algorithm will be `SHA1withDSA'. If on the other hand
--     the key-pair generation algorithm is `RSA', then the tool will use
--     `MD5withRSA' as the signature algorithm.
--
--`-dname NAME'
--     This a mandatory value for the command. If no value is specified
--     -i.e. the `-dname' option is omitted- the tool will prompt you to
--     enter a Distinguished Name to use as both the Owner and Issuer of
--     the generated self-signed certificate.
--
--     For more details *note X.500 DISTINGUISHED NAME: dn.
--
--`-keypass PASSWORD'
--     Use this option to specify the password which the tool will use to
--     protect the newly created Key Entry.
--
--     If this option is omitted, you will be prompted to provide a
--     password.
--
--`-validity DAY_COUNT'
--     For more details *note DAY_COUNT: validity.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Command -import,  Next: Command -selfcert,  Prev: Command -genkey,  Up: Add/Update Commands
--
--2.2.4.2 The `-import' command
--.............................
--
--Use this command to read an X.509 certificate, or a PKCS#7 Certificate
--Reply from a designated input source and incorporate the certificates
--into the key store.
--
--   If the Alias does not already exist in the key store, the tool
--treats the certificate read from the input source as a new Trusted
--Certificate. It then attempts to discover a chain-of-trust, starting
--from that certificate and ending at another Trusted Certificate,
--already stored in the key store. If the `-trustcacerts' option is
--present, an additional key store, of type `JKS' named `cacerts', and
--assumed to be present in `${JAVA_HOME}/lib/security' will also be
--consulted if found -`${JAVA_HOME}' refers to the location of an
--installed Java Runtime Environment (JRE). If no chain-of-trust can be
--established, and unless the `-noprompt' option has been specified, the
--certificate is printed to `STDOUT' and the user is prompted for a
--confirmation.
--
--   If Alias exists in the key store, the tool will treat the
--certificate(s) read from the input source as a Certificate Reply, which
--can be a chain of certificates, that eventually would replace the chain
--of certificates associated with the Key Entry of that Alias. The
--substitution of the certificates only occurs if a chain-of-trust can be
--established between the bottom certificate of the chain read from the
--input file and the Trusted Certificates already present in the key
--store. Again, if the `-trustcacerts' option is specified, additional
--Trusted Certificates in the same `cacerts' key store will be
--considered. If no chain-of-trust can be established, the operation will
--abort.
--
--`-alias ALIAS'
--     For more details *note ALIAS: alias.
--
--`-file FILE'
--     For more details *note FILE: file.
--
--`-keypass PASSWORD'
--     Use this option to specify the password which the tool will use to
--     protect the Key Entry associated with the designated Alias, when
--     replacing this Alias' chain of certificates with that found in the
--     certificate reply.
--
--     If this option is omitted, and the chain-of-trust for the
--     certificate reply has been established, the tool will first
--     attempt to unlock the Key Entry using the same password protecting
--     the key store. If this fails, you will then be prompted to provide
--     a password.
--
--`-noprompt'
--     Use this option to prevent the tool from prompting the user.
--
--`-trustcacerts'
--     Use this option to indicate to the tool that a key store, of type
--     `JKS', named `cacerts', and usually located in `lib/security' in
--     an installed Java Runtime Environment should be considered when
--     trying to establish chain-of-trusts.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Command -selfcert,  Next: Command -cacert,  Prev: Command -import,  Up: Add/Update Commands
--
--2.2.4.3 The `-selfcert' command
--...............................
--
--Use this command to generate a self-signed X.509 version 1 certificate.
--The newly generated certificate will form a chain of one element which
--will replace the previous chain associated with the designated Alias
--(if `-alias' option was specified), or the default Alias (if `-alias'
--option was omitted).
--
--`-alias ALIAS'
--     For more details *note ALIAS: alias.
--
--`-sigalg ALGORITHM'
--     The canonical name of the digital signature algorithm to use for
--     signing the certificate. If this option is omitted, a default
--     value will be chosen based on the type of the private key
--     associated with the designated Alias. If the private key is a
--     `DSA' one, the value for the signature algorithm will be
--     `SHA1withDSA'. If on the other hand the private key is an `RSA'
--     one, then the tool will use `MD5withRSA' as the signature
--     algorithm.
--
--`-dname NAME'
--     Use this option to specify the Distinguished Name of the newly
--     generated self-signed certificate. If this option is omitted, the
--     existing Distinguished Name of the base certificate in the chain
--     associated with the designated Alias will be used instead.
--
--     For more details *note X.500 DISTINGUISHED NAME: dn.
--
--`-validity DAY_COUNT'
--     For more details *note DAY_COUNT: validity.
--
--`-keypass PASSWORD'
--     Use this option to specify the password which the tool will use to
--     unlock the Key Entry associated with the designated Alias.
--
--     If this option is omitted, the tool will first attempt to unlock
--     the Key Entry using the same password protecting the key store. If
--     this fails, you will then be prompted to provide a password.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Command -cacert,  Next: Command -identitydb,  Prev: Command -selfcert,  Up: Add/Update Commands
--
--2.2.4.4 The `-cacert' command
--.............................
--
--Use this command to import, a CA certificate and add it to the key
--store as a Trusted Certificate. The Alias for this new entry will be
--constructed from the FILE's base-name after replacing hyphens and dots
--with underscores.
--
--   This command is useful when used in a script that recursively visits
--a directory of CA certificates to populate a `cacerts.gkr' Key Store of
--trusted certificates which can then be used commands that specify the
--`-trustcacerts' option.
--
--`-file FILE'
--     For more details *note FILE: file.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Command -identitydb,  Prev: Command -cacert,  Up: Add/Update Commands
--
--2.2.4.5 The `-identitydb' command
--.................................
--
--NOT IMPLEMENTED YET.
--
--   Use this command to import a JDK 1.1 style Identity Database.
--
--`-file FILE'
--     For more details *note FILE: file.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Export Commands,  Next: Display Commands,  Prev: Add/Update Commands,  Up: keytool Tool
--
--2.2.5 Export commands
-----------------------
--
--* Menu:
--
--* Command -certreq::           Generate Certificate Signing Requests (CSR)
--* Command -export::            Export a certificate in a Key Store
--
--
--File: cp-tools.info,  Node: Command -certreq,  Next: Command -export,  Prev: Export Commands,  Up: Export Commands
--
--2.2.5.1 The `-certreq' command
--..............................
--
--Use this command to generate a PKCS#10 Certificate Signing Request
--(CSR) and write it to a designated output destination. The contents of
--the destination should look something like the following:
--
--     -----BEGIN NEW CERTIFICATE REQUEST-----
--     MI...QAwXzEUMBIGA1UEAwwLcnNuQGdudS5vcmcxGzAZBgNVBAoMElUg
--     Q2...A0GA1UEBwwGU3lkbmV5MQwwCgYDVQQIDANOU1cxCzAJBgNVBACC
--     ...
--     FC...IVwNVOfQLRX+O5kAhQ/a4RTZme2L8PnpvgRwrf7Eg8D6w==
--     -----END NEW CERTIFICATE REQUEST-----
--
--   IMPORTANT: Some documentation (e.g. RSA examples) claims that the
--`Attributes' field, in the CSR is `OPTIONAL' while RFC-2986 implies the
--opposite. This implementation considers this field, by default, as
--`OPTIONAL', unless the option `-attributes' is specified on the command
--line.
--
--`-alias ALIAS'
--     For more details *note ALIAS: alias.
--
--`-sigalg ALGORITHM'
--     The canonical name of the digital signature algorithm to use for
--     signing the certificate. If this option is omitted, a default
--     value will be chosen based on the type of the private key
--     associated with the designated Alias. If the private key is a
--     `DSA' one, the value for the signature algorithm will be
--     `SHA1withDSA'. If on the other hand the private key is an `RSA'
--     one, then the tool will use `MD5withRSA' as the signature
--     algorithm.
--
--`-file FILE'
--     For more details *note FILE: file.
--
--`-keypass PASSWORD'
--     Use this option to specify the password which the tool will use to
--     unlock the Key Entry associated with the designated Alias.
--
--     If this option is omitted, the tool will first attempt to unlock
--     the Key Entry using the same password protecting the key store. If
--     this fails, you will then be prompted to provide a password.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--`-attributes'
--     Use this option to force the tool to encode a `NULL' DER value in
--     the CSR as the value of the `Attributes' field.
--
--
--
--File: cp-tools.info,  Node: Command -export,  Prev: Command -certreq,  Up: Export Commands
--
--2.2.5.2 The `-export' command
--.............................
--
--Use this command to export a certificate stored in a key store to a
--designated output destination, either in binary format (if the `-v'
--option is specified), or in RFC-1421 compliant encoding (if the `-rfc'
--option is specified instead).
--
--`-alias ALIAS'
--     For more details *note ALIAS: alias.
--
--`-file FILE'
--     For more details *note FILE: file.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-rfc'
--     Use RFC-1421 specifications when encoding the output.
--
--`-v'
--     Output the certificate in binary DER encoding. This is the default
--     output format of the command if neither `-rfc' nor `-v' options
--     were detected on the command line. If both this option and the
--     `-rfc' option are detected on the command line, the tool will opt
--     for the RFC-1421 style encoding.
--
--
--
--File: cp-tools.info,  Node: Display Commands,  Next: Management Commands,  Prev: Export Commands,  Up: keytool Tool
--
--2.2.6 Display commands
------------------------
--
--* Menu:
--
--* Command -list::              Display information about one or all Aliases
--* Command -printcert::         Print a certificate or a certificate fingerprint
--
--
--File: cp-tools.info,  Node: Command -list,  Next: Command -printcert,  Prev: Display Commands,  Up: Display Commands
--
--2.2.6.1 The `-list' command
--...........................
--
--Use this command to print one or all of a key store entries to
--`STDOUT'. Usually this command will only print a fingerprint of the
--certificate, unless either the `-rfc' or the `-v' option is specified.
--
--`-alias ALIAS'
--     If this option is omitted, the tool will print ALL the entries
--     found in the key store.
--
--     For more details *note ALIAS: alias.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-rfc'
--     Use RFC-1421 specifications when encoding the output.
--
--`-v'
--     Output the certificate in human-readable format. If both this
--     option and the `-rfc' option are detected on the command line, the
--     tool will opt for the human-readable form and will not abort the
--     command.
--
--
--
--File: cp-tools.info,  Node: Command -printcert,  Prev: Command -list,  Up: Display Commands
--
--2.2.6.2 The `-printcert' command
--................................
--
--Use this command to read a certificate from a designated input source
--and print it to `STDOUT' in a human-readable form.
--
--`-file FILE'
--     For more details *note FILE: file.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Management Commands,  Prev: Display Commands,  Up: keytool Tool
--
--2.2.7 Management commands
---------------------------
--
--* Menu:
--
--* Command -keyclone::          Clone a Key Entry in a Key Store
--* Command -storepasswd::       Change the password protecting a Key Store
--* Command -keypasswd::         Change the password protecting a Key Entry
--* Command -delete::            Remove an entry in a Key Store
--
--
--File: cp-tools.info,  Node: Command -keyclone,  Next: Command -storepasswd,  Prev: Management Commands,  Up: Management Commands
--
--2.2.7.1 The `-keyclone' command
--...............................
--
--Use this command to clone an existing Key Entry and store it under a
--new (different) Alias protecting, its private key material with
--possibly a new password.
--
--`-alias ALIAS'
--     For more details *note ALIAS: alias.
--
--`-dest ALIAS'
--     Use this option to specify the new Alias which will be used to
--     identify the cloned copy of the Key Entry.
--
--`-keypass PASSWORD'
--     Use this option to specify the password which the tool will use to
--     unlock the Key Entry associated with the designated Alias.
--
--     If this option is omitted, the tool will first attempt to unlock
--     the Key Entry using the same password protecting the key store. If
--     this fails, you will then be prompted to provide a password.
--
--`-new PASSWORD'
--     Use this option to specify the password protecting the private key
--     material of the newly cloned copy of the Key Entry.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Command -storepasswd,  Next: Command -keypasswd,  Prev: Command -keyclone,  Up: Management Commands
--
--2.2.7.2 The `-storepasswd' command
--..................................
--
--Use this command to change the password protecting a key store.
--
--`-new PASSWORD'
--     The new, and different, password which will be used to protect the
--     designated key store.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Command -keypasswd,  Next: Command -delete,  Prev: Command -storepasswd,  Up: Management Commands
--
--2.2.7.3 The `-keypasswd' command
--................................
--
--Use this command to change the password protecting the private key
--material of a designated Key Entry.
--
--`-alias ALIAS'
--     For more details *note ALIAS: alias.
--
--     Use this option to specify the password which the tool will use to
--     unlock the Key Entry associated with the designated Alias.
--
--     If this option is omitted, the tool will first attempt to unlock
--     the Key Entry using the same password protecting the key store. If
--     this fails, you will then be prompted to provide a password.
--
--`-new PASSWORD'
--     The new, and different, password which will be used to protect the
--     private key material of the designated Key Entry.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Command -delete,  Prev: Command -keypasswd,  Up: Management Commands
--
--2.2.7.4 The `-delete' command
--.............................
--
--Use this command to delete a designated key store entry.
--
--`-alias ALIAS'
--     For more details *note ALIAS: alias.
--
--`-storetype STORE_TYPE'
--     For more details *note STORE_TYPE: storetype.
--
--`-keystore URL'
--     For more details *note URL: keystore.
--
--`-storepass PASSWORD'
--     For more details *note PASSWORD: storepass.
--
--`-provider PROVIDER_CLASS_NAME'
--     For more details *note PROVIDER_CLASS_NAME: provider.
--
--`-v'
--     For more details *note verbose::.
--
--
--
--File: cp-tools.info,  Node: Other Tools,  Next: I18N Issues,  Prev: Security Tools,  Up: Top
--
--3 Other Tools
--*************
--
--This is a list of currently undocumented classpath tools: jar, javah,
--gcjh, native2ascii, orbd, serialver, rmid, rmiregistry and tnameserv.
--
--* Menu:
--
--* jar Tool::                   Archive tool for Java archives
--* javah Tool::                 A java header compiler
--* gcjh Tool::                  A java header compiler (old version)
--* native2ascii Tool::          An encoding converter
--* orbd Tool::                  An object request broker daemon
--* serialver Tool::             A serial version command
--* rmid Tool::                  RMI activation daemon
--* rmiregistry Tool::           Remote object registry
--* tnameserv Tool::             Naming service
--
--
--File: cp-tools.info,  Node: jar Tool,  Next: javah Tool,  Up: Other Tools
--
--3.1 The `jar' Tool
--==================
--
--`gjar' is an implementation of Sun's jar utility that comes with the
--JDK.
--
--   If any file is a directory then it is processed recursively.  The
--manifest file name and the archive file name needs to be specified in
--the same order the `-m' and `-f' flags are specified.
--
--   Operation mode:
--
--`-c'
--     Create new archive.
--
--`-t'
--     List table of contents for archive.
--
--`-x'
--     Extract named (or all) files from archive.
--
--`-u'
--     Update existing archive.
--
--`-i FILE'
--     Compute archive index.
--
--   Operation modifiers:
--
--`-f FILE'
--     Specify archive file name.
--
--`-0'
--     Store only; use no ZIP compression.
--
--`-v'
--     Generate verbose output on standard output.
--
--`-M'
--     Do not create a manifest file for the entries.
--
--`-m MANIFEST'
--     Include manifest information from specified MANIFEST file.
--
--   File name selection:
--
--`-C DIR FILE'
--     Change to the DIR and include the following FILE.
--
--`-@'
--     Read the names of the files to add to the archive from stdin.  This
--     option is supported only in combination with `-c' or `-u'.  Non
--     standard option added in the GCC version.
--
--   Standard options:
--
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   java(1), ...
--
--
--File: cp-tools.info,  Node: javah Tool,  Next: gcjh Tool,  Prev: jar Tool,  Up: Other Tools
--
--3.2 The `javah' Tool
--====================
--
--The `gjavah' program is used to generate header files from class files.
--It can generate both CNI and JNI header files, as well as stub
--implementation files which can be used as a basis for implementing the
--required native methods.
--
--`-d DIR'
--     Set output directory.
--
--`-o FILE'
--     Set output file (only one of `-d' or `-o' may be used).
--
--`-cmdfile FILE'
--     Read command file.
--
--`-all DIR'
--     Operate on all class files under directory DIR.
--
--`-stubs'
--     Emit stub implementation.
--
--`-jni'
--     Emit JNI stubs or header (default).
--
--`-cni'
--     Emit CNI stubs or header (default JNI).
--
--`-verbose'
--     Set verbose mode.
--
--`-force'
--     Output files should always be written.
--
--   Class path options:
--`-classpath PATH'
--     Set the class path.
--
--`-IDIR'
--     Add directory to class path.
--
--`-bootclasspath PATH'
--     Set the boot class path.
--
--`-extdirs PATH'
--     Set the extension directory path.
--
--   Standard options:
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   javac(1), ...
--
--
--File: cp-tools.info,  Node: gcjh Tool,  Next: native2ascii Tool,  Prev: javah Tool,  Up: Other Tools
--
--3.3 The `gcjh' Tool
--===================
--
--The `gcjh' program is used to generate header files from class files.
--It can generate both CNI and JNI header files, as well as stub
--implementation files which can be used as a basis for implementing the
--required native methods.  It is similar to `javah' but has slightly
--different command line options, and defaults to CNI.
--
--   See `javah' for a full description; this page only lists the
--additional options provided by `gcjh'.
--
--   CNI text options
--`-add TEXT'
--     Insert TEXT into class body.
--
--`-append TEXT'
--     Append TEXT after class declaration.
--
--`-friend TEXT'
--     Insert TEXT as a `friend' declaration.
--
--`-prepend TEXT'
--     Insert TEXT before start of class.
--
--   Compatibility options (unused)
--`-td DIR'
--`-M'
--`-MM'
--`-MD'
--`-MMD'
--     Unused compatibility option.
--
--   Standard options:
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   javac(1), javah(1), ...
--
--
--File: cp-tools.info,  Node: native2ascii Tool,  Next: orbd Tool,  Prev: gcjh Tool,  Up: Other Tools
--
--3.4 The `native2ascii' Tool
--===========================
--
--To be written ...
--
--`-encoding NAME'
--     Set the encoding to use.
--
--`-reversed'
--     Convert from encoding to native.
--
--   Standard options:
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   javac(1), ...
--
--
--File: cp-tools.info,  Node: orbd Tool,  Next: serialver Tool,  Prev: native2ascii Tool,  Up: Other Tools
--
--3.5 The `orbd' object request broker daemon
--===========================================
--
--To be written ...
--
--`-ORBInitialPort PORT'
--     Port on which persistent naming service is to be started.
--
--`-ior FILE'
--     File in which to store persistent naming service's IOR reference
--
--`-directory DIR'
--     Directory in which to store persistent data.
--
--`-restart'
--     Restart persistent naming service, clearing persistent naming
--     database.
--
--   Standard options:
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   java(1), ...
--
--
--File: cp-tools.info,  Node: serialver Tool,  Next: rmid Tool,  Prev: orbd Tool,  Up: Other Tools
--
--3.6 The `serialver' version command
--===================================
--
--Print the serialVersionUID of the specified classes.
--
--`-classpath PATH'
--     Class path to use to find classes.
--
--   Standard options:
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   javac(1), ...
--
--
--File: cp-tools.info,  Node: rmid Tool,  Next: rmiregistry Tool,  Prev: serialver Tool,  Up: Other Tools
--
--3.7 The `rmid' RMI activation system daemon
--===========================================
--
--`rmiregistry' starts a remote object registry on the current host.  If
--no port number is specified, then port 1099 is used.
--
--   Activation process control:
--`-port PORT'
--     Port on which activation system is to be started.
--
--`-restart'
--     Restart activation system, clearing persistent naming database, if
--     any.
--
--`-stop'
--     Stop activation system.
--
--   Persistence:
--`-persistent'
--     Make activation system persistent.
--
--`-directory DIR'
--     Directory in which to store persistent data.
--
--   Debugging:
--`-verbose'
--     Log binding events to standard out.
--
--   Standard options:
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   java(1), ...
--
--
--File: cp-tools.info,  Node: rmiregistry Tool,  Next: tnameserv Tool,  Prev: rmid Tool,  Up: Other Tools
--
--3.8 The `rmiregistry' Tool
--==========================
--
--`grmiregistry' starts a remote object registry on the current host.  If
--no port number is specified, then port 1099 is used.
--
--   Registry process control:
--`-restart'
--     Restart RMI naming service, clearing persistent naming database, if
--     any.
--
--`-stop'
--     Stop RMI naming service.
--
--   Persistence:
--`-persistent'
--     Make RMI naming service persistent.
--
--`-directory DIR'
--     Directory in which to store persistent data.
--
--   Debugging:
--`-verbose'
--     Log binding events to standard out.
--
--   Standard options:
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   java(1), ...
--
--
--File: cp-tools.info,  Node: tnameserv Tool,  Prev: rmiregistry Tool,  Up: Other Tools
--
--3.9 The `tnameserv' Tool
--========================
--
--To be written ...
--
--`-ORBInitialPort PORT'
--     Port on which naming service is to be started.
--
--`-ior FILE'
--     File in which to store naming service's IOR reference.
--
--   Standard options:
--`-help'
--     Print help text, then exit.
--
--`-version'
--     Print version number, then exit.
--
--`-JOPTION'
--     Pass argument to the Java runtime.
--
--   java(1), ...
--
--
--File: cp-tools.info,  Node: I18N Issues,  Prev: Other Tools,  Up: Top
--
--4 I18N Issues
--*************
--
--Some tools -*note Security Tools::- allow using other than the English
--language when prompting the User for input, and outputing messages.
--This chapter describes the elements used to offer this support and how
--they can be adapted for use with specific languages.
--
--* Menu:
--
--* Language Resources::         Where resources are located
--* Message Formats::            How messages are internationalized
--
--
--File: cp-tools.info,  Node: Language Resources,  Next: Message Formats,  Prev: I18N Issues,  Up: I18N Issues
--
--4.1 Language-specific resources
--===============================
--
--The Tools use Java `ResourceBundle's to store messages, and message
--templates they use at runtime to generate the message text itself,
--depending on the locale in use at the time.
--
--   The Resource Bundles these tools use are essentially Java Properties
--files consisting of a set of Name/Value pairs. The Name is the Propery
--Name and the Value is a substitution string that is used when the code
--references the associated Name. For example the following is a line in
--a Resource Bundle used by the `keytool' Tool:
--
--     Command.23=A correct key password MUST be provided
--
--   When the tool needs to signal a mandatory but missing key password,
--it would reference the property named `Command.23' and the message "`A
--correct key password MUST be provided'" will be used instead. This
--indirect referencing of "resources" permits replacing, as late as
--possible, the English strings with strings in other languages, provided
--of course Resource Bundles in those languages are provided.
--
--   For the GNU Classpath Tools described in this Guide, the Resource
--Bundles are files named `messages[_ll[_CC[_VV]]].properties' where:
--
--LL
--     Is the 2-letter code for the Language,
--
--CC
--     Is the 2-letter code for the Region, and
--
--VV
--     Is the 2-letter code for the Variant of the language.
--
--   The complete list of language codes can be found at Code for the
--representation of names of languages
--(http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt). A similar
--list for the region codes can be found at ISO 3166 Codes (Countries)
--(http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html).
--
--   The location of the Resource Bundles for the GNU Classpath Tools is
--specific to each tool. The next table shows where these files are found
--in a standard GNU Classpath distribution:
--
--`jarsigner'
--     `gnu/classpath/tools/jarsigner'
--
--`keytool'
--     `gnu/classpath/tools/keytool'
--
--   The collection of Resource Bundles in a location act as an inverted
--tree with a parent-child relationship. For example suppose in the
--`gnu/classpath/tools/keytool' there are 3 message bundles named:
--
--  1. `messages.properties'
--
--  2. `messages_fr.properties'
--
--  3. `messages_fr_FR.properties'
--
--   In the above example, bundle #1 will act as the parent of bundle #2,
--which in turn will act as the parent for bundle #3. This ordering is
--used by the Java runtime to choose which file to load based on the set
--Locale. For example if the Locale is `fr_CH', `messages_fr.properties'
--will be used because (a) `messages_fr_CH.properties' does not exist,
--but (b) `messages_fr.properties' is the parent for the required bundle,
--and it exists. As another example, suppose the Locale was set to
--`en_AU'; then the tool will end up using `messages.properties' because
--(a) `messages_en_AU.properties' does not exist, (b)
--`messages_en.properties' which is the parent for the required bundle
--does not exist, but (c) `messages.properties' exists and is the root of
--the hierarchy.
--
--   You can see from the examples above that `messages.properties' is
--the safety net that the Java runtime falls back to when failing to find
--a specific bunlde and its parent(s). This file is always provided with
--the Tool. In time, more localized versions will be included to cater
--for other languages.
--
--   In the meantime, if you are willing to contribute localized versions
--of these resources, grab the `messages.properties' for a specific tool;
--translate it; save it with the appropriate language and region suffix
--and mail it to `classpath@gnu.org'.
--
--
--File: cp-tools.info,  Node: Message Formats,  Prev: Language Resources,  Up: I18N Issues
--
--4.2 Message formats
--===================
--
--If you open any of the `messages.properties' described in the previous
--section, you may see properties that look like so:
--
--     Command.67=Issuer: {0}
--     Command.68=Serial number: {0,number}
--     Command.69=Valid from: {0,date,full} - {0,time,full}
--     Command.70=\ \ \ \ \ until: {0,date,full} - {0,time,full}
--
--   These are Message Formats used by the tools to customize a text
--string that will then be used either as a prompt for User input or as
--output.
--
--   If you are translating a `messages.properties' be careful not to
--alter text between curly braces.
--
--
--
--Tag Table:
--Node: Top445
--Node: Applet Tools3894
--Node: appletviewer Tool4467
--Node: gcjwebplugin7582
--Node: Security Tools7894
--Node: jarsigner Tool8547
--Node: Common jarsigner Options9594
--Node: Signing Options10909
--Node: Verification Options13491
--Node: keytool Tool14079
--Node: Getting Help18507
--Node: Common keytool Options19251
--Ref: alias19524
--Ref: keyalg19906
--Ref: keysize20136
--Ref: validity20401
--Ref: storetype20616
--Ref: storepass20947
--Ref: keystore21144
--Ref: provider21687
--Ref: file22094
--Ref: verbose22565
--Node: Distinguished Names22657
--Ref: dn22851
--Node: Add/Update Commands23914
--Node: Command -genkey24442
--Node: Command -import26850
--Node: Command -selfcert29994
--Node: Command -cacert32173
--Node: Command -identitydb33226
--Node: Export Commands33884
--Node: Command -certreq34200
--Node: Command -export36606
--Node: Display Commands37803
--Node: Command -list38135
--Node: Command -printcert39268
--Node: Management Commands39652
--Node: Command -keyclone40084
--Node: Command -storepasswd41487
--Node: Command -keypasswd42216
--Node: Command -delete43410
--Node: Other Tools44033
--Node: jar Tool44818
--Node: javah Tool46210
--Node: gcjh Tool47429
--Node: native2ascii Tool48542
--Node: orbd Tool49003
--Node: serialver Tool49733
--Node: rmid Tool50202
--Node: rmiregistry Tool51143
--Node: tnameserv Tool51983
--Node: I18N Issues52473
--Node: Language Resources52974
--Node: Message Formats56637
--
--End Tag Table
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gappletviewer.1 gcc-4.3.3/libjava/classpath/doc/gappletviewer.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gappletviewer.1	2009-01-24 04:05:54.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gappletviewer.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,244 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GAPPLETVIEWER 1"
--.TH GAPPLETVIEWER 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gappletviewer \- Load and runs an applet
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--appletviewer [\fI\s-1OPTION\s0\fR]... \fI\s-1URL\s0\fR...
--.PP
--appletviewer [\fI\s-1OPTION\s0\fR]... \fB\-code\fR \fI\s-1CODE\s0\fR
--.PP
--appletviewer [\fI\s-1OPTION\s0\fR]... \fB\-plugin\fR \fI\s-1INPUT\s0\fR,\fI\s-1OUTPUT\s0\fR
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--The \fBappletviewer\fR tool loads and runs an applet.
--.PP
--Use the first form to test applets specified by tag.  The \s-1URL\s0 should
--resolve to an \s-1HTML\s0 document from which the \fBappletviewer\fR will
--extract applet tags.  The \s-1APPLET\s0, \s-1EMBED\s0 and \s-1OBJECT\s0 tags are supported.
--If a given document contains multiple applet tags, all the applets
--will be loaded, with each applet appearing in its own window.
--Likewise, when multiple URLs are specified, each applet tag instance
--is given its own window.  If a given document contains no recognized
--tags the \fBappletviewer\fR does nothing.
--.PP
--.Vb 1
--\&        appletviewer http://www.gnu.org/software/classpath/
--.Ve
--.PP
--Use the second form to test an applet in development.  This form
--allows applet tag attributes to be supplied on the command line.  Only
--one applet may be specified using the \fB\-code\fR option.  The
--\&\fB\-code\fR option overrides the \s-1URL\s0 form \*(-- any URLs specified will
--be ignored.
--.PP
--.Vb 1
--\&        appletviewer \-code Test.class \-param datafile,data.txt
--.Ve
--.PP
--\&\fBgcjwebplugin\fR uses the third form to communicate with the
--\&\fBappletviewer\fR through named pipes.
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--\&\s-1URL\s0 \s-1OPTIONS\s0
--.IP "\fB\-debug\fR" 4
--.IX Item "-debug"
--This option is not yet implemented but is provided for compatibility.
--.IP "\fB\-encoding\fR \fI\s-1CHARSET\s0\fR" 4
--.IX Item "-encoding CHARSET"
--Use this option to specify an alternate character encoding for the
--specified \s-1HTML\s0 page.
--.PP
--\&\s-1APPLET\s0 \s-1TAG\s0 \s-1OPTIONS\s0
--.IP "\fB\-code\fR \fI\s-1CODE\s0\fR" 4
--.IX Item "-code CODE"
--Use the \fB\-code\fR option to specify the value of the applet tag
--\&\fI\s-1CODE\s0\fR attribute.
--.IP "\fB\-codebase\fR \fI\s-1CODEBASE\s0\fR" 4
--.IX Item "-codebase CODEBASE"
--Use the \fB\-codebase\fR option to specify the value of the applet tag
--\&\fI\s-1CODEBASE\s0\fR attribute.
--.IP "\fB\-archive\fR \fI\s-1ARCHIVE\s0\fR" 4
--.IX Item "-archive ARCHIVE"
--Use the \fB\-archive\fR option to specify the value of the applet tag
--\&\fI\s-1ARCHIVE\s0\fR attribute.
--.IP "\fB\-width\fR \fI\s-1WIDTH\s0\fR" 4
--.IX Item "-width WIDTH"
--Use the \fB\-width\fR option to specify the value of the applet tag
--\&\fI\s-1WIDTH\s0\fR attribute.
--.IP "\fB\-height\fR \fI\s-1HEIGHT\s0\fR" 4
--.IX Item "-height HEIGHT"
--Use the \fB\-height\fR option to specify the value of the applet tag
--\&\fI\s-1HEIGHT\s0\fR attribute.
--.IP "\fB\-param\fR \fI\s-1NAME\s0\fR\fB,\fR\fI\s-1VALUE\s0\fR" 4
--.IX Item "-param NAME,VALUE"
--Use the \fB\-param\fR option to specify values for the \fI\s-1NAME\s0\fR
--and \fI\s-1VALUE\s0\fR attributes of an applet \s-1PARAM\s0 tag.
--.PP
--\&\s-1PLUGIN\s0 \s-1OPTION\s0
--.IP "\fB\-plugin\fR \fI\s-1INPUT\s0\fR\fB,\fR\fI\s-1OUTPUT\s0\fR" 4
--.IX Item "-plugin INPUT,OUTPUT"
--\&\fBgcjwebplugin\fR uses the \fB\-plugin\fR option to specify the
--named pipe the \fBappletviewer\fR should use for receiving commands
--(\fI\s-1INPUT\s0\fR) and the one it should use for sending commands to
--\&\fBgcjwebplugin\fR (\fI\s-1OUTPUT\s0\fR).
--.PP
--\&\s-1DEBUGGING\s0 \s-1OPTION\s0
--.IP "\fB\-verbose\fR" 4
--.IX Item "-verbose"
--Use the \fB\-verbose\fR option to have the \fBappletviewer\fR print
--debugging messages.
--.PP
--\&\s-1STANDARD\s0 \s-1OPTIONS\s0
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Use the \fB\-help\fR option to have the \fBappletviewer\fR print a
--usage message, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Use the \fB\-version\fR option to have the \fBappletviewer\fR print
--its version, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Use the \fB\-J\fR option to pass \fI\s-1OPTION\s0\fR to the virtual machine that
--will run the \fBappletviewer\fR.  Unlike other options, there must
--not be a space between the \fB\-J\fR and \fI\s-1OPTION\s0\fR.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjar.1 gcc-4.3.3/libjava/classpath/doc/gjar.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gjar.1	2009-01-24 04:05:54.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gjar.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,211 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GJAR 1"
--.TH GJAR 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gjar \- \- Archive tool for Java archives
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--gjar \fB\-ctxui\fR [\fI\s-1OPTIONS\s0\fR] \fIjar-file\fR [\fB\-C\fR \fI\s-1DIR\s0\fR \fI\s-1FILE\s0\fR] \fI\s-1FILE\s0\fR...
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--\&\fBgjar\fR is an implementation of Sun's jar utility that comes with
--the \s-1JDK\s0.
--.PP
--If any file is a directory then it is processed recursively.  The
--manifest file name and the archive file name needs to be specified in
--the same order the \fB\-m\fR and \fB\-f\fR flags are specified.
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--Operation mode:
--.IP "\fB\-c\fR" 4
--.IX Item "-c"
--Create new archive.
--.IP "\fB\-t\fR" 4
--.IX Item "-t"
--List table of contents for archive.
--.IP "\fB\-x\fR" 4
--.IX Item "-x"
--Extract named (or all) files from archive.
--.IP "\fB\-u\fR" 4
--.IX Item "-u"
--Update existing archive.
--.IP "\fB\-i\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-i FILE"
--Compute archive index.
--.PP
--Operation modifiers:
--.IP "\fB\-f\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-f FILE"
--Specify archive file name.
--.IP "\fB\-0\fR" 4
--.IX Item "-0"
--Store only; use no \s-1ZIP\s0 compression.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--Generate verbose output on standard output.
--.IP "\fB\-M\fR" 4
--.IX Item "-M"
--Do not create a manifest file for the entries.
--.IP "\fB\-m\fR \fImanifest\fR" 4
--.IX Item "-m manifest"
--Include manifest information from specified \fImanifest\fR file.
--.PP
--File name selection:
--.IP "\fB\-C\fR \fI\s-1DIR\s0\fR\fB \fR\fI\s-1FILE\s0\fR" 4
--.IX Item "-C DIR FILE"
--Change to the \fI\s-1DIR\s0\fR and include the following \fI\s-1FILE\s0\fR.
--.IP "\fB\-@\fR" 4
--.IX Item "-@"
--Read the names of the files to add to the archive from stdin.  This
--option is supported only in combination with \fB\-c\fR or \fB\-u\fR.
--Non standard option added in the \s-1GCC\s0 version.
--.PP
--Standard options:
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Print help text, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Print version number, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Pass argument to the Java runtime.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
--\&\fIjava\fR\|(1), ...
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjarsigner.1 gcc-4.3.3/libjava/classpath/doc/gjarsigner.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gjarsigner.1	2009-01-24 04:05:55.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gjarsigner.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,216 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GJARSIGNER 1"
--.TH GJARSIGNER 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gjarsigner \- Java ARchive (JAR) file signing and verification tool
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--jarsigner [\fI\s-1OPTION\s0\fR]... \fI\s-1FILE\s0\fR \fI\s-1ALIAS\s0\fR
--.PP
--jarsigner \fB\-verify\fR [\fI\s-1OPTION\s0\fR]... \fI\s-1FILE\s0\fR
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--When the first form is used, the tool signs the designated \s-1JAR\s0 file. The second form, on the other hand, is used to verify a previously signed \s-1JAR\s0 file.
--.PP
--\&\fI\s-1FILE\s0\fR is the .JAR file to process; i.e. to sign if the first syntax form is used, or to verify if the second syntax form is used instead.
--.PP
--\&\fI\s-1ALIAS\s0\fR must be a known \fIAlias\fR of a \fIKey Entry\fR in the designated \fIKey Store\fR. The private key material associated with this \fIAlias\fR is then used for signing the designated .JAR file.
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--\fICommon options\fR
--.IX Subsection "Common options"
--.PP
--The following options may be used when the tool is used for either signing, or verifying, a .JAR file.
--.IP "\fB\-verbose\fR" 4
--.IX Item "-verbose"
--Use this option to force the tool to generate more verbose messages, during its processing.
--.IP "\fB\-internalsf\fR" 4
--.IX Item "-internalsf"
--When present, the tool will include \-\-which otherwise it does not\*(-- the \f(CW\*(C`.SF\*(C'\fR file in the \f(CW\*(C`.DSA\*(C'\fR generated file.
--.IP "\fB\-sectionsonly\fR" 4
--.IX Item "-sectionsonly"
--When present, the tool will include in the \f(CW\*(C`.SF\*(C'\fR generated file \-\-which otherwise it does not\*(-- a header containing a hash of the whole manifest file.  When that header is included, the tool can quickly check, during verification, if the hash (in the header) matches or not the manifest file.
--.IP "\fB\-provider \s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--A fully qualified class name of a \fISecurity Provider\fR to add to the current list of \fISecurity Providers\fR already installed in the \s-1JVM\s0 in-use. If a provider class is specified with this option, and was successfully added to the runtime \-\-i.e. it was not already installed\*(-- then the tool will attempt to remove this \fISecurity Provider\fR before exiting.
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Prints a help text similar to this one.
--.PP
--\fISigning options\fR
--.IX Subsection "Signing options"
--.PP
--The following options may be specified when using the tool for signing purposes.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--Use this option to specify the location of the key store to use. The default value is a file \s-1URL\s0 referencing the file named \fI.keystore\fR located in the path returned by the call to \f(CW\*(C`java.lang.System#getProperty(String)\*(C'\fR using \f(CW\*(C`user.home\*(C'\fR as argument.
--.Sp
--If a \s-1URL\s0 was specified, but was found to be malformed \-\-e.g. missing protocol element\*(-- the tool will attempt to use the \s-1URL\s0 value as a file-name (with absolute or relative path-name) of a key store \-\-as if the protocol was \f(CW\*(C`file:\*(C'\fR.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--Use this option to specify the type of the key store to use. The default value, if this option is omitted, is that of the property \f(CW\*(C`keystore.type\*(C'\fR in the security properties file, which is obtained by invoking the static method call \f(CW\*(C`getDefaultType()\*(C'\fR in \f(CW\*(C`java.security.KeyStore\*(C'\fR.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--Use this option to specify the password which will be used to unlock the key store. If this option is missing, the User will be prompted to provide a password.
--.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-keypass PASSWORD"
--Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
--.Sp
--If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
--.IP "\fB\-sigfile\fR \fI\s-1NAME\s0\fR" 4
--.IX Item "-sigfile NAME"
--Use this option to designate a literal that will be used to construct file names for both the \f(CW\*(C`.SF\*(C'\fR and \f(CW\*(C`.DSA\*(C'\fR signature files. These files  will be generated, by the tool, and placed in the \fIMETA-INF\fR directory of the signed \s-1JAR\s0.  Permissible characters for \fI\s-1NAME\s0\fR must be in the range \*(L"a\-zA\-Z0\-9_\-\*(R".  All characters will be converted to upper-case ones.
--.Sp
--If this option is missing, the first eight characters of the \fI\s-1ALIAS\s0\fR argument will be used. When this is the case, any character in \fI\s-1ALIAS\s0\fR that is outside the permissible range of characters will be replaced by an underscore.
--.IP "\fB\-signedjar\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-signedjar FILE"
--Use this option to specify the file name of the signed \s-1JAR\s0. If this option is omitted, then the signed \s-1JAR\s0 will be named the same as \fI\s-1FILE\s0\fR; i.e. the input \s-1JAR\s0 file will be replaced with the signed copy.
--.PP
--\fIVerification options\fR
--.IX Subsection "Verification options"
--.PP
--The following options may be specified when using the tool for verification purposes.
--.IP "\fB\-verify\fR" 4
--.IX Item "-verify"
--Use this option to indicate that the tool is to be used for verification purposes.
--.IP "\fB\-certs\fR" 4
--.IX Item "-certs"
--This option is used in conjunction with the \fB\-verbose\fR option. When present, along with the \fB\-verbose\fR option, the tool will print more detailed information about the certificates of the signer(s) being processed.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjavah.1 gcc-4.3.3/libjava/classpath/doc/gjavah.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gjavah.1	2009-01-24 04:05:55.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gjavah.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,207 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GJAVAH 1"
--.TH GJAVAH 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gjavah \- \- generate header files from Java class files
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--gjavah ...
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--The \fBgjavah\fR program is used to generate header files from class
--files.  It can generate both \s-1CNI\s0 and \s-1JNI\s0 header files, as well as stub
--implementation files which can be used as a basis for implementing the
--required native methods.
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--.IP "\fB\-d\fR \fI\s-1DIR\s0\fR" 4
--.IX Item "-d DIR"
--Set output directory.
--.IP "\fB\-o\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-o FILE"
--Set output file (only one of \fB\-d\fR or \fB\-o\fR may be used).
--.IP "\fB\-cmdfile\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-cmdfile FILE"
--Read command file.
--.IP "\fB\-all\fR \fI\s-1DIR\s0\fR" 4
--.IX Item "-all DIR"
--Operate on all class files under directory \fI\s-1DIR\s0\fR.
--.IP "\fB\-stubs\fR" 4
--.IX Item "-stubs"
--Emit stub implementation.
--.IP "\fB\-jni\fR" 4
--.IX Item "-jni"
--Emit \s-1JNI\s0 stubs or header (default).
--.IP "\fB\-cni\fR" 4
--.IX Item "-cni"
--Emit \s-1CNI\s0 stubs or header (default \s-1JNI\s0).
--.IP "\fB\-verbose\fR" 4
--.IX Item "-verbose"
--Set verbose mode.
--.IP "\fB\-force\fR" 4
--.IX Item "-force"
--Output files should always be written.
--.PP
--Class path options:
--.IP "\fB\-classpath\fR \fI\s-1PATH\s0\fR" 4
--.IX Item "-classpath PATH"
--Set the class path.
--.IP "\fB\-I\fR\fI\s-1DIR\s0\fR" 4
--.IX Item "-IDIR"
--Add directory to class path.
--.IP "\fB\-bootclasspath\fR \fI\s-1PATH\s0\fR" 4
--.IX Item "-bootclasspath PATH"
--Set the boot class path.
--.IP "\fB\-extdirs\fR \fI\s-1PATH\s0\fR" 4
--.IX Item "-extdirs PATH"
--Set the extension directory path.
--.PP
--Standard options:
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Print help text, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Print version number, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Pass argument to the Java runtime.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
--\&\fIjavac\fR\|(1), ...
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gkeytool.1 gcc-4.3.3/libjava/classpath/doc/gkeytool.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gkeytool.1	2009-01-24 04:05:55.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gkeytool.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,692 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GKEYTOOL 1"
--.TH GKEYTOOL 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gkeytool \- Manage private keys and public certificates
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--keytool [\fI\s-1COMMAND\s0\fR] ...
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--Cryptographic credentials, in a Java environment, are usually stored in a \fIKey Store\fR. The Java \s-1SDK\s0 specifies a \fIKey Store\fR as a persistent container of two types of objects: \fIKey Entries\fR and \fITrusted Certificates\fR. The security tool \fBkeytool\fR is a Java-based application for managing those types of objects.
--.PP
--A \fIKey Entry\fR represents the private key part of a key-pair used in Public-Key Cryptography, and a signed X.509 certificate which authenticates the public key part for a known entity; i.e. the owner of the key-pair. The X.509 certificate itself contains the public key part of the key-pair.
--.PP
--A \fITrusted Certificate\fR is a signed X.509 certificate issued by a trusted entity. The \fITrust\fR in this context is relative to the User of the \fBkeytool\fR. In other words, the existence of a \fITrusted Certificate\fR in the \fIKey Store\fR processed by a \fBkeytool\fR command implies that the User trusts the \fIIssuer\fR of that \fITrusted Certificate\fR to also sign, and hence authenticates, other \fISubjects\fR the tool may process.
--.PP
--\&\fITrusted Certificates\fR are important because they allow the tool to mechanically construct \fIChains of Trust\fR starting from one of the \fITrusted Certificates\fR in a \fIKey Store\fR and ending with a certificate whose \fIIssuer\fR is potentially unknown. A valid chain is an ordered list, starting with a \fITrusted Certificate\fR (also called the \fIanchor\fR), ending with the target certificate, and satisfying the condition that the \fISubject\fR of certificate \f(CW\*(C`#i\*(C'\fR is the \fIIssuer\fR of certificate \f(CW\*(C`#i + 1\*(C'\fR.
--.PP
--The \fBkeytool\fR is invoked from the command line as follows:
--.PP
--.Vb 1
--\&        keytool [COMMAND] ...
--.Ve
--.PP
--Multiple \fI\s-1COMMAND\s0\fRs may be specified at once, each complete with its own options. \fBkeytool\fR will parse all the arguments, before processing, and executing, each \f(CW\*(C`COMMAND\*(C'\fR. If an exception occurs while executing one \fI\s-1COMMAND\s0\fR \fBkeytool\fR will abort. Note however that because the implementation of the tool uses code to parse command line options that also supports GNU-style options, you have to separate each command group with a double-hyphen; e.g
--.PP
--.Vb 1
--\&        keytool \-list \-\- \-printcert \-alias mykey
--.Ve
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--.IP "\- Add/Update commands" 4
--.IX Item "- Add/Update commands"
--.RS 4
--.PD 0
--.IP "\fB\-genkey [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-genkey [OPTION]..."
--.PD
--Generate a new \fIKey Entry\fR, eventually creating a new key store.
--.IP "\fB\-import [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-import [OPTION]..."
--Add, to a key store, \fIKey Entries\fR (private keys and certificate chains authenticating the public keys) and \fITrusted Certificates\fR (3rd party certificates which can be used as \fITrust Anchors\fR when building chains-of-trust).
--.IP "\fB\-selfcert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-selfcert [OPTION]..."
--Generate a new self-signed \fITrusted Certificate\fR.
--.IP "\fB\-cacert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-cacert [OPTION]..."
--Import a \s-1CA\s0 \fITrusted Certificate\fR.
--.IP "\fB\-identitydb [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-identitydb [OPTION]..."
--\&\fB\s-1NOT\s0 \s-1IMPLEMENTED\s0 \s-1YET\s0\fR.Import a \s-1JDK\s0 1.1 style Identity Database.
--.RE
--.RS 4
--.RE
--.IP "\- Export commands" 4
--.IX Item "- Export commands"
--.RS 4
--.PD 0
--.IP "\fB\-certreq [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-certreq [OPTION]..."
--.PD
--Issue a \fICertificate Signing Request\fR (\s-1CSR\s0) which can be then sent to a \fICertification Authority\fR (\s-1CA\s0) to issue a certificate signed (by the \s-1CA\s0) and authenticating the \fISubject\fR of the request.
--.IP "\fB\-export [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-export [OPTION]..."
--Export a certificate from a key store.
--.RE
--.RS 4
--.RE
--.IP "\- Display commands" 4
--.IX Item "- Display commands"
--.RS 4
--.PD 0
--.IP "\fB\-list [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-list [OPTION]..."
--.PD
--Print one or all certificates in a key store to \f(CW\*(C`STDOUT\*(C'\fR.
--.IP "\fB\-printcert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-printcert [OPTION]..."
--Print a human-readable form of a certificate, in a designated file, to \f(CW\*(C`STDOUT\*(C'\fR.
--.RE
--.RS 4
--.RE
--.IP "\- Management commands" 4
--.IX Item "- Management commands"
--.RS 4
--.PD 0
--.IP "\fB\-keyclone [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-keyclone [OPTION]..."
--.PD
--Clone a \fIKey Entry\fR in a key store.
--.IP "\fB\-storepasswd [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-storepasswd [OPTION]..."
--Change the password protecting a key store.
--.IP "\fB\-keypasswd [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-keypasswd [OPTION]..."
--Change the password protecting a \fIKey Entry\fR in a key store.
--.IP "\fB\-delete [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
--.IX Item "-delete [OPTION]..."
--Delete a \fIKey Entry\fR or a \fITrusted Certificate\fR from a key store.
--.RE
--.RS 4
--.RE
--.PP
--\fICommon options\fR
--.IX Subsection "Common options"
--.PP
--The following \fB\s-1OPTION\s0\fRs are used in more than one \fB\s-1COMMAND\s0\fR. They are described here to reduce redundancy.
--.IP "\fB\-alias\fR \fIAlias\fR" 4
--.IX Item "-alias Alias"
--Every entry, be it a \fIKey Entry\fR or a \fITrusted Certificate\fR, in a key store is uniquely identified by a user-defined \fIAlias\fR string. Use this option to specify the \fIAlias\fR to use when referring to an entry in the key store. Unless specified otherwise, a default value of \f(CW\*(C`mykey\*(C'\fR shall be used when this option is omitted from the command line.
--.IP "\fB\-keyalg\fR \fI\s-1ALGORITHM\s0\fR" 4
--.IX Item "-keyalg ALGORITHM"
--Use this option to specify the canonical name of the key-pair generation algorithm. The default value for this option is \f(CW\*(C`DSS\*(C'\fR (a synonym for the Digital Signature Algorithm also known as \s-1DSA\s0).
--.IP "\fB\-keysize\fR \fI\s-1SIZE\s0\fR" 4
--.IX Item "-keysize SIZE"
--Use this option to specify the number of bits of the shared modulus (for both the public and private keys) to use when generating new keys. A default value of \f(CW1024\fR will be used if this option is omitted from the command line.
--.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4
--.IX Item "-validity DAY_COUNT"
--Use this option to specify the number of days a newly generated certificate will be valid for. The default value is \f(CW90\fR (days) if this option is omitted from the command line.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--Use this option to specify the type of the key store to use. The default value, if this option is omitted, is that of the property \f(CW\*(C`keystore.type\*(C'\fR in the security properties file, which is obtained by invoking the static method call \f(CW\*(C`getDefaultType()\*(C'\fR in \f(CW\*(C`java.security.KeyStore\*(C'\fR.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--Use this option to specify the password protecting the key store. If this option is omitted from the command line, you will be prompted to provide a password.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--Use this option to specify the location of the key store to use. The default value is a file \s-1URL\s0 referencing the file named \fI.keystore\fR located in the path returned by the call to \f(CW\*(C`java.lang.System#getProperty(String)\*(C'\fR using \f(CW\*(C`user.home\*(C'\fR as argument.
--.Sp
--If a \s-1URL\s0 was specified, but was found to be malformed \-\-e.g. missing protocol element\*(-- the tool will attempt to use the \s-1URL\s0 value as a file-name (with absolute or relative path-name) of a key store \-\-as if the protocol was \f(CW\*(C`file:\*(C'\fR.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--A fully qualified class name of a \fISecurity Provider\fR to add to the current list of \fISecurity Providers\fR already installed in the \s-1JVM\s0 in-use. If a provider class is specified with this option, and was successfully added to the runtime \-\-i.e. it was not already installed\*(-- then the tool will attempt to removed this \fISecurity Provider\fR before exiting.
--.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-file FILE"
--Use this option to designate a file to use with a command. When specified with this option, the value is expected to be the fully qualified path of a file accessible by the File System. Depending on the command, the file may be used as input or as output. When this option is omitted from the command line, \f(CW\*(C`STDIN\*(C'\fR will be used instead, as the source of input, and \f(CW\*(C`STDOUT\*(C'\fR will be used instead as the output destination.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--Unless specified otherwise, use this option to enable more verbose output.
--.PP
--\fIAdd/Update commands\fR
--.IX Subsection "Add/Update commands"
--.PP
--The \fB\-genkey\fR command
--.IX Subsection "The -genkey command"
--.PP
--Use this command to generate a new key-pair (both private and public keys), and save these credentials in the key store as a \fIKey Entry\fR, associated with the designated (if was specified with the \fB\-alias\fR option) or default (if the \fB\-alias\fR option is omitted) \fIAlias\fR.
--.PP
--The private key material will be protected with a user-defined password (see \fB\-keypass\fR option). The public key on the other hand will be part of a self-signed X.509 certificate, which will form a 1\-element chain and will be saved in the key store.
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keyalg\fR \fI\s-1ALGORITHM\s0\fR" 4
--.IX Item "-keyalg ALGORITHM"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keysize\fR \fI\s-1KEY_SIZE\s0\fR" 4
--.IX Item "-keysize KEY_SIZE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4
--.IX Item "-sigalg ALGORITHM"
--The canonical name of the digital signature algorithm to use for signing certificates. If this option is omitted, a default value will be chosen based on the type of the key-pair; i.e. the algorithm that ends up being used by the \-keyalg option. If the key-pair generation algorithm is \f(CW\*(C`DSA\*(C'\fR, the value for the signature algorithm will be \f(CW\*(C`SHA1withDSA\*(C'\fR. If on the other hand the key-pair generation algorithm is \f(CW\*(C`RSA\*(C'\fR, then the tool will use \f(CW\*(C`MD5withRSA\*(C'\fR as the signature algorithm.
--.IP "\fB\-dname\fR \fI\s-1NAME\s0\fR" 4
--.IX Item "-dname NAME"
--This a mandatory value for the command. If no value is specified \-\-i.e. the \fB\-dname\fR option is omitted\*(-- the tool will prompt you to enter a \fIDistinguished Name\fR to use as both the \fIOwner\fR and \fIIssuer\fR of the generated self-signed certificate.
--.Sp
--See \fICommon Options\fR for more details.
--.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-keypass PASSWORD"
--Use this option to specify the password which the tool will use to protect the newly created \fIKey Entry\fR.
--.Sp
--If this option is omitted, you will be prompted to provide a password.
--.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4
--.IX Item "-validity DAY_COUNT"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--The \fB\-import\fR command
--.IX Subsection "The -import command"
--.PP
--Use this command to read an X.509 certificate, or a PKCS#7 \fICertificate Reply\fR from a designated input source and incorporate the certificates into the key store.
--.PP
--If the \fIAlias\fR does not already exist in the key store, the tool treats the certificate read from the input source as a new \fITrusted Certificate\fR. It then attempts to discover a chain-of-trust, starting from that certificate and ending at another \fITrusted Certificate\fR, already stored in the key store. If the \fB\-trustcacerts\fR option is present, an additional key store, of type \f(CW\*(C`JKS\*(C'\fR named \fIcacerts\fR, and assumed to be present in \fI${\s-1JAVA_HOME\s0}/lib/security\fR will also be consulted if found \-\-\f(CW\*(C`${JAVA_HOME}\*(C'\fR refers to the location of an installed \fIJava Runtime Environment\fR (\s-1JRE\s0). If no chain-of-trust can be established, and unless the \f(CW\*(C`\-noprompt\*(C'\fR option has been specified, the certificate is printed to \f(CW\*(C`STDOUT\*(C'\fR and the user is prompted for a confirmation.
--.PP
--If \fIAlias\fR exists in the key store, the tool will treat the certificate(s) read from the input source as a \fICertificate Reply\fR, which can be a chain of certificates, that eventually would replace the chain of certificates associated with the \fIKey Entry\fR of that \fIAlias\fR. The substitution of the certificates only occurs if a chain-of-trust can be established between the bottom certificate of the chain read from the input file and the \fITrusted Certificates\fR already present in the key store. Again, if the \fB\-trustcacerts\fR option is specified, additional \fITrusted Certificates\fR in the same \fIcacerts\fR key store will be considered. If no chain-of-trust can be established, the operation will abort.
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--See \fICommon Options\fR for more details.
--.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-file FILE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-keypass PASSWORD"
--Use this option to specify the password which the tool will use to protect the \fIKey Entry\fR associated with the designated \fIAlias\fR, when replacing this \fIAlias\fR' chain of certificates with that found in the certificate reply.
--.Sp
--If this option is omitted, and the chain-of-trust for the certificate reply has been established, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
--.IP "\fB\-noprompt\fR" 4
--.IX Item "-noprompt"
--Use this option to prevent the tool from prompting the user.
--.IP "\fB\-trustcacerts\fR" 4
--.IX Item "-trustcacerts"
--Use this option to indicate to the tool that a key store, of type \f(CW\*(C`JKS\*(C'\fR, named \fIcacerts\fR, and usually located in \fIlib/security\fR in an installed \fIJava Runtime Environment\fR should be considered when trying to establish chain-of-trusts.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--The \fB\-selfcert\fR command
--.IX Subsection "The -selfcert command"
--.PP
--Use this command to generate a self-signed X.509 version 1 certificate. The newly generated certificate will form a chain of one element which will replace the previous chain associated with the designated \fIAlias\fR (if \fB\-alias\fR option was specified), or the default \fIAlias\fR (if \fB\-alias\fR option was omitted).
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--See \fICommon Options\fR for more details.
--.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4
--.IX Item "-sigalg ALGORITHM"
--The canonical name of the digital signature algorithm to use for signing the certificate. If this option is omitted, a default value will be chosen based on the type of the private key associated with the designated \fIAlias\fR. If the private key is a \f(CW\*(C`DSA\*(C'\fR one, the value for the signature algorithm will be \f(CW\*(C`SHA1withDSA\*(C'\fR. If on the other hand the private key is an \f(CW\*(C`RSA\*(C'\fR one, then the tool will use \f(CW\*(C`MD5withRSA\*(C'\fR as the signature algorithm.
--.IP "\fB\-dname\fR \fI\s-1NAME\s0\fR" 4
--.IX Item "-dname NAME"
--Use this option to specify the \fIDistinguished Name\fR of the newly generated self-signed certificate. If this option is omitted, the existing \fIDistinguished Name\fR of the base certificate in the chain associated with the designated \fIAlias\fR will be used instead.
--.Sp
--See \fICommon Options\fR for more details.
--.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4
--.IX Item "-validity DAY_COUNT"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-keypass PASSWORD"
--Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
--.Sp
--If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--The \fB\-cacert\fR command
--.IX Subsection "The -cacert command"
--.PP
--Use this command to import, a \s-1CA\s0 certificate and add it to the key store as a \fITrusted Certificate\fR. The \fIAlias\fR for this new entry will be constructed from the \s-1FILE\s0's base-name after replacing hyphens and dots with underscores.
--.PP
--This command is useful when used in a script that recursively visits a directory of \s-1CA\s0 certificates to populate a \f(CW\*(C`cacerts.gkr\*(C'\fR \fIKey Store\fR of trusted certificates which can then be used commands that specify the \fB\-trustcacerts\fR option.
--.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-file FILE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--The \fB\-identitydb\fR command
--.IX Subsection "The -identitydb command"
--.PP
--\&\fB\s-1NOT\s0 \s-1IMPLEMENTED\s0 \s-1YET\s0\fR.
--.PP
--Use this command to import a \s-1JDK\s0 1.1 style Identity Database.
--.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-file FILE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--\fIExport commands\fR
--.IX Subsection "Export commands"
--.PP
--The \fB\-certreq\fR command
--.IX Subsection "The -certreq command"
--.PP
--Use this command to generate a PKCS#10 \fICertificate Signing Request\fR (\s-1CSR\s0) and write it to a designated output destination. The contents of the destination should look something like the following:
--.PP
--.Vb 6
--\&        \-\-\-\-\-BEGIN NEW CERTIFICATE REQUEST\-\-\-\-\-
--\&        MI...QAwXzEUMBIGA1UEAwwLcnNuQGdudS5vcmcxGzAZBgNVBAoMElUg
--\&        Q2...A0GA1UEBwwGU3lkbmV5MQwwCgYDVQQIDANOU1cxCzAJBgNVBACC
--\&        ...
--\&        FC...IVwNVOfQLRX+O5kAhQ/a4RTZme2L8PnpvgRwrf7Eg8D6w==
--\&        \-\-\-\-\-END NEW CERTIFICATE REQUEST\-\-\-\-\-
--.Ve
--.PP
--\&\fB\s-1IMPORTANT\s0\fR: Some documentation (e.g. \s-1RSA\s0 examples) claims that the \f(CW\*(C`Attributes\*(C'\fR field, in the \s-1CSR\s0 is \f(CW\*(C`OPTIONAL\*(C'\fR while \s-1RFC\-2986\s0 implies the opposite. This implementation considers this field, by default, as \f(CW\*(C`OPTIONAL\*(C'\fR, unless the option \fB\-attributes\fR is specified on the command line.
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--See \fICommon Options\fR for more details.
--.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4
--.IX Item "-sigalg ALGORITHM"
--The canonical name of the digital signature algorithm to use for signing the certificate. If this option is omitted, a default value will be chosen based on the type of the private key associated with the designated \fIAlias\fR. If the private key is a \f(CW\*(C`DSA\*(C'\fR one, the value for the signature algorithm will be \f(CW\*(C`SHA1withDSA\*(C'\fR. If on the other hand the private key is an \f(CW\*(C`RSA\*(C'\fR one, then the tool will use \f(CW\*(C`MD5withRSA\*(C'\fR as the signature algorithm.
--.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-file FILE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-keypass PASSWORD"
--Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
--.Sp
--If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.IP "\fB\-attributes\fR" 4
--.IX Item "-attributes"
--Use this option to force the tool to encode a \f(CW\*(C`NULL\*(C'\fR \s-1DER\s0 value in the \s-1CSR\s0 as the value of the \f(CW\*(C`Attributes\*(C'\fR field.
--.PP
--The \fB\-export\fR command
--.IX Subsection "The -export command"
--.PP
--Use this command to export a certificate stored in a key store to a designated output destination, either in binary format (if the \fB\-v\fR option is specified), or in \s-1RFC\-1421\s0 compliant encoding (if the \fB\-rfc\fR option is specified instead).
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--See \fICommon Options\fR for more details.
--.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-file FILE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-rfc\fR" 4
--.IX Item "-rfc"
--Use \s-1RFC\-1421\s0 specifications when encoding the output.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--Output the certificate in binary \s-1DER\s0 encoding. This is the default output format of the command if neither \fB\-rfc\fR nor \f(CW\*(C`\-v\*(C'\fR options were detected on the command line. If both this option and the \fB\-rfc\fR option are detected on the command line, the tool will opt for the \s-1RFC\-1421\s0 style encoding.
--.PP
--\fIDisplay commands\fR
--.IX Subsection "Display commands"
--.PP
--The \fB\-list\fR command
--.IX Subsection "The -list command"
--.PP
--Use this command to print one or all of a key store entries to \f(CW\*(C`STDOUT\*(C'\fR. Usually this command will only print a \fIfingerprint\fR of the certificate, unless either the \fB\-rfc\fR or the \fB\-v\fR option is specified.
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--If this option is omitted, the tool will print \s-1ALL\s0 the entries found in the key store.
--.Sp
--See \fICommon Options\fR for more details.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-rfc\fR" 4
--.IX Item "-rfc"
--Use \s-1RFC\-1421\s0 specifications when encoding the output.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--Output the certificate in human-readable format. If both this option and the \fB\-rfc\fR option are detected on the command line, the tool will opt for the human-readable form and will not abort the command.
--.PP
--The \fB\-printcert\fR command
--.IX Subsection "The -printcert command"
--.PP
--Use this command to read a certificate from a designated input source and print it to \f(CW\*(C`STDOUT\*(C'\fR in a human-readable form.
--.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-file FILE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--\fIManagement commands\fR
--.IX Subsection "Management commands"
--.PP
--The \fB\-keyclone\fR command
--.IX Subsection "The -keyclone command"
--.PP
--Use this command to clone an existing \fIKey Entry\fR and store it under a new (different) \fIAlias\fR protecting, its private key material with possibly a new password.
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--See \fICommon Options\fR for more details.
--.IP "\fB\-dest\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-dest ALIAS"
--Use this option to specify the new \fIAlias\fR which will be used to identify the cloned copy of the \fIKey Entry\fR.
--.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-keypass PASSWORD"
--Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
--.Sp
--If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
--.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-new PASSWORD"
--Use this option to specify the password protecting the private key material of the newly cloned copy of the \fIKey Entry\fR.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--The \fB\-storepasswd\fR command
--.IX Subsection "The -storepasswd command"
--.PP
--Use this command to change the password protecting a key store.
--.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-new PASSWORD"
--The new, and different, password which will be used to protect the designated key store.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--The \fB\-keypasswd\fR command
--.IX Subsection "The -keypasswd command"
--.PP
--Use this command to change the password protecting the private key material of a designated \fIKey Entry\fR.
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--See \fICommon Options\fR for more details.
--.Sp
--Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
--.Sp
--If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
--.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-new PASSWORD"
--The new, and different, password which will be used to protect the private key material of the designated \fIKey Entry\fR.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.PP
--The \fB\-delete\fR command
--.IX Subsection "The -delete command"
--.PP
--Use this command to delete a designated key store entry.
--.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
--.IX Item "-alias ALIAS"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
--.IX Item "-storetype STORE_TYPE"
--See \fICommon Options\fR for more details.
--.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
--.IX Item "-keystore URL"
--See \fICommon Options\fR for more details.
--.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
--.IX Item "-storepass PASSWORD"
--See \fICommon Options\fR for more details.
--.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
--.IX Item "-provider PROVIDER_CLASS_NAME"
--See \fICommon Options\fR for more details.
--.IP "\fB\-v\fR" 4
--.IX Item "-v"
--See \fICommon Options\fR for more details.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gnative2ascii.1 gcc-4.3.3/libjava/classpath/doc/gnative2ascii.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gnative2ascii.1	2009-01-24 04:05:55.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gnative2ascii.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,169 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GNATIVE2ASCII 1"
--.TH GNATIVE2ASCII 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gnative2ascii \- \- An encoding converter
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--gnative2ascii [\fI\s-1OPTIONS\s0\fR]... [\fI\s-1INPUTFILE\s0\fR [\fI\s-1OUTPUTFILE\s0\fR]]
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--To be written ...
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--.IP "\fB\-encoding\fR \fI\s-1NAME\s0\fR" 4
--.IX Item "-encoding NAME"
--Set the encoding to use.
--.IP "\fB\-reversed\fR" 4
--.IX Item "-reversed"
--Convert from encoding to native.
--.PP
--Standard options:
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Print help text, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Print version number, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Pass argument to the Java runtime.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
--\&\fIjavac\fR\|(1), ...
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gorbd.1 gcc-4.3.3/libjava/classpath/doc/gorbd.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gorbd.1	2009-01-24 04:05:56.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gorbd.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,176 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GORBD 1"
--.TH GORBD 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gorbd \- \- An object request broker daemon
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--gorbd ...
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--To be written ...
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--.IP "\fB\-ORBInitialPort\fR \fI\s-1PORT\s0\fR" 4
--.IX Item "-ORBInitialPort PORT"
--Port on which persistent naming service is to be started.
--.IP "\fB\-ior\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-ior FILE"
--File in which to store persistent naming service's \s-1IOR\s0 reference
--.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4
--.IX Item "-directory DIR"
--Directory in which to store persistent data.
--.IP "\fB\-restart\fR" 4
--.IX Item "-restart"
--Restart persistent naming service, clearing persistent naming
--database.
--.PP
--Standard options:
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Print help text, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Print version number, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Pass argument to the Java runtime.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
--\&\fIjava\fR\|(1), ...
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/grmid.1 gcc-4.3.3/libjava/classpath/doc/grmid.1
---- gcc-4.3.3.orig/libjava/classpath/doc/grmid.1	2009-01-24 04:05:56.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/grmid.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,188 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GRMID 1"
--.TH GRMID 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--grmid \- \- RMI activation system daemon
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--grmid [\fI\s-1OPTIONS\s0\fR]...
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--\&\fBrmiregistry\fR starts a remote object registry on the current
--host.  If no port number is specified, then port 1099 is used.
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--Activation process control:
--.IP "\fB\-port\fR \fI\s-1PORT\s0\fR" 4
--.IX Item "-port PORT"
--Port on which activation system is to be started.
--.IP "\fB\-restart\fR" 4
--.IX Item "-restart"
--Restart activation system, clearing persistent naming database, if
--any.
--.IP "\fB\-stop\fR" 4
--.IX Item "-stop"
--Stop activation system.
--.PP
--Persistence:
--.IP "\fB\-persistent\fR" 4
--.IX Item "-persistent"
--Make activation system persistent.
--.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4
--.IX Item "-directory DIR"
--Directory in which to store persistent data.
--.PP
--Debugging:
--.IP "\fB\-verbose\fR" 4
--.IX Item "-verbose"
--Log binding events to standard out.
--.PP
--Standard options:
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Print help text, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Print version number, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Pass argument to the Java runtime.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
--\&\fIjava\fR\|(1), ...
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/grmiregistry.1 gcc-4.3.3/libjava/classpath/doc/grmiregistry.1
---- gcc-4.3.3.orig/libjava/classpath/doc/grmiregistry.1	2009-01-24 04:05:56.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/grmiregistry.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,185 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GRMIREGISTRY 1"
--.TH GRMIREGISTRY 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--grmiregistry \- \- Remote object registry
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--grmiregistry [\fI\s-1OPTIONS\s0\fR]... \fI\s-1PORT\s0\fR
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--\&\fBgrmiregistry\fR starts a remote object registry on the current
--host.  If no port number is specified, then port 1099 is used.
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--Registry process control:
--.IP "\fB\-restart\fR" 4
--.IX Item "-restart"
--Restart \s-1RMI\s0 naming service, clearing persistent naming database, if
--any.
--.IP "\fB\-stop\fR" 4
--.IX Item "-stop"
--Stop \s-1RMI\s0 naming service.
--.PP
--Persistence:
--.IP "\fB\-persistent\fR" 4
--.IX Item "-persistent"
--Make \s-1RMI\s0 naming service persistent.
--.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4
--.IX Item "-directory DIR"
--Directory in which to store persistent data.
--.PP
--Debugging:
--.IP "\fB\-verbose\fR" 4
--.IX Item "-verbose"
--Log binding events to standard out.
--.PP
--Standard options:
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Print help text, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Print version number, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Pass argument to the Java runtime.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
--\&\fIjava\fR\|(1), ...
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gserialver.1 gcc-4.3.3/libjava/classpath/doc/gserialver.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gserialver.1	2009-01-24 04:05:56.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gserialver.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,166 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GSERIALVER 1"
--.TH GSERIALVER 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gserialver \- version command
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--gserialver [\fI\s-1OPTIONS\s0\fR]... \fI\s-1CLASS\s0\fR...
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--Print the serialVersionUID of the specified classes.
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--.IP "\fB\-classpath\fR \fI\s-1PATH\s0\fR" 4
--.IX Item "-classpath PATH"
--Class path to use to find classes.
--.PP
--Standard options:
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Print help text, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Print version number, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Pass argument to the Java runtime.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
--\&\fIjavac\fR\|(1), ...
-diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gtnameserv.1 gcc-4.3.3/libjava/classpath/doc/gtnameserv.1
---- gcc-4.3.3.orig/libjava/classpath/doc/gtnameserv.1	2009-01-24 04:05:56.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/doc/gtnameserv.1	1969-12-31 16:00:00.000000000 -0800
-@@ -1,169 +0,0 @@
--.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
--.\"
--.\" Standard preamble:
--.\" ========================================================================
--.de Sh \" Subsection heading
--.br
--.if t .Sp
--.ne 5
--.PP
--\fB\\$1\fR
--.PP
--..
--.de Sp \" Vertical space (when we can't use .PP)
--.if t .sp .5v
--.if n .sp
--..
--.de Vb \" Begin verbatim text
--.ft CW
--.nf
--.ne \\$1
--..
--.de Ve \" End verbatim text
--.ft R
--.fi
--..
--.\" Set up some character translations and predefined strings.  \*(-- will
--.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
--.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
--.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
--.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
--.\" nothing in troff, for use with C<>.
--.tr \(*W-
--.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
--.ie n \{\
--.    ds -- \(*W-
--.    ds PI pi
--.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
--.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
--.    ds L" ""
--.    ds R" ""
--.    ds C` ""
--.    ds C' ""
--'br\}
--.el\{\
--.    ds -- \|\(em\|
--.    ds PI \(*p
--.    ds L" ``
--.    ds R" ''
--'br\}
--.\"
--.\" Escape single quotes in literal strings from groff's Unicode transform.
--.ie \n(.g .ds Aq \(aq
--.el       .ds Aq '
--.\"
--.\" If the F register is turned on, we'll generate index entries on stderr for
--.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
--.\" entries marked with X<> in POD.  Of course, you'll have to process the
--.\" output yourself in some meaningful fashion.
--.ie \nF \{\
--.    de IX
--.    tm Index:\\$1\t\\n%\t"\\$2"
--..
--.    nr % 0
--.    rr F
--.\}
--.el \{\
--.    de IX
--..
--.\}
--.\"
--.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
--.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
--.    \" fudge factors for nroff and troff
--.if n \{\
--.    ds #H 0
--.    ds #V .8m
--.    ds #F .3m
--.    ds #[ \f1
--.    ds #] \fP
--.\}
--.if t \{\
--.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
--.    ds #V .6m
--.    ds #F 0
--.    ds #[ \&
--.    ds #] \&
--.\}
--.    \" simple accents for nroff and troff
--.if n \{\
--.    ds ' \&
--.    ds ` \&
--.    ds ^ \&
--.    ds , \&
--.    ds ~ ~
--.    ds /
--.\}
--.if t \{\
--.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
--.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
--.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
--.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
--.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
--.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
--.\}
--.    \" troff and (daisy-wheel) nroff accents
--.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
--.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
--.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
--.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
--.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
--.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
--.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
--.ds ae a\h'-(\w'a'u*4/10)'e
--.ds Ae A\h'-(\w'A'u*4/10)'E
--.    \" corrections for vroff
--.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
--.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
--.    \" for low resolution devices (crt and lpr)
--.if \n(.H>23 .if \n(.V>19 \
--\{\
--.    ds : e
--.    ds 8 ss
--.    ds o a
--.    ds d- d\h'-1'\(ga
--.    ds D- D\h'-1'\(hy
--.    ds th \o'bp'
--.    ds Th \o'LP'
--.    ds ae ae
--.    ds Ae AE
--.\}
--.rm #[ #] #H #V #F C
--.\" ========================================================================
--.\"
--.IX Title "GTNAMESERV 1"
--.TH GTNAMESERV 1 "2009-01-24" "0.96-pre" "GNU"
--.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
--.\" way too many mistakes in technical documents.
--.if n .ad l
--.nh
--.SH "NAME"
--gtnameserv \- Naming service
--.SH "SYNOPSIS"
--.IX Header "SYNOPSIS"
--tnameserv [\fI\s-1OPTIONS\s0\fR]
--.SH "DESCRIPTION"
--.IX Header "DESCRIPTION"
--To be written ...
--.SH "OPTIONS"
--.IX Header "OPTIONS"
--.IP "\fB\-ORBInitialPort\fR \fI\s-1PORT\s0\fR" 4
--.IX Item "-ORBInitialPort PORT"
--Port on which naming service is to be started.
--.IP "\fB\-ior\fR \fI\s-1FILE\s0\fR" 4
--.IX Item "-ior FILE"
--File in which to store naming service's \s-1IOR\s0 reference.
--.PP
--Standard options:
--.IP "\fB\-help\fR" 4
--.IX Item "-help"
--Print help text, then exit.
--.IP "\fB\-version\fR" 4
--.IX Item "-version"
--Print version number, then exit.
--.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
--.IX Item "-JOPTION"
--Pass argument to the Java runtime.
--.SH "SEE ALSO"
--.IX Header "SEE ALSO"
--\&\fIjava\fR\|(1), ...
-diff -Naur gcc-4.3.3.orig/libjava/java/lang/natClassLoader.cc gcc-4.3.3/libjava/java/lang/natClassLoader.cc
---- gcc-4.3.3.orig/libjava/java/lang/natClassLoader.cc	2007-05-31 02:30:39.000000000 -0700
-+++ gcc-4.3.3/libjava/java/lang/natClassLoader.cc	2009-03-13 11:19:59.111425000 -0700
-@@ -325,6 +325,15 @@
-   if (! klass->engine)
-     klass->engine = &_Jv_soleCompiledEngine;
- 
-+  /* FIXME:  Way back before the dawn of time, we overloaded the
-+     SYNTHETIC class access modifier to mean INTERPRETED.  This was a
-+     Bad Thing, but it didn't matter then because classes were never
-+     marked synthetic.  However, it is possible to redeem the
-+     situation: _Jv_RegisterClassHookDefault is only called from
-+     compiled classes, so we clear the INTERPRETED flag.  This is a
-+     kludge!  */
-+  klass->accflags &= ~java::lang::reflect::Modifier::INTERPRETED;
-+
-   if (system_class_list != SYSTEM_LOADER_INITIALIZED)
-     {
-       unsigned long abi = (unsigned long) klass->next_or_version;
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/ChangeLog gcc-4.3.3/libstdc++-v3/ChangeLog
---- gcc-4.3.3.orig/libstdc++-v3/ChangeLog	2009-01-24 02:16:26.000000000 -0800
-+++ gcc-4.3.3/libstdc++-v3/ChangeLog	2009-03-14 17:43:46.944434000 -0700
-@@ -1,3 +1,36 @@
-+2009-03-14  Paolo Carlini  <paolo.carlini@oracle.com>
-+
-+	PR libstdc++/39405
-+	* include/std/type_traits (__add_lvalue_reference_helper,
-+	__add_rvalue_reference_helper): Avoid is_function.
-+	* testsuite/20_util/shared_ptr/cons/39405.cc: New.
-+	* testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc: Likewise.
-+
-+2009-02-09  Johannes Singler  <singler@ira.uka.de>
-+
-+        Backport from mainline:
-+        2009-02-03  Johannes Singler  <singler@ira.uka.de>
-+
-+        * include/parallel/algorithmfwd.h:
-+        Add parallelism default for many declarations.
-+        * include/parallel/numericfwd.h: Likewise.
-+        * include/parallel/iterator.h: Use iterator_traits as usual.
-+        * include/parallel/par_loop.h:
-+        Include equally_split.h.
-+        (for_each_template_random_access_ed):
-+        Avoid calling the Result default constructor.
-+        * include/parallel/numeric: Replace
-+        for_each_template_random_access by
-+        for_each_template_random_access_ed in numeric functions.
-+
-+2009-01-27  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	Backport from mainline:
-+	2009-01-13  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* scripts/extract_symvers: Add sed script to remove ' [<other>: xx] '
-+	field from readelf output.
-+
- 2009-01-24  Release Manager
- 
- 	* GCC 4.3.3 released.
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/algorithmfwd.h gcc-4.3.3/libstdc++-v3/include/parallel/algorithmfwd.h
---- gcc-4.3.3.orig/libstdc++-v3/include/parallel/algorithmfwd.h	2008-02-17 16:00:00.000000000 -0800
-+++ gcc-4.3.3/libstdc++-v3/include/parallel/algorithmfwd.h	2009-02-09 02:08:11.942408000 -0800
-@@ -99,7 +99,8 @@
-   template<typename _RAIter, typename _Tp>
-     typename iterator_traits<_RAIter>::difference_type
-     count_switch(_RAIter, _RAIter, const _Tp&, random_access_iterator_tag,
--		 __gnu_parallel::_Parallelism);
-+		 __gnu_parallel::_Parallelism parallelism
-+		 = __gnu_parallel::parallel_unbalanced);
- 
- 
-   template<typename _IIter, typename _Predicate>
-@@ -121,7 +122,8 @@
-   template<typename _RAIter, typename _Predicate>
-     typename iterator_traits<_RAIter>::difference_type
-     count_if_switch(_RAIter, _RAIter, _Predicate, random_access_iterator_tag,
--		    __gnu_parallel::_Parallelism);
-+		    __gnu_parallel::_Parallelism parallelism
-+		    = __gnu_parallel::parallel_unbalanced);
- 
-   // algobase.h
-   template<typename _IIter1, typename _IIter2>
-@@ -228,7 +230,8 @@
-   template<typename _RAIter, typename _Function>
-     _Function
-     for_each_switch(_RAIter, _RAIter, _Function, random_access_iterator_tag, 
--		    __gnu_parallel::_Parallelism);
-+		    __gnu_parallel::_Parallelism  parallelism
-+		    = __gnu_parallel::parallel_balanced);
- 
- 
-   template<typename _FIter, typename _Generator>
-@@ -250,7 +253,8 @@
-   template<typename _RAIter, typename _Generator>
-     void
-     generate_switch(_RAIter, _RAIter, _Generator, random_access_iterator_tag, 
--		    __gnu_parallel::_Parallelism);
-+		    __gnu_parallel::_Parallelism parallelism
-+		    = __gnu_parallel::parallel_balanced);
- 
-   template<typename _OIter, typename _Size, typename _Generator>
-     _OIter
-@@ -272,7 +276,8 @@
-   template<typename _RAIter, typename _Size, typename _Generator>
-     _RAIter
-     generate_n_switch(_RAIter, _Size, _Generator, random_access_iterator_tag, 
--		      __gnu_parallel::_Parallelism);
-+		      __gnu_parallel::_Parallelism parallelism
-+		      = __gnu_parallel::parallel_balanced);
- 
-   template<typename _IIter1, typename _IIter2>
-     bool
-@@ -429,7 +434,8 @@
-     _RAOIter
-     transform1_switch(_RAIIter, _RAIIter, _RAOIter, UnaryOperation, 
- 		      random_access_iterator_tag, random_access_iterator_tag, 
--		      __gnu_parallel::_Parallelism);
-+		      __gnu_parallel::_Parallelism parallelism
-+		      = __gnu_parallel::parallel_balanced);
- 
- 
-   template<typename _IIter1, typename _IIter2, typename _OIter,
-@@ -455,7 +461,8 @@
-     transform2_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter3, _BiOperation, 
- 		      random_access_iterator_tag, random_access_iterator_tag, 
- 		      random_access_iterator_tag,
--		      __gnu_parallel::_Parallelism);
-+		      __gnu_parallel::_Parallelism parallelism
-+		      = __gnu_parallel::parallel_balanced);
- 
-   template<typename _IIter1, typename _IIter2, typename _OIter,
- 	   typename _BiOperation, typename _Tag1,
-@@ -546,7 +553,8 @@
-   template<typename _RAIter, typename _Compare>
-     _RAIter
-     max_element_switch(_RAIter, _RAIter, _Compare, random_access_iterator_tag, 
--		       __gnu_parallel::_Parallelism);
-+		       __gnu_parallel::_Parallelism parallelism
-+		       = __gnu_parallel::parallel_balanced);
- 
- 
-   template<typename _IIter1, typename _IIter2, typename _OIter>
-@@ -615,7 +623,8 @@
-   template<typename _RAIter, typename _Compare>
-     _RAIter
-     min_element_switch(_RAIter, _RAIter, _Compare, random_access_iterator_tag, 
--		       __gnu_parallel::_Parallelism);
-+		       __gnu_parallel::_Parallelism parallelism
-+		       = __gnu_parallel::parallel_balanced);
- 
-   template<typename _RAIter>
-     void
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/iterator.h gcc-4.3.3/libstdc++-v3/include/parallel/iterator.h
---- gcc-4.3.3.orig/libstdc++-v3/include/parallel/iterator.h	2008-01-09 10:27:27.000000000 -0800
-+++ gcc-4.3.3/libstdc++-v3/include/parallel/iterator.h	2009-02-09 02:08:11.942408000 -0800
-@@ -131,7 +131,8 @@
-     public:
-       typedef IteratorCategory iterator_category;
-       typedef void value_type;
--      typedef typename Iterator1::difference_type difference_type;
-+      typedef typename std::iterator_traits<Iterator1>::difference_type
-+                                                            difference_type;
-       typedef type* pointer;
-       typedef type& reference;
- 
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/numeric gcc-4.3.3/libstdc++-v3/include/parallel/numeric
---- gcc-4.3.3.orig/libstdc++-v3/include/parallel/numeric	2008-02-17 16:00:00.000000000 -0800
-+++ gcc-4.3.3/libstdc++-v3/include/parallel/numeric	2009-02-09 02:08:11.942408000 -0800
-@@ -103,13 +103,13 @@
- 	  __gnu_parallel::accumulate_selector<_RandomAccessIterator>
- 	    my_selector;
- 	  __gnu_parallel::
--	    for_each_template_random_access(begin, end,
-+	    for_each_template_random_access_ed(begin, end,
- 					    __gnu_parallel::nothing(),
- 					    my_selector,
- 					    __gnu_parallel::
- 					    accumulate_binop_reduct
- 					    <BinaryOperation>(binary_op),
--					    res, res, -1, parallelism_tag);
-+					    res, res, -1);
- 	  return res;
- 	}
-       else
-@@ -211,9 +211,9 @@
- 	    inner_product_selector<RandomAccessIterator1,
- 	    RandomAccessIterator2, T> my_selector(first1, first2);
- 	  __gnu_parallel::
--	    for_each_template_random_access(first1, last1, binary_op2,
-+	    for_each_template_random_access_ed(first1, last1, binary_op2,
- 					    my_selector, binary_op1,
--					    res, res, -1, parallelism_tag);
-+					    res, res, -1);
- 	  return res;
- 	}
-       else
-@@ -432,10 +432,10 @@
- 	    end_pair(end, result + (end - begin));
- 	  __gnu_parallel::adjacent_difference_selector<ip> functionality;
- 	  __gnu_parallel::
--	    for_each_template_random_access(begin_pair, end_pair, bin_op,
-+	    for_each_template_random_access_ed(begin_pair, end_pair, bin_op,
- 					    functionality,
- 					    __gnu_parallel::dummy_reduct(),
--					    dummy, dummy, -1, parallelism_tag);
-+					    dummy, dummy, -1);
- 	  return functionality.finish_iterator;
- 	}
-       else
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/numericfwd.h gcc-4.3.3/libstdc++-v3/include/parallel/numericfwd.h
---- gcc-4.3.3.orig/libstdc++-v3/include/parallel/numericfwd.h	2008-02-17 16:00:00.000000000 -0800
-+++ gcc-4.3.3/libstdc++-v3/include/parallel/numericfwd.h	2009-02-09 02:08:11.942408000 -0800
-@@ -83,7 +83,8 @@
-     _Tp
-     accumulate_switch(_RAIter, _RAIter, _Tp, _BinaryOper,
- 		      random_access_iterator_tag,
--		      __gnu_parallel::_Parallelism);
-+		      __gnu_parallel::_Parallelism parallelism
-+		      = __gnu_parallel::parallel_unbalanced);
- 
-   template<typename _IIter, typename _OIter>
-     _OIter
-@@ -124,7 +125,8 @@
-     adjacent_difference_switch(_IIter, _IIter, _OIter, _BinaryOper, 
- 			       random_access_iterator_tag, 
- 			       random_access_iterator_tag, 
--			       __gnu_parallel::_Parallelism);
-+			       __gnu_parallel::_Parallelism parallelism
-+			       = __gnu_parallel::parallel_unbalanced);
- 
-   template<typename _IIter1, typename _IIter2, typename _Tp>
-     _Tp
-@@ -164,7 +166,8 @@
-     inner_product_switch(_RAIter1, _RAIter1, _RAIter2, _Tp, BinaryFunction1, 
- 			 BinaryFunction2, random_access_iterator_tag, 
- 			 random_access_iterator_tag, 
--			 __gnu_parallel::_Parallelism);
-+			 __gnu_parallel::_Parallelism
-+			 = __gnu_parallel::parallel_unbalanced);
- 
-   template<typename _IIter1, typename _IIter2, typename _Tp,
- 	   typename _BinaryFunction1, typename _BinaryFunction2,
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/par_loop.h gcc-4.3.3/libstdc++-v3/include/parallel/par_loop.h
---- gcc-4.3.3.orig/libstdc++-v3/include/parallel/par_loop.h	2008-01-09 18:07:41.000000000 -0800
-+++ gcc-4.3.3/libstdc++-v3/include/parallel/par_loop.h	2009-02-09 02:08:11.942408000 -0800
-@@ -42,6 +42,7 @@
- #include <omp.h>
- #include <parallel/settings.h>
- #include <parallel/base.h>
-+#include <parallel/equally_split.h>
- 
- namespace __gnu_parallel
- {
-@@ -80,9 +81,9 @@
-   {
-     typedef std::iterator_traits<RandomAccessIterator> traits_type;
-     typedef typename traits_type::difference_type difference_type;
--
-     const difference_type length = end - begin;
-     Result *thread_results;
-+    bool* constructed;
- 
-     thread_index_t num_threads =
-       __gnu_parallel::min<difference_type>(get_max_threads(), length);
-@@ -92,13 +93,15 @@
- #       pragma omp single
-           {
-             num_threads = omp_get_num_threads();
--            thread_results = new Result[num_threads];
-+            thread_results = static_cast<Result*>(
-+                                ::operator new(num_threads * sizeof(Result)));
-+            constructed = new bool[num_threads];
-           }
- 
-         thread_index_t iam = omp_get_thread_num();
- 
-         // Neutral element.
--        Result reduct = Result();
-+        Result* reduct = static_cast<Result*>(::operator new(sizeof(Result)));
- 
-         difference_type
-             start = equally_split_point(length, num_threads, iam),
-@@ -106,23 +109,30 @@
- 
-         if (start < stop)
-           {
--            reduct = f(o, begin + start);
-+            new(reduct) Result(f(o, begin + start));
-             ++start;
-+            constructed[iam] = true;
-           }
-+        else
-+          constructed[iam] = false;
- 
-         for (; start < stop; ++start)
--          reduct = r(reduct, f(o, begin + start));
-+          *reduct = r(*reduct, f(o, begin + start));
- 
--        thread_results[iam] = reduct;
-+        thread_results[iam] = *reduct;
-       } //parallel
- 
-     for (thread_index_t i = 0; i < num_threads; ++i)
--      output = r(output, thread_results[i]);
-+        if (constructed[i])
-+            output = r(output, thread_results[i]);
- 
-     // Points to last element processed (needed as return value for
-     // some algorithms like transform).
-     f.finish_iterator = begin + length;
- 
-+    delete[] thread_results;
-+    delete[] constructed;
-+
-     return o;
-   }
- 
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/std/type_traits gcc-4.3.3/libstdc++-v3/include/std/type_traits
---- gcc-4.3.3.orig/libstdc++-v3/include/std/type_traits	2008-03-26 16:21:44.000000000 -0700
-+++ gcc-4.3.3/libstdc++-v3/include/std/type_traits	2009-03-14 17:43:46.944434000 -0700
-@@ -1,6 +1,6 @@
- // <type_traits> -*- C++ -*-
- 
--// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
-+// Copyright (C) 2007, 2008, 2009 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
-@@ -107,7 +107,7 @@
-     { typedef _Tp   type; };
- 
-   template<typename _Tp,
--	   bool = is_object<_Tp>::value || is_function<_Tp>::value,
-+	   bool = !is_reference<_Tp>::value && !is_void<_Tp>::value,
- 	   bool = is_rvalue_reference<_Tp>::value>
-     struct __add_lvalue_reference_helper
-     { typedef _Tp   type; };
-@@ -127,7 +127,7 @@
-     { };
- 
-   template<typename _Tp,
--	   bool = is_object<_Tp>::value || is_function<_Tp>::value>
-+	   bool = !is_reference<_Tp>::value && !is_void<_Tp>::value>
-     struct __add_rvalue_reference_helper
-     { typedef _Tp   type; };
- 
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/scripts/extract_symvers gcc-4.3.3/libstdc++-v3/scripts/extract_symvers
---- gcc-4.3.3.orig/libstdc++-v3/scripts/extract_symvers	2005-08-16 19:28:44.000000000 -0700
-+++ gcc-4.3.3/libstdc++-v3/scripts/extract_symvers	2009-01-27 03:39:42.241832000 -0800
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2009 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
-@@ -52,7 +52,9 @@
- 
- tmp=extract.$$
- 
--${readelf} ${lib} | sed '/\.dynsym/,/^$/p;d' | egrep -v ' (LOCAL|UND) ' |\
-+${readelf} ${lib} |\
-+sed -e 's/ \[<other>: [A-Fa-f0-9]*\] //' -e '/\.dynsym/,/^$/p;d' |\
-+egrep -v ' (LOCAL|UND) ' |\
- awk '{ if ($4 == "FUNC" || $4 == "NOTYPE")
-          printf "%s:%s\n", $4, $8;
-        else if ($4 == "OBJECT")
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc gcc-4.3.3/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc
---- gcc-4.3.3.orig/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc	2009-03-14 17:43:46.944434000 -0700
-@@ -0,0 +1,31 @@
-+// { dg-options "-std=gnu++0x" }
-+// { dg-do compile }
-+
-+// Copyright (C) 2009 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
-+// 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 <memory>
-+
-+// libstdc++/39405
-+template<typename T>
-+  struct foo
-+  {
-+    std::shared_ptr<foo<T> > m_foo;
-+  };
-+
-+std::shared_ptr<foo<int> > t;
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc gcc-4.3.3/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc
---- gcc-4.3.3.orig/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc	2009-03-14 17:43:46.944434000 -0700
-@@ -0,0 +1,30 @@
-+// { dg-do compile }
-+
-+// Copyright (C) 2009 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
-+// 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 <tr1/memory>
-+
-+// libstdc++/39405
-+template<typename T>
-+  struct foo
-+  {
-+    std::tr1::shared_ptr<foo<T> > m_foo;
-+  };
-+
-+std::tr1::shared_ptr<foo<int> > t;
Index: tches/gcc-4.3.3-posix-1.patch
===================================================================
--- patches/gcc-4.3.3-posix-1.patch	(revision 77e17c8d49567878da4e9c1b603e0478301c8674)
+++ 	(revision )
@@ -1,304 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
-Origin: Jim Gifford
-        Rediffed against 4.1.0 by Chris Staub
-        Rediffed against 4.1.2 by Jim Gifford
-	Rediffed and additions against 4.2.0 by Joe Ciccone
-	Rediffed against 4.3.0 by Joe Ciccone
-	Rediffed against 4.3.3 by Jim Gifford
-Upstream Status: On Hold
-Description: Makes GCC Posix Compliant
-
-diff -Naur gcc-4.3.3.orig/contrib/patch_tester.sh gcc-4.3.3/contrib/patch_tester.sh
---- gcc-4.3.3.orig/contrib/patch_tester.sh	2007-12-26 13:01:38.000000000 -0800
-+++ gcc-4.3.3/contrib/patch_tester.sh	2009-01-25 00:53:32.447636261 -0800
-@@ -287,7 +287,7 @@
- 
-     if ! make $dashj `grep "^make:" $PATCH | sed -e "s/^make://g"` bootstrap &> $1/bootstrap ; then
- 	report "bootstrap failed with last lines:"
--	tail -30 $1/bootstrap > $1/last_bootstrap
-+	tail -n 30 $1/bootstrap > $1/last_bootstrap
- 	freport $1/last_bootstrap
- 	report "grep --context=20 Error bootstrap:"
- 	grep --context=20 Error $1/bootstrap > $1/bootstrap_error
-@@ -420,7 +420,7 @@
- # After selfexec, $TESTING is already set up.  
- if [ -d $TESTING ]; then
-     # The only file in $TESTING is the patch.
--    PATCH=`ls -rt -1 $TESTING | head -1`
-+    PATCH=`ls -rt -1 $TESTING | head -n 1`
-     PATCH=$TESTING/$PATCH
-     if [ -f $PATCH ]; then
- 	bootntest_patched && bootntest_pristine && compare_passes
-@@ -429,7 +429,7 @@
- fi
- 
- while true; do
--    PATCH=`ls -rt -1 $PATCHES | head -1`
-+    PATCH=`ls -rt -1 $PATCHES | head -n 1`
-     if [ x$PATCH = x ]; then
- 	sleep ${standby}m
-     else
-diff -Naur gcc-4.3.3.orig/contrib/test_summary gcc-4.3.3/contrib/test_summary
---- gcc-4.3.3.orig/contrib/test_summary	2007-02-09 16:30:46.000000000 -0800
-+++ gcc-4.3.3/contrib/test_summary	2009-01-25 00:53:32.447636261 -0800
-@@ -107,7 +107,7 @@
-     srcdir = configflags;
-     sub(/\/configure .*/, "", srcdir);
-     printf "LAST_UPDATED: ";
--    system("tail -1 " srcdir "/LAST_UPDATED");
-+    system("tail -n 1 " srcdir "/LAST_UPDATED");
-     print "";
- 
-     sub(/^[^ ]*\/configure */, " ", configflags);
-diff -Naur gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure
---- gcc-4.3.3.orig/gcc/configure	2008-08-01 02:51:03.000000000 -0700
-+++ gcc-4.3.3/gcc/configure	2009-01-25 00:53:32.455839362 -0800
-@@ -20245,7 +20245,7 @@
-   # Therefore, use diff -b for the comparisons.
-   if test x$gcc_cv_objdump != x \
-   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
--     | tail -3 > conftest.got \
-+     | tail -n 3 > conftest.got \
-   && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \
-     || diff -b conftest.big conftest.got > /dev/null 2>&1; }
-   then
-diff -Naur gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac
---- gcc-4.3.3.orig/gcc/configure.ac	2008-08-01 02:51:03.000000000 -0700
-+++ gcc-4.3.3/gcc/configure.ac	2009-01-25 00:53:32.455839362 -0800
-@@ -2241,7 +2241,7 @@
-   # Therefore, use diff -b for the comparisons.
-   if test x$gcc_cv_objdump != x \
-   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
--     | tail -3 > conftest.got \
-+     | tail -n 3 > conftest.got \
-   && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \
-     || diff -b conftest.big conftest.got > /dev/null 2>&1; }
-   then
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/ada/acats/run_all.sh gcc-4.3.3/gcc/testsuite/ada/acats/run_all.sh
---- gcc-4.3.3.orig/gcc/testsuite/ada/acats/run_all.sh	2006-09-14 03:12:03.000000000 -0700
-+++ gcc-4.3.3/gcc/testsuite/ada/acats/run_all.sh	2009-01-25 00:53:32.459940773 -0800
-@@ -68,7 +68,7 @@
-   ls ${i}?.adb > ${i}.lst 2> /dev/null
-   ls ${i}*m.adb >> ${i}.lst 2> /dev/null
-   ls ${i}.adb >> ${i}.lst 2> /dev/null
--  main=`tail -1 ${i}.lst`
-+  main=`tail -n 1 ${i}.lst`
- }
- 
- EXTERNAL_OBJECTS=""
-diff -Naur gcc-4.3.3.orig/libgomp/acinclude.m4 gcc-4.3.3/libgomp/acinclude.m4
---- gcc-4.3.3.orig/libgomp/acinclude.m4	2007-03-18 04:17:44.000000000 -0700
-+++ gcc-4.3.3/libgomp/acinclude.m4	2009-01-25 00:53:32.459940773 -0800
-@@ -147,7 +147,7 @@
-   # Start by getting the version number.  I think the libtool test already
-   # does some of this, but throws away the result.
-   changequote(,)
--  ldver=`$LD --version 2>/dev/null | head -1 | \
-+  ldver=`$LD --version 2>/dev/null | head -n 1 | \
-          sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
-   changequote([,])
-   libgomp_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.3.3.orig/libgomp/configure gcc-4.3.3/libgomp/configure
---- gcc-4.3.3.orig/libgomp/configure	2008-01-24 08:23:13.000000000 -0800
-+++ gcc-4.3.3/libgomp/configure	2009-01-25 00:53:32.464042184 -0800
-@@ -17600,7 +17600,7 @@
-   # Start by getting the version number.  I think the libtool test already
-   # does some of this, but throws away the result.
- 
--  ldver=`$LD --version 2>/dev/null | head -1 | \
-+  ldver=`$LD --version 2>/dev/null | head -n 1 | \
-          sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-   libgomp_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.3.3.orig/libjava/classpath/configure gcc-4.3.3/libjava/classpath/configure
---- gcc-4.3.3.orig/libjava/classpath/configure	2008-02-29 15:47:54.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/configure	2009-01-25 00:53:32.480448386 -0800
-@@ -29126,7 +29126,7 @@
- fi # shortcircut to system "stdint.h"
- # ------------------ PREPARE VARIABLES ------------------------------
- if test "$GCC" = "yes" ; then
--ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-+ac_cv_stdint_message="using gnu compiler "`$CC --version | head -n 1`
- else
- ac_cv_stdint_message="using $CC"
- fi
-diff -Naur gcc-4.3.3.orig/libjava/classpath/ltcf-c.sh gcc-4.3.3/libjava/classpath/ltcf-c.sh
---- gcc-4.3.3.orig/libjava/classpath/ltcf-c.sh	2006-01-17 10:09:40.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/ltcf-c.sh	2009-01-25 00:53:32.484550356 -0800
-@@ -153,7 +153,7 @@
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname-def;
-       else
-         echo EXPORTS > $output_objdir/$soname-def;
-diff -Naur gcc-4.3.3.orig/libjava/classpath/ltcf-gcj.sh gcc-4.3.3/libjava/classpath/ltcf-gcj.sh
---- gcc-4.3.3.orig/libjava/classpath/ltcf-gcj.sh	2005-09-23 14:31:04.000000000 -0700
-+++ gcc-4.3.3/libjava/classpath/ltcf-gcj.sh	2009-01-25 00:53:32.484550356 -0800
-@@ -156,7 +156,7 @@
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname-def;
-       else
-         echo EXPORTS > $output_objdir/$soname-def;
-diff -Naur gcc-4.3.3.orig/libjava/classpath/m4/ax_create_stdint_h.m4 gcc-4.3.3/libjava/classpath/m4/ax_create_stdint_h.m4
---- gcc-4.3.3.orig/libjava/classpath/m4/ax_create_stdint_h.m4	2007-05-19 13:44:43.000000000 -0700
-+++ gcc-4.3.3/libjava/classpath/m4/ax_create_stdint_h.m4	2009-01-25 00:53:32.484550356 -0800
-@@ -217,7 +217,7 @@
- fi # shortcircut to system "stdint.h"
- # ------------------ PREPARE VARIABLES ------------------------------
- if test "$GCC" = "yes" ; then
--ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-+ac_cv_stdint_message="using gnu compiler "`$CC --version | head -n 1`
- else
- ac_cv_stdint_message="using $CC"
- fi
-diff -Naur gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure
---- gcc-4.3.3.orig/libjava/configure	2009-01-24 02:32:29.000000000 -0800
-+++ gcc-4.3.3/libjava/configure	2009-01-25 00:53:32.492753177 -0800
-@@ -18673,8 +18673,8 @@
- echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6
- LD_PROG=`$CC --print-prog-name=ld`
- LD_VERSION=`$LD_PROG --version`
--LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
--LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
-+LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
-+LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
- if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
-   LD_OK="ok"
- else
-diff -Naur gcc-4.3.3.orig/libjava/mingwld.m4 gcc-4.3.3/libjava/mingwld.m4
---- gcc-4.3.3.orig/libjava/mingwld.m4	2005-08-22 15:36:35.000000000 -0700
-+++ gcc-4.3.3/libjava/mingwld.m4	2009-01-25 00:53:32.492753177 -0800
-@@ -3,8 +3,8 @@
- AC_MSG_CHECKING(whether 'ld' is at least 2.13)
- LD_PROG=`$CC --print-prog-name=ld`
- LD_VERSION=`$LD_PROG --version`
--LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
--LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
-+LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
-+LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
- if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
-   LD_OK="ok"
- else
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/acinclude.m4 gcc-4.3.3/libstdc++-v3/acinclude.m4
---- gcc-4.3.3.orig/libstdc++-v3/acinclude.m4	2008-04-25 09:52:57.000000000 -0700
-+++ gcc-4.3.3/libstdc++-v3/acinclude.m4	2009-01-25 00:53:32.500956558 -0800
-@@ -234,7 +234,7 @@
-   if test x"$with_gnu_ld" = x"yes"; then
-     AC_MSG_CHECKING([for ld version])
-     changequote(,)
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
-     changequote([,])
-     glibcxx_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/configure gcc-4.3.3/libstdc++-v3/configure
---- gcc-4.3.3.orig/libstdc++-v3/configure	2008-07-07 12:49:54.000000000 -0700
-+++ gcc-4.3.3/libstdc++-v3/configure	2009-01-25 00:53:32.582987288 -0800
-@@ -17490,7 +17490,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -42215,7 +42215,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -84606,7 +84606,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -85622,7 +85622,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -86610,7 +86610,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -109089,7 +109089,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -109934,7 +109934,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -110828,7 +110828,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -112114,7 +112114,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -112850,7 +112850,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -113351,7 +113351,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
Index: tches/gcc-4.3.3-powerpc64_multilib-1.patch
===================================================================
--- patches/gcc-4.3.3-powerpc64_multilib-1.patch	(revision 77e17c8d49567878da4e9c1b603e0478301c8674)
+++ 	(revision )
@@ -1,35 +1,0 @@
-Submitted By: Ken Moffat (ken at linuxfromscratch dot org)
-Origin: fedora
-        Rediffed against 4.1.0 by Chris Staub
-	Rediffed against 4.2.0 by Joe Ciccone
-	Rediffed agaisnt 4.2.4 by Ken Moffat
-Date: 2005-11-22
-Initial package version: 4.0.2
-Description: In a native ppc64 build, this fixes a linkage failure while
-installing a 32-bit nof/ (no -hardware- floating point) library, and also gets
-rid of 1500 failures in the g++ testsuite.  From fedora gcc-4.0.1, rediffed to
-apply with -p1.
-
-diff -Naur gcc-4.2.4.orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000/t-linux64
---- gcc-4.2.4.orig/gcc/config/rs6000/t-linux64	2008-03-05 17:25:28.000000000 +0000
-+++ gcc-4.2.4/gcc/config/rs6000/t-linux64	2008-06-12 20:45:36.000000000 +0100
-@@ -14,13 +14,13 @@
- # it doesn't tell anything about the 32bit libraries on those systems.  Set
- # MULTILIB_OSDIRNAMES according to what is found on the target.
- 
--MULTILIB_OPTIONS        = m64/m32 msoft-float
--MULTILIB_DIRNAMES       = 64 32 nof
-+MULTILIB_OPTIONS        = m64/m32
-+MULTILIB_DIRNAMES       = 64 32
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
--MULTILIB_EXCEPTIONS     = m64/msoft-float
--MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
--MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
-+MULTILIB_EXCEPTIONS     =
-+MULTILIB_EXCLUSIONS     =
-+MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_MATCHES        =
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
- softfp_wrap_end := '\#endif'
Index: tches/gcc-4.3.3-ppc_fixes-1.patch
===================================================================
--- patches/gcc-4.3.3-ppc_fixes-1.patch	(revision 77e17c8d49567878da4e9c1b603e0478301c8674)
+++ 	(revision )
@@ -1,56 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 02-18-2009
-Initial Package Version: 4.3.3
-Origin: Upstream
-Upstream Status: Applied to Mainline
-Description: This fixes a known build issue with Powerpc and GCC 4.3.3
-             http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37739
-
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/x-linux-relax gcc-4.3.3/gcc/config/rs6000/x-linux-relax
---- gcc-4.3.3.orig/gcc/config/rs6000/x-linux-relax	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/config/rs6000/x-linux-relax	2009-02-18 10:19:52.235263584 -0800
-@@ -0,0 +1,3 @@
-+# At -O0 cc1 etc. are too large and -Wl,--relax is needed
-+$(COMPILERS) : override LDFLAGS += -Wl,--relax
-+
-diff -Naur gcc-4.3.3.orig/gcc/config/x-cflags-O1 gcc-4.3.3/gcc/config/x-cflags-O1
---- gcc-4.3.3.orig/gcc/config/x-cflags-O1	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.3.3/gcc/config/x-cflags-O1	2009-02-18 10:19:24.149463891 -0800
-@@ -0,0 +1,6 @@
-+# At -O0 cc1 etc. are too large on some targets for successful
-+# link; force building libbackend.a with -O1.
-+ifeq ($(filter-out -O0,$(lastword $(filter -O%,$(CFLAGS)))),)
-+$(OBJS) : override CFLAGS += -O1
-+endif
-+
-diff -Naur gcc-4.3.3.orig/gcc/config.host gcc-4.3.3/gcc/config.host
---- gcc-4.3.3.orig/gcc/config.host	2007-08-08 12:33:24.000000000 -0700
-+++ gcc-4.3.3/gcc/config.host	2009-02-18 10:18:57.471754434 -0800
-@@ -116,6 +116,27 @@
-         host_xmake_file="${host_xmake_file} rs6000/x-rs6000"
-         ;;
-     esac
-+    case ${host} in
-+      *-*-linux* )
-+	if test "${GCC}:${ac_cv_sizeof_long}" = yes:4; then
-+	  # On powerpc*-*-linux* use -Wl,--relax to link cc1,
-+	  # if ld is new enough, otherwise force -O1 in CFLAGS.
-+	  host_ppc_relax_xmake_file=
-+	  host_ld_ver=`${CC} -Wl,--version 2>/dev/null | sed 1q`
-+	  if echo "$host_ld_ver" | grep GNU > /dev/null; then
-+	    host_ld_date=`echo $host_ld_ver \
-+			  | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
-+	    if test 0"$host_ld_date" -gt 20080806; then
-+	      host_ppc_relax_xmake_file=rs6000/x-linux-relax
-+	    fi
-+	  fi
-+	  if test -z "${host_ppc_relax_xmake_file}"; then
-+	    host_ppc_relax_xmake_file=x-cflags-O1
-+	  fi
-+	  host_xmake_file="${host_xmake_file} ${host_ppc_relax_xmake_file}"
-+	fi
-+	;;
-+    esac
-     ;;
- esac
- 
Index: tches/gcc-4.3.3-pure64-1.patch
===================================================================
--- patches/gcc-4.3.3-pure64-1.patch	(revision 77e17c8d49567878da4e9c1b603e0478301c8674)
+++ 	(revision )
@@ -1,192 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
-Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
-        the Pure LFS project.
-Upstream Status: Not Applied
-Description: This patch modifies the location of the dynamic linker for gcc-4.3.3.
-
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h
---- gcc-4.3.3.orig/gcc/config/i386/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/linux64.h	2009-01-25 00:49:04.956938399 -0800
-@@ -53,8 +53,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/t-linux64 gcc-4.3.3/gcc/config/i386/t-linux64
---- gcc-4.3.3.orig/gcc/config/i386/t-linux64	2007-09-27 12:56:06.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/t-linux64	2009-01-25 00:49:11.211799413 -0800
-@@ -13,7 +13,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h
---- gcc-4.3.3.orig/gcc/config/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/linux.h	2009-01-25 00:49:09.037979047 -0800
-@@ -113,7 +113,7 @@
-    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
-    supporting both 32-bit and 64-bit compilation.  */
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h
---- gcc-4.3.3.orig/gcc/config/mips/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux64.h	2009-01-25 00:49:09.124111188 -0800
-@@ -38,10 +38,10 @@
- %{!shared: \
-   %{profile:-lc_p} %{!profile:-lc}}"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
- 
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/t-linux64 gcc-4.3.3/gcc/config/mips/t-linux64
---- gcc-4.3.3.orig/gcc/config/mips/t-linux64	2006-06-06 05:51:24.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/t-linux64	2009-01-25 00:49:11.265119430 -0800
-@@ -1,6 +1,6 @@
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
- MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
- 
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
- 
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h
---- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/linux64.h	2009-01-25 00:49:01.265542673 -0800
-@@ -339,9 +339,9 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/t-linux64 gcc-4.3.3/gcc/config/rs6000/t-linux64
---- gcc-4.3.3.orig/gcc/config/rs6000/t-linux64	2007-09-27 12:56:06.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/t-linux64	2009-01-25 00:49:11.137970107 -0800
-@@ -19,7 +19,7 @@
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
- MULTILIB_EXCEPTIONS     = m64/msoft-float
- MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
- MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
-diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h
---- gcc-4.3.3.orig/gcc/config/s390/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/s390/linux.h	2009-01-25 00:49:04.058697303 -0800
-@@ -72,7 +72,7 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
- #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
- 
- #undef  LINK_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/s390/t-linux64 gcc-4.3.3/gcc/config/s390/t-linux64
---- gcc-4.3.3.orig/gcc/config/s390/t-linux64	2006-02-06 09:41:54.000000000 -0800
-+++ gcc-4.3.3/gcc/config/s390/t-linux64	2009-01-25 00:49:11.178985891 -0800
-@@ -1,6 +1,6 @@
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 ../lib
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux64.h	2007-10-18 21:29:38.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux64.h	2009-01-25 00:49:10.604768822 -0800
-@@ -144,9 +144,9 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
-@@ -167,7 +167,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -176,7 +176,7 @@
-         %{static:-static}}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -257,7 +257,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux.h	2009-01-25 00:49:10.863168878 -0800
-@@ -132,7 +132,7 @@
- 
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/t-linux64 gcc-4.3.3/gcc/config/sparc/t-linux64
---- gcc-4.3.3.orig/gcc/config/sparc/t-linux64	2006-02-07 23:19:43.000000000 -0800
-+++ gcc-4.3.3/gcc/config/sparc/t-linux64	2009-01-25 00:49:11.314338874 -0800
-@@ -1,6 +1,6 @@
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 ../lib
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
Index: tches/gcc-4.3.3-pure64_specs-1.patch
===================================================================
--- patches/gcc-4.3.3-pure64_specs-1.patch	(revision 77e17c8d49567878da4e9c1b603e0478301c8674)
+++ 	(revision )
@@ -1,385 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
-Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
-        the Pure LFS project.
-Upstream Status: Not Applied
-Description: This patch modifies the location of the dynamic linker for gcc-4.3.3.
-
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/gnu.h gcc-4.3.3/gcc/config/alpha/gnu.h
---- gcc-4.3.3.orig/gcc/config/alpha/gnu.h	2004-09-07 17:17:19.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/gnu.h	2009-01-25 00:46:43.363275038 -0800
-@@ -11,7 +11,7 @@
-     } while (0)
- 
- #undef ELF_DYNAMIC_LINKER
--#define ELF_DYNAMIC_LINKER	"/lib/ld.so"
-+#define ELF_DYNAMIC_LINKER	"/tools/lib/ld.so"
- 
- #undef	STARTFILE_SPEC
- #define STARTFILE_SPEC \
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h gcc-4.3.3/gcc/config/alpha/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/linux-elf.h	2009-01-25 00:46:43.506828048 -0800
-@@ -27,8 +27,8 @@
- #define EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
- 
--#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h gcc-4.3.3/gcc/config/arm/linux-eabi.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h	2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.3/gcc/config/arm/linux-eabi.h	2009-01-25 00:46:48.034939237 -0800
-@@ -61,7 +61,7 @@
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
- #undef  GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
- 
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h	2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.3/gcc/config/arm/linux-elf.h	2009-01-25 00:46:47.747830702 -0800
-@@ -62,7 +62,7 @@
- 
- #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
-    %{b} \
-diff -Naur gcc-4.3.3.orig/gcc/config/bfin/linux.h gcc-4.3.3/gcc/config/bfin/linux.h
---- gcc-4.3.3.orig/gcc/config/bfin/linux.h	2007-09-05 17:09:05.000000000 -0700
-+++ gcc-4.3.3/gcc/config/bfin/linux.h	2009-01-25 00:46:40.418363458 -0800
-@@ -22,7 +22,7 @@
-   %{shared:-G -Bdynamic} \
-   %{!shared: %{!static: \
-    %{rdynamic:-export-dynamic} \
--   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
-+   %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \
-    %{static}} -init __init -fini __fini"
- 
- #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
-diff -Naur gcc-4.3.3.orig/gcc/config/cris/linux.h gcc-4.3.3/gcc/config/cris/linux.h
---- gcc-4.3.3.orig/gcc/config/cris/linux.h	2008-01-23 09:17:58.000000000 -0800
-+++ gcc-4.3.3/gcc/config/cris/linux.h	2009-01-25 00:46:38.092783349 -0800
-@@ -102,7 +102,7 @@
- #undef CRIS_DEFAULT_CPU_VERSION
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- /* We need an -rpath-link to ld.so.1, and presumably to each directory
-    specified with -B.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/frv/linux.h gcc-4.3.3/gcc/config/frv/linux.h
---- gcc-4.3.3.orig/gcc/config/frv/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/frv/linux.h	2009-01-25 00:46:37.813879592 -0800
-@@ -35,7 +35,7 @@
- #define ENDFILE_SPEC \
-   "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/gnu.h gcc-4.3.3/gcc/config/i386/gnu.h
---- gcc-4.3.3.orig/gcc/config/i386/gnu.h	2007-08-07 23:35:17.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/gnu.h	2009-01-25 00:46:40.849024165 -0800
-@@ -22,7 +22,7 @@
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
--      %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
-+      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
-     %{static:-static}}"
- 
- #undef	STARTFILE_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h
---- gcc-4.3.3.orig/gcc/config/i386/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/linux64.h	2009-01-25 00:46:40.578323788 -0800
-@@ -53,8 +53,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux.h gcc-4.3.3/gcc/config/i386/linux.h
---- gcc-4.3.3.orig/gcc/config/i386/linux.h	2007-11-27 17:04:27.000000000 -0800
-+++ gcc-4.3.3/gcc/config/i386/linux.h	2009-01-25 00:46:42.161519765 -0800
-@@ -100,7 +100,7 @@
- 
- /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
- #define LINK_EMULATION "elf_i386"
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-diff -Naur gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h
---- gcc-4.3.3.orig/gcc/config/ia64/linux.h	2006-12-12 07:15:19.000000000 -0800
-+++ gcc-4.3.3/gcc/config/ia64/linux.h	2009-01-25 00:46:43.236127392 -0800
-@@ -37,7 +37,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h
---- gcc-4.3.3.orig/gcc/config/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/linux.h	2009-01-25 00:46:46.090803184 -0800
-@@ -112,9 +112,9 @@
-    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
-    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
-    supporting both 32-bit and 64-bit compilation.  */
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- #define LINUX_DYNAMIC_LINKER32 \
-diff -Naur gcc-4.3.3.orig/gcc/config/m32r/linux.h gcc-4.3.3/gcc/config/m32r/linux.h
---- gcc-4.3.3.orig/gcc/config/m32r/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/m32r/linux.h	2009-01-25 00:46:40.180472971 -0800
-@@ -58,7 +58,7 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef	LINK_SPEC
- #if TARGET_LITTLE_ENDIAN
-diff -Naur gcc-4.3.3.orig/gcc/config/m68k/linux.h gcc-4.3.3/gcc/config/m68k/linux.h
---- gcc-4.3.3.orig/gcc/config/m68k/linux.h	2007-09-24 14:07:08.000000000 -0700
-+++ gcc-4.3.3/gcc/config/m68k/linux.h	2009-01-25 00:46:38.769538482 -0800
-@@ -84,7 +84,7 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h
---- gcc-4.3.3.orig/gcc/config/mips/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux64.h	2009-01-25 00:46:46.197444615 -0800
-@@ -38,10 +38,10 @@
- %{!shared: \
-   %{profile:-lc_p} %{!profile:-lc}}"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
- 
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux.h gcc-4.3.3/gcc/config/mips/linux.h
---- gcc-4.3.3.orig/gcc/config/mips/linux.h	2007-10-21 02:20:49.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux.h	2009-01-25 00:46:46.685527587 -0800
-@@ -64,7 +64,7 @@
- #undef MIPS_DEFAULT_GVALUE
- #define MIPS_DEFAULT_GVALUE 0
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- /* Borrowed from sparc/linux.h */
- #undef LINK_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/mn10300/linux.h gcc-4.3.3/gcc/config/mn10300/linux.h
---- gcc-4.3.3.orig/gcc/config/mn10300/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mn10300/linux.h	2009-01-25 00:46:47.091582902 -0800
-@@ -32,7 +32,7 @@
- #undef  ASM_SPEC
- #define ASM_SPEC "%{Wa,*:%*}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
-diff -Naur gcc-4.3.3.orig/gcc/config/pa/pa-linux.h gcc-4.3.3/gcc/config/pa/pa-linux.h
---- gcc-4.3.3.orig/gcc/config/pa/pa-linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/pa/pa-linux.h	2009-01-25 00:46:45.143347394 -0800
-@@ -44,7 +44,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h
---- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/linux64.h	2009-01-25 00:46:36.037907528 -0800
-@@ -339,10 +339,10 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h gcc-4.3.3/gcc/config/rs6000/sysv4.h
---- gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h	2007-08-08 12:33:24.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/sysv4.h	2009-01-25 00:46:36.316812403 -0800
-@@ -891,8 +891,8 @@
- 
- #define LINK_START_LINUX_SPEC ""
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -934,7 +934,7 @@
- 
- #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
--  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
-+  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
- 
- #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__	\
- %{!undef:					                \
-diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h
---- gcc-4.3.3.orig/gcc/config/s390/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/s390/linux.h	2009-01-25 00:46:39.536529682 -0800
-@@ -72,8 +72,8 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
-diff -Naur gcc-4.3.3.orig/gcc/config/sh/linux.h gcc-4.3.3/gcc/config/sh/linux.h
---- gcc-4.3.3.orig/gcc/config/sh/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sh/linux.h	2009-01-25 00:46:44.454287190 -0800
-@@ -47,7 +47,7 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux64.h	2007-10-18 21:29:38.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux64.h	2009-01-25 00:46:48.145679843 -0800
-@@ -144,10 +144,10 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -167,7 +167,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -176,7 +176,7 @@
-         %{static:-static}}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -257,7 +257,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux.h	2009-01-25 00:46:48.494310657 -0800
-@@ -120,8 +120,8 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -132,7 +132,7 @@
- 
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
-diff -Naur gcc-4.3.3.orig/gcc/config/xtensa/linux.h gcc-4.3.3/gcc/config/xtensa/linux.h
---- gcc-4.3.3.orig/gcc/config/xtensa/linux.h	2008-01-17 17:37:53.000000000 -0800
-+++ gcc-4.3.3/gcc/config/xtensa/linux.h	2009-01-25 00:46:37.658018717 -0800
-@@ -43,7 +43,7 @@
-   %{mlongcalls:--longcalls} \
-   %{mno-longcalls:--no-longcalls}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC \
Index: tches/gcc-4.3.3-specs-1.patch
===================================================================
--- patches/gcc-4.3.3-specs-1.patch	(revision 77e17c8d49567878da4e9c1b603e0478301c8674)
+++ 	(revision )
@@ -1,385 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
-Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
-        the Pure LFS project.
-Upstream Status: Not Applied
-Description: This patch modifies the location of the dynamic linker for gcc-4.3.3.
-
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/gnu.h gcc-4.3.3/gcc/config/alpha/gnu.h
---- gcc-4.3.3.orig/gcc/config/alpha/gnu.h	2004-09-07 17:17:19.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/gnu.h	2009-01-25 00:44:15.387601620 -0800
-@@ -11,7 +11,7 @@
-     } while (0)
- 
- #undef ELF_DYNAMIC_LINKER
--#define ELF_DYNAMIC_LINKER	"/lib/ld.so"
-+#define ELF_DYNAMIC_LINKER	"/tools/lib/ld.so"
- 
- #undef	STARTFILE_SPEC
- #define STARTFILE_SPEC \
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h gcc-4.3.3/gcc/config/alpha/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/linux-elf.h	2009-01-25 00:44:15.527054895 -0800
-@@ -27,8 +27,8 @@
- #define EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
- 
--#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h gcc-4.3.3/gcc/config/arm/linux-eabi.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h	2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.3/gcc/config/arm/linux-eabi.h	2009-01-25 00:44:20.001844391 -0800
-@@ -61,7 +61,7 @@
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
- #undef  GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
- 
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h	2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.3/gcc/config/arm/linux-elf.h	2009-01-25 00:44:19.714736136 -0800
-@@ -62,7 +62,7 @@
- 
- #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
-    %{b} \
-diff -Naur gcc-4.3.3.orig/gcc/config/bfin/linux.h gcc-4.3.3/gcc/config/bfin/linux.h
---- gcc-4.3.3.orig/gcc/config/bfin/linux.h	2007-09-05 17:09:05.000000000 -0700
-+++ gcc-4.3.3/gcc/config/bfin/linux.h	2009-01-25 00:44:12.614954881 -0800
-@@ -22,7 +22,7 @@
-   %{shared:-G -Bdynamic} \
-   %{!shared: %{!static: \
-    %{rdynamic:-export-dynamic} \
--   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
-+   %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \
-    %{static}} -init __init -fini __fini"
- 
- #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
-diff -Naur gcc-4.3.3.orig/gcc/config/cris/linux.h gcc-4.3.3/gcc/config/cris/linux.h
---- gcc-4.3.3.orig/gcc/config/cris/linux.h	2008-01-23 09:17:58.000000000 -0800
-+++ gcc-4.3.3/gcc/config/cris/linux.h	2009-01-25 00:44:10.547772593 -0800
-@@ -102,7 +102,7 @@
- #undef CRIS_DEFAULT_CPU_VERSION
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- /* We need an -rpath-link to ld.so.1, and presumably to each directory
-    specified with -B.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/frv/linux.h gcc-4.3.3/gcc/config/frv/linux.h
---- gcc-4.3.3.orig/gcc/config/frv/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/frv/linux.h	2009-01-25 00:44:10.199141500 -0800
-@@ -35,7 +35,7 @@
- #define ENDFILE_SPEC \
-   "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/gnu.h gcc-4.3.3/gcc/config/i386/gnu.h
---- gcc-4.3.3.orig/gcc/config/i386/gnu.h	2007-08-07 23:35:17.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/gnu.h	2009-01-25 00:44:12.893860874 -0800
-@@ -22,7 +22,7 @@
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
--      %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
-+      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
-     %{static:-static}}"
- 
- #undef	STARTFILE_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h
---- gcc-4.3.3.orig/gcc/config/i386/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/linux64.h	2009-01-25 00:44:12.770812683 -0800
-@@ -53,8 +53,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux.h gcc-4.3.3/gcc/config/i386/linux.h
---- gcc-4.3.3.orig/gcc/config/i386/linux.h	2007-11-27 17:04:27.000000000 -0800
-+++ gcc-4.3.3/gcc/config/i386/linux.h	2009-01-25 00:44:14.194051683 -0800
-@@ -100,7 +100,7 @@
- 
- /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
- #define LINK_EMULATION "elf_i386"
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-diff -Naur gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h
---- gcc-4.3.3.orig/gcc/config/ia64/linux.h	2006-12-12 07:15:19.000000000 -0800
-+++ gcc-4.3.3/gcc/config/ia64/linux.h	2009-01-25 00:44:15.260453415 -0800
-@@ -37,7 +37,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h
---- gcc-4.3.3.orig/gcc/config/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/linux.h	2009-01-25 00:44:18.070013688 -0800
-@@ -112,9 +112,9 @@
-    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
-    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
-    supporting both 32-bit and 64-bit compilation.  */
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- #define LINUX_DYNAMIC_LINKER32 \
-diff -Naur gcc-4.3.3.orig/gcc/config/m32r/linux.h gcc-4.3.3/gcc/config/m32r/linux.h
---- gcc-4.3.3.orig/gcc/config/m32r/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/m32r/linux.h	2009-01-25 00:44:12.389370023 -0800
-@@ -58,7 +58,7 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef	LINK_SPEC
- #if TARGET_LITTLE_ENDIAN
-diff -Naur gcc-4.3.3.orig/gcc/config/m68k/linux.h gcc-4.3.3/gcc/config/m68k/linux.h
---- gcc-4.3.3.orig/gcc/config/m68k/linux.h	2007-09-24 14:07:08.000000000 -0700
-+++ gcc-4.3.3/gcc/config/m68k/linux.h	2009-01-25 00:44:11.044059784 -0800
-@@ -84,7 +84,7 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h
---- gcc-4.3.3.orig/gcc/config/mips/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux64.h	2009-01-25 00:44:18.176655119 -0800
-@@ -38,10 +38,10 @@
- %{!shared: \
-   %{profile:-lc_p} %{!profile:-lc}}"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
- 
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux.h gcc-4.3.3/gcc/config/mips/linux.h
---- gcc-4.3.3.orig/gcc/config/mips/linux.h	2007-10-21 02:20:49.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux.h	2009-01-25 00:44:18.652435256 -0800
-@@ -64,7 +64,7 @@
- #undef MIPS_DEFAULT_GVALUE
- #define MIPS_DEFAULT_GVALUE 0
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- /* Borrowed from sparc/linux.h */
- #undef LINK_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/mn10300/linux.h gcc-4.3.3/gcc/config/mn10300/linux.h
---- gcc-4.3.3.orig/gcc/config/mn10300/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mn10300/linux.h	2009-01-25 00:44:19.054386646 -0800
-@@ -32,7 +32,7 @@
- #undef  ASM_SPEC
- #define ASM_SPEC "%{Wa,*:%*}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
-diff -Naur gcc-4.3.3.orig/gcc/config/pa/pa-linux.h gcc-4.3.3/gcc/config/pa/pa-linux.h
---- gcc-4.3.3.orig/gcc/config/pa/pa-linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/pa/pa-linux.h	2009-01-25 00:44:17.138963542 -0800
-@@ -44,7 +44,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h
---- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/linux64.h	2009-01-25 00:44:08.140163989 -0800
-@@ -339,10 +339,10 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h gcc-4.3.3/gcc/config/rs6000/sysv4.h
---- gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h	2007-08-08 12:33:24.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/sysv4.h	2009-01-25 00:44:08.414967174 -0800
-@@ -891,8 +891,8 @@
- 
- #define LINK_START_LINUX_SPEC ""
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -934,7 +934,7 @@
- 
- #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
--  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
-+  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
- 
- #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__	\
- %{!undef:					                \
-diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h
---- gcc-4.3.3.orig/gcc/config/s390/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/s390/linux.h	2009-01-25 00:44:11.774138007 -0800
-@@ -72,8 +72,8 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
-diff -Naur gcc-4.3.3.orig/gcc/config/sh/linux.h gcc-4.3.3/gcc/config/sh/linux.h
---- gcc-4.3.3.orig/gcc/config/sh/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sh/linux.h	2009-01-25 00:44:16.458105601 -0800
-@@ -47,7 +47,7 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux64.h	2007-10-18 21:29:38.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux64.h	2009-01-25 00:44:20.108482748 -0800
-@@ -144,10 +144,10 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -167,7 +167,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -176,7 +176,7 @@
-         %{static:-static}}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -257,7 +257,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux.h	2009-01-25 00:44:20.453014666 -0800
-@@ -120,8 +120,8 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -132,7 +132,7 @@
- 
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
-diff -Naur gcc-4.3.3.orig/gcc/config/xtensa/linux.h gcc-4.3.3/gcc/config/xtensa/linux.h
---- gcc-4.3.3.orig/gcc/config/xtensa/linux.h	2008-01-17 17:37:53.000000000 -0800
-+++ gcc-4.3.3/gcc/config/xtensa/linux.h	2009-01-25 00:44:10.043282860 -0800
-@@ -43,7 +43,7 @@
-   %{mlongcalls:--longcalls} \
-   %{mno-longcalls:--no-longcalls}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC \
Index: patches/gcc-4.4.0-branch_update-1.patch
===================================================================
--- patches/gcc-4.4.0-branch_update-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
+++ patches/gcc-4.4.0-branch_update-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
@@ -0,0 +1,16334 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 04-29-2009
+Initial Package Version: 4.4.0
+Origin: Upstream
+Upstream Status: Applied
+Description: This is a branch update for gcc-4.4.0, and should be
+             rechecked periodically.
+
+diff -Naur gcc-4.4.0.orig/configure gcc-4.4.0/configure
+--- gcc-4.4.0.orig/configure	2009-04-21 02:08:08.000000000 -0700
++++ gcc-4.4.0/configure	2009-04-24 21:10:29.000000000 -0700
+@@ -272,7 +272,7 @@
+ PACKAGE_BUGREPORT=
+ 
+ ac_unique_file="move-if-change"
+-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 TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc ppllibs pplinc clooglibs clooginc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir 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 TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc extra_mpfr_configure_flags ppllibs pplinc clooglibs clooginc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
+ ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
+ ac_pwd=`pwd`
+ 
+@@ -4596,6 +4596,7 @@
+ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+   gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
++  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
+   # Do not test the gmp version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below
+@@ -4810,6 +4811,7 @@
+ 
+ 
+ 
++
+ # Allow host libstdc++ to be specified for static linking with PPL.
+ 
+ # Check whether --with-host-libstdcxx or --without-host-libstdcxx was given.
+@@ -13251,6 +13253,7 @@
+ s,@do_compare@,$do_compare,;t t
+ s,@gmplibs@,$gmplibs,;t t
+ s,@gmpinc@,$gmpinc,;t t
++s,@extra_mpfr_configure_flags@,$extra_mpfr_configure_flags,;t t
+ s,@ppllibs@,$ppllibs,;t t
+ s,@pplinc@,$pplinc,;t t
+ s,@clooglibs@,$clooglibs,;t t
+diff -Naur gcc-4.4.0.orig/configure.ac gcc-4.4.0/configure.ac
+--- gcc-4.4.0.orig/configure.ac	2009-04-14 01:57:33.000000000 -0700
++++ gcc-4.4.0/configure.ac	2009-04-24 21:10:29.000000000 -0700
+@@ -1250,6 +1250,7 @@
+ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+   gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
++  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
+   # Do not test the gmp version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below
+@@ -1314,6 +1315,7 @@
+ # Flags needed for both GMP and/or MPFR
+ AC_SUBST(gmplibs)
+ AC_SUBST(gmpinc)
++AC_SUBST(extra_mpfr_configure_flags)
+ 
+ # Allow host libstdc++ to be specified for static linking with PPL.
+ AC_ARG_WITH(host-libstdcxx, [  --with-host-libstdcxx=L Use linker arguments L to link with libstdc++
+diff -Naur gcc-4.4.0.orig/contrib/ChangeLog gcc-4.4.0/contrib/ChangeLog
+--- gcc-4.4.0.orig/contrib/ChangeLog	2009-04-21 01:47:54.000000000 -0700
++++ gcc-4.4.0/contrib/ChangeLog	2009-04-27 12:13:16.000000000 -0700
+@@ -1,3 +1,12 @@
++2009-04-27  Jakub Jelinek  <jakub@redhat.com>
++
++	PR testsuite/39807
++	* dg-extract-results.sh: Close open files and use >> instead of >
++	to decrease number of concurrently open files from awk.  Avoid
++	= at the beginning of a regexp and redirect to a file determined
++	by curfile variable rather than concatenated strings to workaround
++	Solaris nawk bug.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/contrib/dg-extract-results.sh gcc-4.4.0/contrib/dg-extract-results.sh
+--- gcc-4.4.0.orig/contrib/dg-extract-results.sh	2008-10-24 02:00:54.000000000 -0700
++++ gcc-4.4.0/contrib/dg-extract-results.sh	2009-04-27 12:13:16.000000000 -0700
+@@ -6,7 +6,7 @@
+ # The resulting file can be used with test result comparison scripts for
+ # results from tests that were run in parallel.  See usage() below.
+ 
+-# Copyright (C) 2008 Free Software Foundation
++# Copyright (C) 2008, 2009 Free Software Foundation
+ # Contributed by Janis Johnson <janis187@us.ibm.com>
+ #
+ # This file is part of GCC.
+@@ -148,26 +148,28 @@
+   ACATS_AWK=${TMP}/acats.awk
+   cat <<EOF > $ACATS_AWK
+ BEGIN {
+-  print_prologue=1; chapter=""; insummary=0
++  print_prologue=1; curfile=""; insummary=0
+   passcnt=0; failcnt=0; unsupcnt=0; failures=""
+ }
+-/=== acats configuration ===/ {
++/^[ \t]*=== acats configuration ===/ {
+   insummary=0
+   if (print_prologue) print
+   next
+ }
+-/=== acats tests ===/ {
++/^[ \t]*=== acats tests ===/ {
+   if (print_prologue) print
+   print_prologue=0
+   next
+ }
+ /^Running chapter / {
+-  chapter=\$3
+-  print > "${TMP}/chapter-"chapter
++  if (curfile) close (curfile)
++  curfile="${TMP}/chapter-"\$3
++  print >> curfile
+   next
+ }
+-/=== acats Summary ===/ {
+-  chapter=""
++/^[ \t]*=== acats Summary ===/ {
++  if (curfile) close (curfile)
++  curfile=""
+   insummary=1
+   next
+ }
+@@ -182,7 +184,7 @@
+ }
+ {
+   if (print_prologue) { print; next }
+-  if (chapter) print > "${TMP}/chapter-"chapter
++  if (curfile) print >> curfile
+ }
+ END {
+   system ("cat ${TMP}/chapter-*")
+@@ -194,6 +196,7 @@
+ }
+ EOF
+ 
++  rm -f ${TMP}/chapter-*
+   $AWK -f $ACATS_AWK $SUM_FILES
+   exit 0
+ fi
+@@ -270,6 +273,7 @@
+   expfileno=1
+   cnt=0
+   print_using=0
++  need_close=0
+ }
+ /^EXPFILE: / {
+   expfiles[expfileno] = \$2
+@@ -287,8 +291,10 @@
+ /^Running / {
+   print_using=0
+   if (variant == curvar) {
++    if (need_close) close(curfile)
+     curfile="${TMP}/list"expfilesr[\$2]
+     expfileseen[\$2]=expfileseen[\$2] + 1
++    need_close=0
+     testname="00"
+     next
+   }
+@@ -303,11 +309,12 @@
+ /^$/ { if ("$MODE" == "sum") next }
+ { if (variant == curvar && curfile) {
+     if ("$MODE" == "sum") {
+-      printf "%s %08d|", testname, cnt > curfile
++      printf "%s %08d|", testname, cnt >> curfile
+       cnt = cnt + 1
+     }
+     filewritten[curfile]=1
+-    print > curfile
++    need_close=1
++    print >> curfile
+   } else
+     next
+ }
+diff -Naur gcc-4.4.0.orig/gcc/ada/gcc-interface/utils2.c gcc-4.4.0/gcc/ada/gcc-interface/utils2.c
+--- gcc-4.4.0.orig/gcc/ada/gcc-interface/utils2.c	2008-11-09 01:50:02.000000000 -0800
++++ gcc-4.4.0/gcc/ada/gcc-interface/utils2.c	2009-04-22 15:33:59.000000000 -0700
+@@ -6,7 +6,7 @@
+  *                                                                          *
+  *                          C Implementation File                           *
+  *                                                                          *
+- *          Copyright (C) 1992-2008, Free Software Foundation, Inc.         *
++ *          Copyright (C) 1992-2009, Free Software Foundation, Inc.         *
+  *                                                                          *
+  * GNAT is free software;  you can  redistribute it  and/or modify it under *
+  * terms of the  GNU General Public License as published  by the Free Soft- *
+@@ -1010,11 +1010,15 @@
+ 
+     case PLUS_EXPR:
+     case MINUS_EXPR:
+-      /* Avoid doing arithmetics in BOOLEAN_TYPE like the other compilers.
+-	 Contrary to C, Ada doesn't allow arithmetics in Standard.Boolean
+-	 but we can generate addition or subtraction for 'Succ and 'Pred.  */
+-      if (operation_type && TREE_CODE (operation_type) == BOOLEAN_TYPE)
+-	operation_type = left_base_type = right_base_type = integer_type_node;
++      /* Avoid doing arithmetics in ENUMERAL_TYPE or BOOLEAN_TYPE like the
++	 other compilers.  Contrary to C, Ada doesn't allow arithmetics in
++	 these types but can generate addition/subtraction for Succ/Pred.  */
++      if (operation_type
++	  && (TREE_CODE (operation_type) == ENUMERAL_TYPE
++	      || TREE_CODE (operation_type) == BOOLEAN_TYPE))
++	operation_type = left_base_type = right_base_type
++	  = gnat_type_for_mode (TYPE_MODE (operation_type),
++				TYPE_UNSIGNED (operation_type));
+ 
+       /* ... fall through ... */
+ 
+@@ -2199,7 +2203,7 @@
+ 	  add_stmt (build3 (COND_EXPR, void_type_node,
+ 			    build_binary_op (GE_EXPR, long_integer_type_node,
+ 					     convert (long_integer_type_node,
+-						      addr64expr), 
++						      addr64expr),
+ 					     malloc64low),
+ 			    build_call_raise (CE_Range_Check_Failed, gnat_actual,
+ 					      N_Raise_Constraint_Error),
+diff -Naur gcc-4.4.0.orig/gcc/ada/gcc-interface/utils.c gcc-4.4.0/gcc/ada/gcc-interface/utils.c
+--- gcc-4.4.0.orig/gcc/ada/gcc-interface/utils.c	2008-12-09 02:35:15.000000000 -0800
++++ gcc-4.4.0/gcc/ada/gcc-interface/utils.c	2009-04-22 15:02:39.000000000 -0700
+@@ -1570,6 +1570,15 @@
+   TREE_STATIC (var_decl)
+     = !extern_flag && (public_flag || static_flag || global_bindings_p ());
+ 
++  /* For an external constant whose initializer is not absolute, do not emit
++     debug info.  In DWARF this would mean a global relocation in a read-only
++     section which runs afoul of the PE-COFF runtime relocation mechanism.  */
++  if (extern_flag
++      && constant_p
++      && initializer_constant_valid_p (var_init, TREE_TYPE (var_init))
++	   != null_pointer_node)
++    DECL_IGNORED_P (var_decl) = 1;
++
+   if (asm_name && VAR_OR_FUNCTION_DECL_P (var_decl))
+     SET_DECL_ASSEMBLER_NAME (var_decl, asm_name);
+ 
+diff -Naur gcc-4.4.0.orig/gcc/alias.c gcc-4.4.0/gcc/alias.c
+--- gcc-4.4.0.orig/gcc/alias.c	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/alias.c	2009-04-27 04:55:13.000000000 -0700
+@@ -1438,15 +1438,16 @@
+ 	  return x;
+       return 0;
+ 
++    case LO_SUM:
++      /* The standard form is (lo_sum reg sym) so look only at the
++         second operand.  */
++      return find_base_term (XEXP (x, 1));
++
+     case CONST:
+       x = XEXP (x, 0);
+       if (GET_CODE (x) != PLUS && GET_CODE (x) != MINUS)
+ 	return 0;
+       /* Fall through.  */
+-    case LO_SUM:
+-      /* The standard form is (lo_sum reg sym) so look only at the
+-         second operand.  */
+-      return find_base_term (XEXP (x, 1));
+     case PLUS:
+     case MINUS:
+       {
+@@ -2250,14 +2251,13 @@
+    Variant of true_dependence which assumes MEM has already been
+    canonicalized (hence we no longer do that here).
+    The mem_addr argument has been added, since true_dependence computed
+-   this value prior to canonicalizing.  */
++   this value prior to canonicalizing.
++   If x_addr is non-NULL, it is used in preference of XEXP (x, 0).  */
+ 
+ int
+ canon_true_dependence (const_rtx mem, enum machine_mode mem_mode, rtx mem_addr,
+-		       const_rtx x, bool (*varies) (const_rtx, bool))
++		       const_rtx x, rtx x_addr, bool (*varies) (const_rtx, bool))
+ {
+-  rtx x_addr;
+-
+   if (MEM_VOLATILE_P (x) && MEM_VOLATILE_P (mem))
+     return 1;
+ 
+@@ -2283,7 +2283,8 @@
+   if (nonoverlapping_memrefs_p (x, mem))
+     return 0;
+ 
+-  x_addr = get_addr (XEXP (x, 0));
++  if (! x_addr)
++    x_addr = get_addr (XEXP (x, 0));
+ 
+   if (! base_alias_check (x_addr, mem_addr, GET_MODE (x), mem_mode))
+     return 0;
+diff -Naur gcc-4.4.0.orig/gcc/ChangeLog gcc-4.4.0/gcc/ChangeLog
+--- gcc-4.4.0.orig/gcc/ChangeLog	2009-04-21 01:44:59.000000000 -0700
++++ gcc-4.4.0/gcc/ChangeLog	2009-04-28 21:57:17.000000000 -0700
+@@ -1,3 +1,143 @@
++2009-04-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
++
++	* toplev.c (print_version): Update GMP version string calculation.
++
++2009-04-28  H.J. Lu  <hongjiu.lu@intel.com>
++
++	Backport from mainline:
++	2009-04-27  H.J. Lu  <hongjiu.lu@intel.com>
++
++	PR target/39903
++	* config/i386/i386.c (construct_container): Don't call
++	gen_reg_or_parallel with BLKmode on X86_64_SSE_CLASS,
++	X86_64_SSESF_CLASS and X86_64_SSEDF_CLASS.
++
++2009-04-27  Jakub Jelinek  <jakub@redhat.com>
++
++	PR rtl-optimization/39794
++	* alias.c (canon_true_dependence): Add x_addr argument.
++	* rtl.h (canon_true_dependence): Adjust prototype.
++	* cse.c (check_dependence): Adjust canon_true_dependence callers.
++	* cselib.c (cselib_invalidate_mem): Likewise.
++	* gcse.c (compute_transp): Likewise.
++	* dse.c (scan_reads_nospill): Likewise.
++	(record_store, check_mem_read_rtx): Likewise.  For non-const-or-frame
++	addresses pass base->val_rtx as mem_addr, for const-or-frame addresses
++	canon_base_addr of the group, plus optional offset.
++	(struct group_info): Rename canon_base_mem to
++	canon_base_addr.
++	(get_group_info): Set canon_base_addr to canon_rtx of base, not
++	canon_rtx of base_mem.
++
++2009-04-26  Jakub Jelinek  <jakub@redhat.com>
++
++	PR inline-asm/39543
++	* fwprop.c (forward_propagate_asm): New function.
++	(forward_propagate_and_simplify): Propagate also into __asm, if it
++	doesn't increase the number of referenced registers.
++
++	PR c/39889
++	* stmt.c (warn_if_unused_value): Look through NON_LVALUE_EXPR.
++
++2009-04-24  Andreas Krebbel  <krebbel1@de.ibm.com>
++
++	* config/s390/constraints.md ('I', 'J'): Fix condition.
++
++2009-04-24  Paolo Bonzini  <bonzini@gnu.org>
++
++	PR middle-end/39867
++	* fold-const.c (fold_cond_expr_with_comparison): When folding
++	> and >= to MAX, make sure the MAX uses the same type as the
++	comparison's operands.
++
++2009-04-23  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	* config/spu/spu-builtins.h: Delete file.
++
++	* config/spu/spu.h (enum spu_builtin_type): Move here from
++	spu-builtins.h.
++	(struct spu_builtin_description): Likewise.  Add GTY marker.
++	Do not use enum spu_function_code or enum insn_code.
++	(spu_builtins): Add extern declaration.
++
++	* config/spu/spu.c: Do not include "spu-builtins.h".
++	(enum spu_function_code, enum spu_builtin_type_index,
++	V16QI_type_node, V8HI_type_node, V4SI_type_node, V2DI_type_node,
++	V4SF_type_node, V2DF_type_node, unsigned_V16QI_type_node,
++	unsigned_V8HI_type_node, unsigned_V4SI_type_node,
++	unsigned_V2DI_type_node): Move here from spu-builtins.h.
++	(spu_builtin_types): Make static.  Add GTY marker.
++	(spu_builtins): Add extern declaration with GTY marker.
++	Include "gt-spu.h".
++
++	* config/spu/spu-c.c: Do not include "spu-builtins.h".
++	(spu_resolve_overloaded_builtin): Do not use spu_function_code.
++	Check programmatically whether all parameters are scalar.
++
++	* config/spu/t-spu-elf (spu.o, spu-c.o): Update dependencies.
++
++2009-04-22  Jing Yu  <jingyu@google.com>
++
++	PR testsuite/39781
++	* config/arm/arm.h: Define HANDLE_PRAGMA_PACK_PUSH_POP.
++
++2009-04-22  Eric Botcazou  <ebotcazou@adacore.com>
++
++	Backport from mainline:
++	2009-04-17  Eric Botcazou  <ebotcazou@adacore.com>
++	* dbxout.c (dbxout_block): Reinstate test on TREE_USED.
++	* tree-ssa-live.c (remove_unused_scope_block_p): Update TREE_USED bit.
++
++2009-04-22  Jakub Jelinek  <jakub@redhat.com>
++
++	* alias.c (find_base_term): Move around LO_SUM case, so that
++	CONST falls through into PLUS/MINUS handling.
++
++	PR c/39855
++	* fold-const.c (fold_binary) <case LSHIFT_EXPR>: When optimizing
++	into 0, use omit_one_operand.
++
++2009-04-22  Vladimir Makarov  <vmakarov@redhat.com>
++
++	PR rtl-optimization/39762
++	* ira-int.h (ira_register_move_cost, ira_may_move_in_cost,
++	ira_may_move_out_cost): Add comments about way of their usage.
++	(ira_get_register_move_cost, ira_get_may_move_cost): New functions.
++
++	* ira-conflicts.c (process_regs_for_copy): Use function
++	ira_get_register_move_cost instead of global
++	ira_register_move_cost.
++
++	* ira-color.c (update_copy_costs, calculate_allocno_spill_cost,
++	color_pass, move_spill_restore, update_curr_costs): Ditto.
++
++	* ira-lives.c (process_single_reg_class_operands): Ditto.
++
++	* ira-emit.c (emit_move_list): Ditto.
++
++	* ira-costs.c (copy_cost): Don't call ira_init_register_move_cost.
++	(record_reg_classes): Ditto.  Use functions
++	ira_get_register_move_cost and ira_get_may_move_cost instead of
++	global vars ira_register_move_cost, ira_may_move_out_cost and
++	ira_may_move_in_cost.
++	(record_address_regs): Don't call ira_init_register_move_cost.
++	Use function ira_get_may_move_cost instead of global
++	ira_may_move_in_cost.
++	(process_bb_node_for_hard_reg_moves): Use function
++	ira_get_register_move_cost instead of global ira_register_move_cost.
++	(ira_costs): Don't call ira_init_register_move_cost.
++
++2009-04-22  Richard Guenther  <rguenther@suse.de>
++
++	PR tree-optimization/39824
++	* tree-ssa-ccp.c (fold_const_aggregate_ref): For INDIRECT_REFs
++	make sure the types are compatible.
++
++2009-04-21  Jakub Jelinek  <jakub@redhat.com>
++
++	* BASE-VER: Set to 4.4.1.
++	* DEV-PHASE: Set to prerelease.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/arm.h gcc-4.4.0/gcc/config/arm/arm.h
+--- gcc-4.4.0.orig/gcc/config/arm/arm.h	2009-03-17 13:18:21.000000000 -0700
++++ gcc-4.4.0/gcc/config/arm/arm.h	2009-04-22 17:31:13.000000000 -0700
+@@ -2244,7 +2244,9 @@
+ #define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)	\
+   if (TARGET_32BIT)					\
+     ARM_GO_IF_MODE_DEPENDENT_ADDRESS (ADDR, LABEL)
+-
+
++
++/* Define this for compatibility reasons. */
++#define HANDLE_PRAGMA_PACK_PUSH_POP
+ 
+ /* Specify the machine mode that this machine uses
+    for the index in the tablejump instruction.  */
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/i386.c gcc-4.4.0/gcc/config/i386/i386.c
+--- gcc-4.4.0.orig/gcc/config/i386/i386.c	2009-04-14 13:27:30.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/i386.c	2009-04-28 07:35:12.000000000 -0700
+@@ -5357,7 +5357,10 @@
+       case X86_64_SSE_CLASS:
+       case X86_64_SSESF_CLASS:
+       case X86_64_SSEDF_CLASS:
+-	return gen_reg_or_parallel (mode, orig_mode, SSE_REGNO (sse_regno));
++	if (mode != BLKmode)
++	  return gen_reg_or_parallel (mode, orig_mode, 
++				      SSE_REGNO (sse_regno));
++	break;
+       case X86_64_X87_CLASS:
+       case X86_64_COMPLEX_X87_CLASS:
+ 	return gen_rtx_REG (mode, FIRST_STACK_REG);
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/constraints.md gcc-4.4.0/gcc/config/s390/constraints.md
+--- gcc-4.4.0.orig/gcc/config/s390/constraints.md	2008-05-28 07:11:19.000000000 -0700
++++ gcc-4.4.0/gcc/config/s390/constraints.md	2009-04-24 07:51:17.000000000 -0700
+@@ -129,13 +129,13 @@
+ (define_constraint "I"
+   "An 8-bit constant (0..255)"
+   (and (match_code "const_int")
+-       (match_test "(unsigned int) ival <= 255")))
++       (match_test "(unsigned HOST_WIDE_INT) ival <= 255")))
+ 
+ 
+ (define_constraint "J"
+   "A 12-bit constant (0..4095)"
+   (and (match_code "const_int")
+-       (match_test "(unsigned int) ival <= 4095")))
++       (match_test "(unsigned HOST_WIDE_INT) ival <= 4095")))
+ 
+ 
+ (define_constraint "K"
+diff -Naur gcc-4.4.0.orig/gcc/config/spu/spu-builtins.h gcc-4.4.0/gcc/config/spu/spu-builtins.h
+--- gcc-4.4.0.orig/gcc/config/spu/spu-builtins.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/spu/spu-builtins.h	1969-12-31 16:00:00.000000000 -0800
+@@ -1,119 +0,0 @@
+-/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+-
+-   This file is free software; you can redistribute it and/or modify it under
+-   the terms of the GNU General Public License as published by the Free
+-   Software Foundation; either version 3 of the License, or (at your option) 
+-   any later version.
+-
+-   This file is distributed in the hope that it will be useful, but WITHOUT
+-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+-   for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with GCC; see the file COPYING3.  If not see
+-   <http://www.gnu.org/licenses/>.  */
+-
+
+-/* built-ins */
+-
+-enum spu_builtin_type_index
+-{
+-  SPU_BTI_END_OF_PARAMS,
+-
+-  /* We create new type nodes for these. */
+-  SPU_BTI_V16QI,
+-  SPU_BTI_V8HI,
+-  SPU_BTI_V4SI,
+-  SPU_BTI_V2DI,
+-  SPU_BTI_V4SF,
+-  SPU_BTI_V2DF,
+-  SPU_BTI_UV16QI,
+-  SPU_BTI_UV8HI,
+-  SPU_BTI_UV4SI,
+-  SPU_BTI_UV2DI,
+-
+-  /* A 16-byte type. (Implemented with V16QI_type_node) */
+-  SPU_BTI_QUADWORD,
+-
+-  /* These all correspond to intSI_type_node */
+-  SPU_BTI_7,
+-  SPU_BTI_S7,
+-  SPU_BTI_U7,
+-  SPU_BTI_S10,
+-  SPU_BTI_S10_4,
+-  SPU_BTI_U14,
+-  SPU_BTI_16,
+-  SPU_BTI_S16,
+-  SPU_BTI_S16_2,
+-  SPU_BTI_U16,
+-  SPU_BTI_U16_2,
+-  SPU_BTI_U18,
+-
+-  /* These correspond to the standard types */
+-  SPU_BTI_INTQI, 
+-  SPU_BTI_INTHI, 
+-  SPU_BTI_INTSI, 
+-  SPU_BTI_INTDI, 
+-
+-  SPU_BTI_UINTQI,
+-  SPU_BTI_UINTHI,
+-  SPU_BTI_UINTSI,
+-  SPU_BTI_UINTDI,
+-
+-  SPU_BTI_FLOAT, 
+-  SPU_BTI_DOUBLE,
+-
+-  SPU_BTI_VOID,   
+-  SPU_BTI_PTR,   
+-
+-  SPU_BTI_MAX
+-};
+-
+-#define V16QI_type_node               (spu_builtin_types[SPU_BTI_V16QI])
+-#define V8HI_type_node                (spu_builtin_types[SPU_BTI_V8HI])
+-#define V4SI_type_node                (spu_builtin_types[SPU_BTI_V4SI])
+-#define V2DI_type_node                (spu_builtin_types[SPU_BTI_V2DI])
+-#define V4SF_type_node                (spu_builtin_types[SPU_BTI_V4SF])
+-#define V2DF_type_node                (spu_builtin_types[SPU_BTI_V2DF])
+-#define unsigned_V16QI_type_node      (spu_builtin_types[SPU_BTI_UV16QI])
+-#define unsigned_V8HI_type_node       (spu_builtin_types[SPU_BTI_UV8HI])
+-#define unsigned_V4SI_type_node       (spu_builtin_types[SPU_BTI_UV4SI])
+-#define unsigned_V2DI_type_node       (spu_builtin_types[SPU_BTI_UV2DI])
+-
+-extern GTY(()) tree spu_builtin_types[SPU_BTI_MAX];
+-
+-/* Some builtins require special handling.  This enum differentiates. */
+-enum spu_builtin_type {
+-    B_INSN,
+-    B_JUMP,
+-    B_BISLED,
+-    B_CALL,
+-    B_HINT,
+-    B_OVERLOAD, 
+-    B_INTERNAL
+-};
+-
+-typedef enum {
+-#define DEF_BUILTIN(fcode, icode, name, type, params) fcode,
+-#include "spu-builtins.def"
+-#undef DEF_BUILTIN
+-   NUM_SPU_BUILTINS
+-} spu_function_code;
+-
+-struct spu_builtin_description {
+-    spu_function_code fcode;
+-    enum insn_code icode;
+-    const char *name;
+-    enum spu_builtin_type type;
+-
+-    /* The first element of parm is always the return type.  The rest
+-     * are a zero terminated list of parameters. */
+-    int parm[5];
+-
+-    tree fndecl;
+-};
+-
+-extern GTY(()) struct spu_builtin_description spu_builtins[];
+-
+-
+-
+diff -Naur gcc-4.4.0.orig/gcc/config/spu/spu.c gcc-4.4.0/gcc/config/spu/spu.c
+--- gcc-4.4.0.orig/gcc/config/spu/spu.c	2009-03-12 07:00:21.000000000 -0700
++++ gcc-4.4.0/gcc/config/spu/spu.c	2009-04-23 15:50:16.000000000 -0700
+@@ -52,13 +52,79 @@
+ #include "machmode.h"
+ #include "gimple.h"
+ #include "tm-constrs.h"
+-#include "spu-builtins.h"
+ #include "ddg.h"
+ #include "sbitmap.h"
+ #include "timevar.h"
+ #include "df.h"
+ 
+ /* Builtin types, data and prototypes. */
++
++enum spu_builtin_type_index
++{
++  SPU_BTI_END_OF_PARAMS,
++
++  /* We create new type nodes for these. */
++  SPU_BTI_V16QI,
++  SPU_BTI_V8HI,
++  SPU_BTI_V4SI,
++  SPU_BTI_V2DI,
++  SPU_BTI_V4SF,
++  SPU_BTI_V2DF,
++  SPU_BTI_UV16QI,
++  SPU_BTI_UV8HI,
++  SPU_BTI_UV4SI,
++  SPU_BTI_UV2DI,
++
++  /* A 16-byte type. (Implemented with V16QI_type_node) */
++  SPU_BTI_QUADWORD,
++
++  /* These all correspond to intSI_type_node */
++  SPU_BTI_7,
++  SPU_BTI_S7,
++  SPU_BTI_U7,
++  SPU_BTI_S10,
++  SPU_BTI_S10_4,
++  SPU_BTI_U14,
++  SPU_BTI_16,
++  SPU_BTI_S16,
++  SPU_BTI_S16_2,
++  SPU_BTI_U16,
++  SPU_BTI_U16_2,
++  SPU_BTI_U18,
++
++  /* These correspond to the standard types */
++  SPU_BTI_INTQI, 
++  SPU_BTI_INTHI, 
++  SPU_BTI_INTSI, 
++  SPU_BTI_INTDI, 
++
++  SPU_BTI_UINTQI,
++  SPU_BTI_UINTHI,
++  SPU_BTI_UINTSI,
++  SPU_BTI_UINTDI,
++
++  SPU_BTI_FLOAT, 
++  SPU_BTI_DOUBLE,
++
++  SPU_BTI_VOID,   
++  SPU_BTI_PTR,   
++
++  SPU_BTI_MAX
++};
++
++#define V16QI_type_node               (spu_builtin_types[SPU_BTI_V16QI])
++#define V8HI_type_node                (spu_builtin_types[SPU_BTI_V8HI])
++#define V4SI_type_node                (spu_builtin_types[SPU_BTI_V4SI])
++#define V2DI_type_node                (spu_builtin_types[SPU_BTI_V2DI])
++#define V4SF_type_node                (spu_builtin_types[SPU_BTI_V4SF])
++#define V2DF_type_node                (spu_builtin_types[SPU_BTI_V2DF])
++#define unsigned_V16QI_type_node      (spu_builtin_types[SPU_BTI_UV16QI])
++#define unsigned_V8HI_type_node       (spu_builtin_types[SPU_BTI_UV8HI])
++#define unsigned_V4SI_type_node       (spu_builtin_types[SPU_BTI_UV4SI])
++#define unsigned_V2DI_type_node       (spu_builtin_types[SPU_BTI_UV2DI])
++
++static GTY(()) tree spu_builtin_types[SPU_BTI_MAX];
++
+ struct spu_builtin_range
+ {
+   int low, high;
+@@ -202,8 +268,6 @@
+ static enum machine_mode
+ spu_libgcc_shift_count_mode (void);
+ 
+-/* Built in types.  */
+-tree spu_builtin_types[SPU_BTI_MAX];
+ 
+
+ /*  TARGET overrides.  */
+ 
+@@ -5067,6 +5131,16 @@
+ 
+
+ /* Create the built-in types and functions */
+ 
++enum spu_function_code
++{
++#define DEF_BUILTIN(fcode, icode, name, type, params) fcode,
++#include "spu-builtins.def"
++#undef DEF_BUILTIN
++   NUM_SPU_BUILTINS
++};
++
++extern GTY(()) struct spu_builtin_description spu_builtins[NUM_SPU_BUILTINS];
++
+ struct spu_builtin_description spu_builtins[] = {
+ #define DEF_BUILTIN(fcode, icode, name, type, params) \
+   {fcode, icode, name, type, params, NULL_TREE},
+@@ -6298,3 +6372,5 @@
+   return default_section_type_flags (decl, name, reloc);
+ }
+ 
++#include "gt-spu.h"
++
+diff -Naur gcc-4.4.0.orig/gcc/config/spu/spu-c.c gcc-4.4.0/gcc/config/spu/spu-c.c
+--- gcc-4.4.0.orig/gcc/config/spu/spu-c.c	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/spu/spu-c.c	2009-04-23 15:50:16.000000000 -0700
+@@ -32,7 +32,6 @@
+ #include "insn-codes.h"
+ #include "recog.h"
+ #include "optabs.h"
+-#include "spu-builtins.h"
+ 
+
+ 
+ /* Keep the vector keywords handy for fast comparisons.  */
+@@ -101,8 +100,7 @@
+ #define SCALAR_TYPE_P(t) (INTEGRAL_TYPE_P (t) \
+ 			  || SCALAR_FLOAT_TYPE_P (t) \
+ 			  || POINTER_TYPE_P (t))
+-  spu_function_code new_fcode, fcode =
+-    DECL_FUNCTION_CODE (fndecl) - END_BUILTINS;
++  int new_fcode, fcode = DECL_FUNCTION_CODE (fndecl) - END_BUILTINS;
+   struct spu_builtin_description *desc;
+   tree match = NULL_TREE;
+ 
+@@ -122,8 +120,15 @@
+       tree decl = spu_builtins[new_fcode].fndecl;
+       tree params = TYPE_ARG_TYPES (TREE_TYPE (decl));
+       tree arg, param;
++      bool all_scalar;
+       int p;
+ 
++      /* Check whether all parameters are scalar.  */
++      all_scalar = true;
++      for (param = params; param != void_list_node; param = TREE_CHAIN (param))
++	if (!SCALAR_TYPE_P (TREE_VALUE (param)))
++	  all_scalar = false;
++
+       for (param = params, arg = fnargs, p = 0;
+ 	   param != void_list_node;
+ 	   param = TREE_CHAIN (param), arg = TREE_CHAIN (arg), p++)
+@@ -155,10 +160,7 @@
+ 	     parameter. */
+ 	  if ((!SCALAR_TYPE_P (param_type)
+ 	       || !SCALAR_TYPE_P (arg_type)
+-	       || ((fcode == SPU_SPLATS || fcode == SPU_PROMOTE
+-		    || fcode == SPU_HCMPEQ || fcode == SPU_HCMPGT
+-		    || fcode == SPU_MASKB || fcode == SPU_MASKH
+-		    || fcode == SPU_MASKW) && p == 0))
++	       || (all_scalar && p == 0))
+ 	      && !comptypes (TYPE_MAIN_VARIANT (param_type),
+ 			     TYPE_MAIN_VARIANT (arg_type)))
+ 	    break;
+diff -Naur gcc-4.4.0.orig/gcc/config/spu/spu.h gcc-4.4.0/gcc/config/spu/spu.h
+--- gcc-4.4.0.orig/gcc/config/spu/spu.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/spu/spu.h	2009-04-23 15:50:16.000000000 -0700
+@@ -622,3 +622,33 @@
+ extern GTY(()) rtx spu_compare_op0;
+ extern GTY(()) rtx spu_compare_op1;
+ 
++
++/* Builtins.  */
++
++enum spu_builtin_type
++{
++  B_INSN,
++  B_JUMP,
++  B_BISLED,
++  B_CALL,
++  B_HINT,
++  B_OVERLOAD,
++  B_INTERNAL
++};
++
++struct spu_builtin_description GTY(())
++{
++  int fcode;
++  int icode;
++  const char *name;
++  enum spu_builtin_type type;
++
++  /* The first element of parm is always the return type.  The rest
++     are a zero terminated list of parameters.  */
++  int parm[5];
++
++  tree fndecl;
++};
++
++extern struct spu_builtin_description spu_builtins[];
++
+diff -Naur gcc-4.4.0.orig/gcc/config/spu/t-spu-elf gcc-4.4.0/gcc/config/spu/t-spu-elf
+--- gcc-4.4.0.orig/gcc/config/spu/t-spu-elf	2009-03-26 07:36:27.000000000 -0700
++++ gcc-4.4.0/gcc/config/spu/t-spu-elf	2009-04-23 15:50:16.000000000 -0700
+@@ -85,13 +85,10 @@
+   output.h $(BASIC_BLOCK_H) $(INTEGRATE_H) toplev.h $(GGC_H) $(HASHTAB_H) \
+   $(TM_P_H) $(TARGET_H) $(TARGET_DEF_H) langhooks.h reload.h cfglayout.h \
+   $(srcdir)/config/spu/spu-protos.h \
+-  $(srcdir)/config/spu/spu-builtins.h \
+   $(srcdir)/config/spu/spu-builtins.def 
+ 
+ spu-c.o: $(srcdir)/config/spu/spu-c.c \
+     $(srcdir)/config/spu/spu-protos.h \
+-    $(srcdir)/config/spu/spu-builtins.h \
+-    $(srcdir)/config/spu/spu-builtins.def \
+     $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(CPPLIB_H) \
+     $(TM_P_H) c-pragma.h errors.h coretypes.h $(TM_H) insn-codes.h
+ 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/spu/spu-c.c
+diff -Naur gcc-4.4.0.orig/gcc/cp/call.c gcc-4.4.0/gcc/cp/call.c
+--- gcc-4.4.0.orig/gcc/cp/call.c	2009-04-13 13:56:45.000000000 -0700
++++ gcc-4.4.0/gcc/cp/call.c	2009-04-23 04:13:57.000000000 -0700
+@@ -4069,8 +4069,20 @@
+ 	default:
+ 	  if ((flags & LOOKUP_COMPLAIN) && (complain & tf_error))
+ 	    {
+-	      op_error (code, code2, arg1, arg2, arg3, "no match");
+-	      print_z_candidates (candidates);
++		/* If one of the arguments of the operator represents
++		   an invalid use of member function pointer, try to report
++		   a meaningful error ...  */
++		if (invalid_nonstatic_memfn_p (arg1, tf_error)
++		    || invalid_nonstatic_memfn_p (arg2, tf_error)
++		    || invalid_nonstatic_memfn_p (arg3, tf_error))
++		  /* We displayed the error message.  */;
++		else
++		  {
++		    /* ... Otherwise, report the more generic
++		       "no matching operator found" error */
++		    op_error (code, code2, arg1, arg2, arg3, "no match");
++		    print_z_candidates (candidates);
++		  }
+ 	    }
+ 	  result = error_mark_node;
+ 	  break;
+diff -Naur gcc-4.4.0.orig/gcc/cp/ChangeLog gcc-4.4.0/gcc/cp/ChangeLog
+--- gcc-4.4.0.orig/gcc/cp/ChangeLog	2009-04-21 01:44:51.000000000 -0700
++++ gcc-4.4.0/gcc/cp/ChangeLog	2009-04-23 04:13:57.000000000 -0700
+@@ -1,3 +1,22 @@
++2009-04-23  Dodji Seketeli  <dodji@redhat.com>
++
++	PR c++/38228
++	* pt.c (unify): Do not allow the result of a template argument
++	deduction to be a METHOD_TYPE.
++	* cvt.c (cp_convert): Report a meaningful error for non-valid use
++	of pointer to member functions during conversions.
++	* call.c (build_new_op): Report a meaningful error for non-valid
++	use of pointer to member functions in binary expressions.
++	* typeck.c (invalid_nonstatic_memfn_p): Do not crash when EXPR is
++	NULL;
++
++2009-04-22  Dodji Seketeli  <dodji@redhat.com>
++
++	PR c++/39639
++	* parser.c (cp_parser_template_argument_list): Display an error
++	when an ellipsis is not preceded by a parameter pack. Also, warn
++	about variadic templates usage without -std=c++0x.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/gcc/cp/cvt.c gcc-4.4.0/gcc/cp/cvt.c
+--- gcc-4.4.0.orig/gcc/cp/cvt.c	2008-08-18 04:17:52.000000000 -0700
++++ gcc-4.4.0/gcc/cp/cvt.c	2009-04-23 04:13:57.000000000 -0700
+@@ -760,8 +760,15 @@
+     }
+ 
+   if (flags & LOOKUP_COMPLAIN)
+-    error ("conversion from %qT to non-scalar type %qT requested",
+-	   TREE_TYPE (expr), type);
++    {
++      /* If the conversion failed and expr was an invalid use of pointer to
++	 member function, try to report a meaningful error.  */
++      if (invalid_nonstatic_memfn_p (expr, tf_warning_or_error))
++	/* We displayed the error message.  */;
++      else
++	error ("conversion from %qT to non-scalar type %qT requested",
++	       TREE_TYPE (expr), type);
++    }
+   return error_mark_node;
+ }
+ 
+diff -Naur gcc-4.4.0.orig/gcc/cp/parser.c gcc-4.4.0/gcc/cp/parser.c
+--- gcc-4.4.0.orig/gcc/cp/parser.c	2009-04-10 12:01:16.000000000 -0700
++++ gcc-4.4.0/gcc/cp/parser.c	2009-04-22 12:16:13.000000000 -0700
+@@ -10477,6 +10477,12 @@
+          argument pack. */
+       if (cp_lexer_next_token_is (parser->lexer, CPP_ELLIPSIS))
+         {
++	  if (argument == error_mark_node)
++	    {
++	      cp_token *token = cp_lexer_peek_token (parser->lexer);
++	      error ("%Hexpected parameter pack before %<...%>",
++		     &token->location);
++	    }
+           /* Consume the `...' token. */
+           cp_lexer_consume_token (parser->lexer);
+ 
+diff -Naur gcc-4.4.0.orig/gcc/cp/pt.c gcc-4.4.0/gcc/cp/pt.c
+--- gcc-4.4.0.orig/gcc/cp/pt.c	2009-04-13 12:27:20.000000000 -0700
++++ gcc-4.4.0/gcc/cp/pt.c	2009-04-23 04:13:57.000000000 -0700
+@@ -13532,6 +13532,13 @@
+ 	  && !template_parameter_pack_p (parm))
+ 	return 1;
+ 
++      /* If the argument deduction results is a METHOD_TYPE,
++         then there is a problem.
++         METHOD_TYPE doesn't map to any real C++ type the result of
++	 the deduction can not be of that type.  */
++      if (TREE_CODE (arg) == METHOD_TYPE)
++	return 1;
++
+       TREE_VEC_ELT (INNERMOST_TEMPLATE_ARGS (targs), idx) = arg;
+       return 0;
+ 
+diff -Naur gcc-4.4.0.orig/gcc/cp/typeck.c gcc-4.4.0/gcc/cp/typeck.c
+--- gcc-4.4.0.orig/gcc/cp/typeck.c	2009-04-06 21:38:10.000000000 -0700
++++ gcc-4.4.0/gcc/cp/typeck.c	2009-04-23 04:13:57.000000000 -0700
+@@ -1508,7 +1508,7 @@
+ bool
+ invalid_nonstatic_memfn_p (const_tree expr, tsubst_flags_t complain)
+ {
+-  if (DECL_NONSTATIC_MEMBER_FUNCTION_P (expr))
++  if (expr && DECL_NONSTATIC_MEMBER_FUNCTION_P (expr))
+     {
+       if (complain & tf_error)
+         error ("invalid use of non-static member function");
+diff -Naur gcc-4.4.0.orig/gcc/cse.c gcc-4.4.0/gcc/cse.c
+--- gcc-4.4.0.orig/gcc/cse.c	2009-03-14 01:10:55.000000000 -0700
++++ gcc-4.4.0/gcc/cse.c	2009-04-27 04:55:13.000000000 -0700
+@@ -1,6 +1,6 @@
+ /* Common subexpression elimination for GNU compiler.
+    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998
+-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+    Free Software Foundation, Inc.
+ 
+ This file is part of GCC.
+@@ -1658,7 +1658,7 @@
+ {
+   struct check_dependence_data *d = (struct check_dependence_data *) data;
+   if (*x && MEM_P (*x))
+-    return canon_true_dependence (d->exp, d->mode, d->addr, *x,
++    return canon_true_dependence (d->exp, d->mode, d->addr, *x, NULL_RTX,
+ 		    		  cse_rtx_varies_p);
+   else
+     return 0;
+diff -Naur gcc-4.4.0.orig/gcc/cselib.c gcc-4.4.0/gcc/cselib.c
+--- gcc-4.4.0.orig/gcc/cselib.c	2008-12-22 15:41:17.000000000 -0800
++++ gcc-4.4.0/gcc/cselib.c	2009-04-27 04:55:13.000000000 -0700
+@@ -1,6 +1,6 @@
+ /* Common subexpression elimination library for GNU compiler.
+    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+-   1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008
++   1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+    Free Software Foundation, Inc.
+ 
+ This file is part of GCC.
+@@ -1483,7 +1483,7 @@
+ 	    }
+ 	  if (num_mems < PARAM_VALUE (PARAM_MAX_CSELIB_MEMORY_LOCATIONS)
+ 	      && ! canon_true_dependence (mem_rtx, GET_MODE (mem_rtx), mem_addr,
+-		      			  x, cselib_rtx_varies_p))
++		      			  x, NULL_RTX, cselib_rtx_varies_p))
+ 	    {
+ 	      has_mem = true;
+ 	      num_mems++;
+diff -Naur gcc-4.4.0.orig/gcc/DATESTAMP gcc-4.4.0/gcc/DATESTAMP
+--- gcc-4.4.0.orig/gcc/DATESTAMP	2009-04-20 17:16:42.000000000 -0700
++++ gcc-4.4.0/gcc/DATESTAMP	2009-04-28 17:16:54.000000000 -0700
+@@ -1 +1 @@
+-20090421
++20090429
+diff -Naur gcc-4.4.0.orig/gcc/dbxout.c gcc-4.4.0/gcc/dbxout.c
+--- gcc-4.4.0.orig/gcc/dbxout.c	2009-02-27 11:49:42.000000000 -0800
++++ gcc-4.4.0/gcc/dbxout.c	2009-04-22 15:24:45.000000000 -0700
+@@ -3593,7 +3593,7 @@
+   while (block)
+     {
+       /* Ignore blocks never expanded or otherwise marked as real.  */
+-      if (TREE_ASM_WRITTEN (block))
++      if (TREE_USED (block) && TREE_ASM_WRITTEN (block))
+ 	{
+ 	  int did_output;
+ 	  int blocknum = BLOCK_NUMBER (block);
+diff -Naur gcc-4.4.0.orig/gcc/dse.c gcc-4.4.0/gcc/dse.c
+--- gcc-4.4.0.orig/gcc/dse.c	2009-03-18 10:04:26.000000000 -0700
++++ gcc-4.4.0/gcc/dse.c	2009-04-27 04:55:13.000000000 -0700
+@@ -223,7 +223,7 @@
+   /* This canonized mem.  */
+   rtx mem;
+ 
+-  /* The result of get_addr on mem.  */
++  /* Canonized MEM address for use by canon_true_dependence.  */
+   rtx mem_addr;
+ 
+   /* If this is non-zero, it is the alias set of a spill location.  */
+@@ -476,8 +476,8 @@
+      do read dependency.  */
+   rtx base_mem;
+   
+-  /* Canonized version of base_mem, most likely the same thing.  */
+-  rtx canon_base_mem;
++  /* Canonized version of base_mem's address.  */
++  rtx canon_base_addr;
+ 
+   /* These two sets of two bitmaps are used to keep track of how many
+      stores are actually referencing that position from this base.  We
+@@ -705,7 +705,7 @@
+       gi->rtx_base = base;
+       gi->id = rtx_group_next_id++;
+       gi->base_mem = gen_rtx_MEM (QImode, base);
+-      gi->canon_base_mem = canon_rtx (gi->base_mem);
++      gi->canon_base_addr = canon_rtx (base);
+       gi->store1_n = BITMAP_ALLOC (NULL);
+       gi->store1_p = BITMAP_ALLOC (NULL);
+       gi->store2_n = BITMAP_ALLOC (NULL);
+@@ -1286,7 +1286,7 @@
+ static int
+ record_store (rtx body, bb_info_t bb_info)
+ {
+-  rtx mem, rhs, const_rhs;
++  rtx mem, rhs, const_rhs, mem_addr;
+   HOST_WIDE_INT offset = 0;
+   HOST_WIDE_INT width = 0;
+   alias_set_type spill_alias_set;
+@@ -1456,6 +1456,23 @@
+   ptr = active_local_stores;
+   last = NULL;
+   redundant_reason = NULL;
++  mem = canon_rtx (mem);
++  /* For alias_set != 0 canon_true_dependence should be never called.  */
++  if (spill_alias_set)
++    mem_addr = NULL_RTX;
++  else
++    {
++      if (group_id < 0)
++	mem_addr = base->val_rtx;
++      else
++	{
++	  group_info_t group
++	    = VEC_index (group_info_t, rtx_group_vec, group_id);
++	  mem_addr = group->canon_base_addr;
++	}
++      if (offset)
++	mem_addr = plus_constant (mem_addr, offset);
++    }
+ 
+   while (ptr)
+     {
+@@ -1547,13 +1564,13 @@
+ 	  if (canon_true_dependence (s_info->mem, 
+ 				     GET_MODE (s_info->mem),
+ 				     s_info->mem_addr,
+-				     mem, rtx_varies_p))
++				     mem, mem_addr, rtx_varies_p))
+ 	    {
+ 	      s_info->rhs = NULL;
+ 	      s_info->const_rhs = NULL;
+ 	    }
+ 	}
+-      
++
+       /* An insn can be deleted if every position of every one of
+ 	 its s_infos is zero.  */
+       if (any_positions_needed_p (s_info)
+@@ -1580,9 +1597,9 @@
+   /* Finish filling in the store_info.  */
+   store_info->next = insn_info->store_rec;
+   insn_info->store_rec = store_info;
+-  store_info->mem = canon_rtx (mem);
++  store_info->mem = mem;
+   store_info->alias_set = spill_alias_set;
+-  store_info->mem_addr = get_addr (XEXP (mem, 0));
++  store_info->mem_addr = mem_addr;
+   store_info->cse_base = base;
+   if (width > HOST_BITS_PER_WIDE_INT)
+     {
+@@ -2006,7 +2023,7 @@
+ static int
+ check_mem_read_rtx (rtx *loc, void *data)
+ {
+-  rtx mem = *loc;
++  rtx mem = *loc, mem_addr;
+   bb_info_t bb_info;
+   insn_info_t insn_info;
+   HOST_WIDE_INT offset = 0;
+@@ -2058,6 +2075,22 @@
+   read_info->end = offset + width;
+   read_info->next = insn_info->read_rec;
+   insn_info->read_rec = read_info;
++  /* For alias_set != 0 canon_true_dependence should be never called.  */
++  if (spill_alias_set)
++    mem_addr = NULL_RTX;
++  else
++    {
++      if (group_id < 0)
++	mem_addr = base->val_rtx;
++      else
++	{
++	  group_info_t group
++	    = VEC_index (group_info_t, rtx_group_vec, group_id);
++	  mem_addr = group->canon_base_addr;
++	}
++      if (offset)
++	mem_addr = plus_constant (mem_addr, offset);
++    }
+ 
+   /* We ignore the clobbers in store_info.  The is mildly aggressive,
+      but there really should not be a clobber followed by a read.  */
+@@ -2128,7 +2161,7 @@
+ 	      = canon_true_dependence (store_info->mem, 
+ 				       GET_MODE (store_info->mem),
+ 				       store_info->mem_addr,
+-				       mem, rtx_varies_p);
++				       mem, mem_addr, rtx_varies_p);
+ 	  
+ 	  else if (group_id == store_info->group_id)
+ 	    {
+@@ -2139,7 +2172,7 @@
+ 		  = canon_true_dependence (store_info->mem, 
+ 					   GET_MODE (store_info->mem),
+ 					   store_info->mem_addr,
+-					   mem, rtx_varies_p);
++					   mem, mem_addr, rtx_varies_p);
+ 	      
+ 	      /* If this read is just reading back something that we just
+ 		 stored, rewrite the read.  */
+@@ -2224,7 +2257,7 @@
+ 	    remove = canon_true_dependence (store_info->mem, 
+ 					    GET_MODE (store_info->mem),
+ 					    store_info->mem_addr,
+-					    mem, rtx_varies_p);
++					    mem, mem_addr, rtx_varies_p);
+ 	  
+ 	  if (remove)
+ 	    {
+@@ -3066,8 +3099,9 @@
+ 		  if ((read_info->group_id < 0)
+ 		      && canon_true_dependence (group->base_mem, 
+ 						QImode,
+-						group->canon_base_mem,
+-						read_info->mem, rtx_varies_p))
++						group->canon_base_addr,
++						read_info->mem, NULL_RTX,
++						rtx_varies_p))
+ 		    {
+ 		      if (kill)
+ 			bitmap_ior_into (kill, group->group_kill);
+diff -Naur gcc-4.4.0.orig/gcc/fold-const.c gcc-4.4.0/gcc/fold-const.c
+--- gcc-4.4.0.orig/gcc/fold-const.c	2009-03-11 08:24:00.000000000 -0700
++++ gcc-4.4.0/gcc/fold-const.c	2009-04-24 04:34:59.000000000 -0700
+@@ -5293,31 +5293,34 @@
+ 	break;
+ 
+       case GT_EXPR:
+-	/* If C1 is C2 - 1, this is max(A, C2).  */
++	/* If C1 is C2 - 1, this is max(A, C2), but use ARG00's type for
++	   MAX_EXPR, to preserve the signedness of the comparison.  */
+ 	if (! operand_equal_p (arg2, TYPE_MIN_VALUE (type),
+ 			       OEP_ONLY_CONST)
+ 	    && operand_equal_p (arg01,
+ 				const_binop (MINUS_EXPR, arg2,
+ 					     build_int_cst (type, 1), 0),
+ 				OEP_ONLY_CONST))
+-	  return pedantic_non_lvalue (fold_build2 (MAX_EXPR,
+-						   type,
+-						   fold_convert (type, arg1),
+-						   arg2));
++	  return pedantic_non_lvalue (fold_convert (type,
++				      fold_build2 (MAX_EXPR, TREE_TYPE (arg00),
++						   arg00,
++						   fold_convert (TREE_TYPE (arg00),
++							         arg2))));
+ 	break;
+ 
+       case GE_EXPR:
+-	/* If C1 is C2 + 1, this is max(A, C2).  */
++	/* If C1 is C2 + 1, this is max(A, C2), with the same care as above.  */
+ 	if (! operand_equal_p (arg2, TYPE_MAX_VALUE (type),
+ 			       OEP_ONLY_CONST)
+ 	    && operand_equal_p (arg01,
+ 				const_binop (PLUS_EXPR, arg2,
+ 					     build_int_cst (type, 1), 0),
+ 				OEP_ONLY_CONST))
+-	  return pedantic_non_lvalue (fold_build2 (MAX_EXPR,
+-						   type,
+-						   fold_convert (type, arg1),
+-						   arg2));
++	  return pedantic_non_lvalue (fold_convert (type,
++				      fold_build2 (MAX_EXPR, TREE_TYPE (arg00),
++						   arg00,
++						   fold_convert (TREE_TYPE (arg00),
++							         arg2))));
+ 	break;
+       case NE_EXPR:
+ 	break;
+@@ -11861,7 +11864,8 @@
+ 	      if (code == LROTATE_EXPR || code == RROTATE_EXPR)
+ 	        low = low % TYPE_PRECISION (type);
+ 	      else if (TYPE_UNSIGNED (type) || code == LSHIFT_EXPR)
+-	        return build_int_cst (type, 0);
++		return omit_one_operand (type, build_int_cst (type, 0),
++					 TREE_OPERAND (arg0, 0));
+ 	      else
+ 		low = TYPE_PRECISION (type) - 1;
+ 	    }
+diff -Naur gcc-4.4.0.orig/gcc/fortran/ChangeLog gcc-4.4.0/gcc/fortran/ChangeLog
+--- gcc-4.4.0.orig/gcc/fortran/ChangeLog	2009-04-21 01:44:29.000000000 -0700
++++ gcc-4.4.0/gcc/fortran/ChangeLog	2009-04-22 04:37:04.000000000 -0700
+@@ -1,3 +1,13 @@
++2009-04-22  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	Backport from mainline:
++	2009-03-30  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	* f95-lang.c (gfc_init_builtin_functions): Define BUILT_IN_HUGE_VAL
++	family of intrinsics instead of BUILT_IN_INF family.
++	* trans-intrinsics.c (gfc_conv_intrinsic_nearest): Use
++	BUILT_IN_HUGE_VAL instead of BUILT_IN_INF.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/gcc/fortran/f95-lang.c gcc-4.4.0/gcc/fortran/f95-lang.c
+--- gcc-4.4.0.orig/gcc/fortran/f95-lang.c	2008-10-07 11:15:32.000000000 -0700
++++ gcc-4.4.0/gcc/fortran/f95-lang.c	2009-04-22 04:37:04.000000000 -0700
+@@ -917,12 +917,12 @@
+   gfc_define_builtin ("__builtin_fmodf", mfunc_float[1], 
+ 		      BUILT_IN_FMODF, "fmodf", true);
+ 
+-  gfc_define_builtin ("__builtin_infl", mfunc_longdouble[3], 
+-		      BUILT_IN_INFL, "__builtin_infl", true);
+-  gfc_define_builtin ("__builtin_inf", mfunc_double[3], 
+-		      BUILT_IN_INF, "__builtin_inf", true);
+-  gfc_define_builtin ("__builtin_inff", mfunc_float[3], 
+-		      BUILT_IN_INFF, "__builtin_inff", true);
++  gfc_define_builtin ("__builtin_huge_vall", mfunc_longdouble[3], 
++		      BUILT_IN_HUGE_VALL, "__builtin_huge_vall", true);
++  gfc_define_builtin ("__builtin_huge_val", mfunc_double[3], 
++		      BUILT_IN_HUGE_VAL, "__builtin_huge_val", true);
++  gfc_define_builtin ("__builtin_huge_valf", mfunc_float[3], 
++		      BUILT_IN_HUGE_VALF, "__builtin_huge_valf", true);
+ 
+   /* lround{f,,l} and llround{f,,l} */
+   type = tree_cons (NULL_TREE, float_type_node, void_list_node);
+diff -Naur gcc-4.4.0.orig/gcc/fortran/trans-intrinsic.c gcc-4.4.0/gcc/fortran/trans-intrinsic.c
+--- gcc-4.4.0.orig/gcc/fortran/trans-intrinsic.c	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/fortran/trans-intrinsic.c	2009-04-22 04:37:04.000000000 -0700
+@@ -3129,32 +3129,32 @@
+ 
+ 
+ /* NEAREST (s, dir) is translated into
+-     tmp = copysign (INF, dir);
++     tmp = copysign (HUGE_VAL, dir);
+      return nextafter (s, tmp);
+  */
+ static void
+ gfc_conv_intrinsic_nearest (gfc_se * se, gfc_expr * expr)
+ {
+   tree args[2], type, tmp;
+-  int nextafter, copysign, inf;
++  int nextafter, copysign, huge_val;
+ 
+   switch (expr->ts.kind)
+     {
+       case 4:
+ 	nextafter = BUILT_IN_NEXTAFTERF;
+ 	copysign = BUILT_IN_COPYSIGNF;
+-	inf = BUILT_IN_INFF;
++	huge_val = BUILT_IN_HUGE_VALF;
+ 	break;
+       case 8:
+ 	nextafter = BUILT_IN_NEXTAFTER;
+ 	copysign = BUILT_IN_COPYSIGN;
+-	inf = BUILT_IN_INF;
++	huge_val = BUILT_IN_HUGE_VAL;
+ 	break;
+       case 10:
+       case 16:
+ 	nextafter = BUILT_IN_NEXTAFTERL;
+ 	copysign = BUILT_IN_COPYSIGNL;
+-	inf = BUILT_IN_INFL;
++	huge_val = BUILT_IN_HUGE_VALL;
+ 	break;
+       default:
+ 	gcc_unreachable ();
+@@ -3163,7 +3163,7 @@
+   type = gfc_typenode_for_spec (&expr->ts);
+   gfc_conv_intrinsic_function_args (se, expr, args, 2);
+   tmp = build_call_expr (built_in_decls[copysign], 2,
+-			 build_call_expr (built_in_decls[inf], 0),
++			 build_call_expr (built_in_decls[huge_val], 0),
+ 			 fold_convert (type, args[1]));
+   se->expr = build_call_expr (built_in_decls[nextafter], 2,
+ 			      fold_convert (type, args[0]), tmp);
+diff -Naur gcc-4.4.0.orig/gcc/fwprop.c gcc-4.4.0/gcc/fwprop.c
+--- gcc-4.4.0.orig/gcc/fwprop.c	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/fwprop.c	2009-04-26 11:58:04.000000000 -0700
+@@ -1,5 +1,5 @@
+ /* RTL-based forward propagation pass for GNU compiler.
+-   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++   Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+    Contributed by Paolo Bonzini and Steven Bosscher.
+ 
+ This file is part of GCC.
+@@ -852,6 +852,80 @@
+     return false;
+ }
+ 
++/* Try to replace USE with SRC (defined in DEF_INSN) in __asm.  */
++
++static bool
++forward_propagate_asm (df_ref use, rtx def_insn, rtx def_set, rtx reg)
++{
++  rtx use_insn = DF_REF_INSN (use), src, use_pat, asm_operands, new_rtx, *loc;
++  int speed_p, i;
++  df_ref *use_vec;
++
++  gcc_assert ((DF_REF_FLAGS (use) & DF_REF_IN_NOTE) == 0);
++
++  src = SET_SRC (def_set);
++  use_pat = PATTERN (use_insn);
++
++  /* In __asm don't replace if src might need more registers than
++     reg, as that could increase register pressure on the __asm.  */
++  use_vec = DF_INSN_USES (def_insn);
++  if (use_vec[0] && use_vec[1])
++    return false;
++
++  speed_p = optimize_bb_for_speed_p (BLOCK_FOR_INSN (use_insn));
++  asm_operands = NULL_RTX;
++  switch (GET_CODE (use_pat))
++    {
++    case ASM_OPERANDS:
++      asm_operands = use_pat;
++      break;
++    case SET:
++      if (MEM_P (SET_DEST (use_pat)))
++	{
++	  loc = &SET_DEST (use_pat);
++	  new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p);
++	  if (new_rtx)
++	    validate_unshare_change (use_insn, loc, new_rtx, true);
++	}
++      asm_operands = SET_SRC (use_pat);
++      break;
++    case PARALLEL:
++      for (i = 0; i < XVECLEN (use_pat, 0); i++)
++	if (GET_CODE (XVECEXP (use_pat, 0, i)) == SET)
++	  {
++	    if (MEM_P (SET_DEST (XVECEXP (use_pat, 0, i))))
++	      {
++		loc = &SET_DEST (XVECEXP (use_pat, 0, i));
++		new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg,
++					 src, speed_p);
++		if (new_rtx)
++		  validate_unshare_change (use_insn, loc, new_rtx, true);
++	      }
++	    asm_operands = SET_SRC (XVECEXP (use_pat, 0, i));
++	  }
++	else if (GET_CODE (XVECEXP (use_pat, 0, i)) == ASM_OPERANDS)
++	  asm_operands = XVECEXP (use_pat, 0, i);
++      break;
++    default:
++      gcc_unreachable ();
++    }
++
++  gcc_assert (asm_operands && GET_CODE (asm_operands) == ASM_OPERANDS);
++  for (i = 0; i < ASM_OPERANDS_INPUT_LENGTH (asm_operands); i++)
++    {
++      loc = &ASM_OPERANDS_INPUT (asm_operands, i);
++      new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p);
++      if (new_rtx)
++	validate_unshare_change (use_insn, loc, new_rtx, true);
++    }
++
++  if (num_changes_pending () == 0 || !apply_change_group ())
++    return false;
++
++  num_changes++;
++  return true;
++}
++
+ /* Try to replace USE with SRC (defined in DEF_INSN) and simplify the
+    result.  */
+ 
+@@ -863,12 +937,16 @@
+   rtx src, reg, new_rtx, *loc;
+   bool set_reg_equal;
+   enum machine_mode mode;
++  int asm_use = -1;
++
++  if (INSN_CODE (use_insn) < 0)
++    asm_use = asm_noperands (PATTERN (use_insn));
+ 
+-  if (!use_set)
++  if (!use_set && asm_use < 0)
+     return false;
+ 
+   /* Do not propagate into PC, CC0, etc.  */
+-  if (GET_MODE (SET_DEST (use_set)) == VOIDmode)
++  if (use_set && GET_MODE (SET_DEST (use_set)) == VOIDmode)
+     return false;
+ 
+   /* If def and use are subreg, check if they match.  */
+@@ -900,7 +978,7 @@
+   if (MEM_P (src) && MEM_READONLY_P (src))
+     {
+       rtx x = avoid_constant_pool_reference (src);
+-      if (x != src)
++      if (x != src && use_set)
+ 	{
+           rtx note = find_reg_note (use_insn, REG_EQUAL, NULL_RTX);
+ 	  rtx old_rtx = note ? XEXP (note, 0) : SET_SRC (use_set);
+@@ -911,6 +989,9 @@
+       return false;
+     }
+ 
++  if (asm_use >= 0)
++    return forward_propagate_asm (use, def_insn, def_set, reg);
++
+   /* Else try simplifying.  */
+ 
+   if (DF_REF_TYPE (use) == DF_REF_REG_MEM_STORE)
+diff -Naur gcc-4.4.0.orig/gcc/gcse.c gcc-4.4.0/gcc/gcse.c
+--- gcc-4.4.0.orig/gcc/gcse.c	2008-08-29 03:35:57.000000000 -0700
++++ gcc-4.4.0/gcc/gcse.c	2009-04-27 04:55:13.000000000 -0700
+@@ -1,7 +1,7 @@
+ /* Global common subexpression elimination/Partial redundancy elimination
+    and global constant/copy propagation for GNU compiler.
+    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+-   2006, 2007, 2008 Free Software Foundation, Inc.
++   2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ 
+ This file is part of GCC.
+ 
+@@ -2516,7 +2516,7 @@
+ 		    dest_addr = XEXP (list_entry, 0);
+ 
+ 		    if (canon_true_dependence (dest, GET_MODE (dest), dest_addr,
+-					       x, rtx_addr_varies_p))
++					       x, NULL_RTX, rtx_addr_varies_p))
+ 		      {
+ 			if (set_p)
+ 			  SET_BIT (bmap[bb_index], indx);
+diff -Naur gcc-4.4.0.orig/gcc/ira-color.c gcc-4.4.0/gcc/ira-color.c
+--- gcc-4.4.0.orig/gcc/ira-color.c	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/ira-color.c	2009-04-22 13:16:13.000000000 -0700
+@@ -285,8 +285,8 @@
+ 	    continue;
+ 
+ 	  cost = (cp->second == allocno
+-		  ? ira_register_move_cost[mode][rclass][cover_class]
+-		  : ira_register_move_cost[mode][cover_class][rclass]);
++		  ? ira_get_register_move_cost (mode, rclass, cover_class)
++		  : ira_get_register_move_cost (mode, cover_class, rclass));
+ 	  if (decr_p)
+ 	    cost = -cost;
+ 
+@@ -1069,7 +1069,7 @@
+ 	      * ira_loop_edge_freq (loop_node, regno, true)
+ 	      + ira_memory_move_cost[mode][rclass][0]
+ 	      * ira_loop_edge_freq (loop_node, regno, false))
+-	     - (ira_register_move_cost[mode][rclass][rclass]
++	     - (ira_get_register_move_cost (mode, rclass, rclass)
+ 		* (ira_loop_edge_freq (loop_node, regno, false)
+ 		   + ira_loop_edge_freq (loop_node, regno, true))));
+   return cost;
+@@ -2037,7 +2037,7 @@
+ 	  else
+ 	    {
+ 	      cover_class = ALLOCNO_COVER_CLASS (subloop_allocno);
+-	      cost = (ira_register_move_cost[mode][rclass][rclass] 
++	      cost = (ira_get_register_move_cost (mode, rclass, rclass)
+ 		      * (exit_freq + enter_freq));
+ 	      ira_allocate_and_set_or_copy_costs
+ 		(&ALLOCNO_UPDATED_HARD_REG_COSTS (subloop_allocno), cover_class,
+@@ -2162,7 +2162,7 @@
+ 		    += (ira_memory_move_cost[mode][rclass][0] * exit_freq
+ 			+ ira_memory_move_cost[mode][rclass][1] * enter_freq);
+ 		  if (hard_regno2 != hard_regno)
+-		    cost -= (ira_register_move_cost[mode][rclass][rclass]
++		    cost -= (ira_get_register_move_cost (mode, rclass, rclass)
+ 			     * (exit_freq + enter_freq));
+ 		}
+ 	    }
+@@ -2181,7 +2181,7 @@
+ 		    += (ira_memory_move_cost[mode][rclass][1] * exit_freq
+ 			+ ira_memory_move_cost[mode][rclass][0] * enter_freq);
+ 		  if (hard_regno2 != hard_regno)
+-		    cost -= (ira_register_move_cost[mode][rclass][rclass]
++		    cost -= (ira_get_register_move_cost (mode, rclass, rclass)
+ 			     * (exit_freq + enter_freq));
+ 		}
+ 	    }
+@@ -2247,8 +2247,8 @@
+       if (i < 0)
+ 	continue;
+       cost = (cp->first == a
+-	      ? ira_register_move_cost[mode][rclass][cover_class]
+-	      : ira_register_move_cost[mode][cover_class][rclass]);
++	      ? ira_get_register_move_cost (mode, rclass, cover_class)
++	      : ira_get_register_move_cost (mode, cover_class, rclass));
+       ira_allocate_and_set_or_copy_costs
+ 	(&ALLOCNO_UPDATED_HARD_REG_COSTS (a),
+ 	 cover_class, ALLOCNO_COVER_CLASS_COST (a),
+diff -Naur gcc-4.4.0.orig/gcc/ira-conflicts.c gcc-4.4.0/gcc/ira-conflicts.c
+--- gcc-4.4.0.orig/gcc/ira-conflicts.c	2009-03-12 07:39:55.000000000 -0700
++++ gcc-4.4.0/gcc/ira-conflicts.c	2009-04-22 13:16:13.000000000 -0700
+@@ -411,9 +411,9 @@
+     /* Can not be tied.  It is not in the cover class.  */
+     return false;
+   if (HARD_REGISTER_P (reg1))
+-    cost = ira_register_move_cost[mode][cover_class][rclass] * freq;
++    cost = ira_get_register_move_cost (mode, cover_class, rclass) * freq;
+   else
+-    cost = ira_register_move_cost[mode][rclass][cover_class] * freq;
++    cost = ira_get_register_move_cost (mode, rclass, cover_class) * freq;
+   for (;;)
+     {
+       ira_allocate_and_set_costs
+diff -Naur gcc-4.4.0.orig/gcc/ira-costs.c gcc-4.4.0/gcc/ira-costs.c
+--- gcc-4.4.0.orig/gcc/ira-costs.c	2008-12-18 05:49:47.000000000 -0800
++++ gcc-4.4.0/gcc/ira-costs.c	2009-04-22 13:16:13.000000000 -0700
+@@ -138,9 +138,6 @@
+   sri.extra_cost = 0;
+   secondary_class = targetm.secondary_reload (to_p, x, rclass, mode, &sri);
+ 
+-  if (ira_register_move_cost[mode] == NULL)
+-    ira_init_register_move_cost (mode);
+-
+   if (secondary_class != NO_REGS)
+     {
+       if (!move_cost[mode])
+@@ -294,19 +291,17 @@
+ 		     needs to do a copy, which is one insn.  */
+ 		  struct costs *pp = this_op_costs[i];
+ 
+-		  if (ira_register_move_cost[mode] == NULL)
+-		    ira_init_register_move_cost (mode);
+-
+ 		  for (k = 0; k < cost_classes_num; k++)
+ 		    {
+ 		      rclass = cost_classes[k];
+ 		      pp->cost[k]
+-			= ((recog_data.operand_type[i] != OP_OUT
+-			    ? ira_may_move_in_cost[mode][rclass]
+-			      [classes[i]] * frequency : 0)
+-			   + (recog_data.operand_type[i] != OP_IN
+-			      ? ira_may_move_out_cost[mode][classes[i]]
+-			        [rclass] * frequency : 0));
++			= (((recog_data.operand_type[i] != OP_OUT
++			     ? ira_get_may_move_cost (mode, rclass,
++						      classes[i], true) : 0)
++			    + (recog_data.operand_type[i] != OP_IN
++			       ? ira_get_may_move_cost (mode, classes[i],
++							rclass, false) : 0))
++			   * frequency);
+ 		    }
+ 
+ 		  /* If the alternative actually allows memory, make
+@@ -342,8 +337,9 @@
+ 				 : 0));
+ 		      else if (ira_reg_class_intersect
+ 			       [pref_class][classes[i]] == NO_REGS)
+-			alt_cost += (ira_register_move_cost
+-				     [mode][pref_class][classes[i]]);
++			alt_cost += ira_get_register_move_cost (mode,
++								pref_class,
++								classes[i]);
+ 		    }
+ 		  if (REGNO (ops[i]) != REGNO (ops[j])
+ 		      && ! find_reg_note (insn, REG_DEAD, op))
+@@ -540,19 +536,17 @@
+ 		{
+ 		  struct costs *pp = this_op_costs[i];
+ 
+-		  if (ira_register_move_cost[mode] == NULL)
+-		    ira_init_register_move_cost (mode);
+-
+ 		  for (k = 0; k < cost_classes_num; k++)
+ 		    {
+ 		      rclass = cost_classes[k];
+ 		      pp->cost[k]
+-			= ((recog_data.operand_type[i] != OP_OUT
+-			    ? ira_may_move_in_cost[mode][rclass]
+-			      [classes[i]] * frequency : 0)
+-			   + (recog_data.operand_type[i] != OP_IN
+-			      ? ira_may_move_out_cost[mode][classes[i]]
+-			        [rclass] * frequency : 0));
++			= (((recog_data.operand_type[i] != OP_OUT
++			     ? ira_get_may_move_cost (mode, rclass,
++						      classes[i], true) : 0)
++			    + (recog_data.operand_type[i] != OP_IN
++			       ? ira_get_may_move_cost (mode, classes[i],
++							rclass, false) : 0))
++			   * frequency);
+ 		    }
+ 
+ 		  /* If the alternative actually allows memory, make
+@@ -587,8 +581,9 @@
+ 				 : 0));
+ 		      else if (ira_reg_class_intersect[pref_class][classes[i]]
+ 			       == NO_REGS)
+-			alt_cost += (ira_register_move_cost
+-				     [mode][pref_class][classes[i]]);
++			alt_cost += ira_get_register_move_cost (mode,
++								pref_class,
++								classes[i]);
+ 		    }
+ 		}
+ 	    }
+@@ -901,13 +896,11 @@
+ 			       ALLOCNO_NUM (ira_curr_regno_allocno_map
+ 					    [REGNO (x)]));
+ 	pp->mem_cost += (ira_memory_move_cost[Pmode][rclass][1] * scale) / 2;
+-	if (ira_register_move_cost[Pmode] == NULL)
+-	  ira_init_register_move_cost (Pmode);
+ 	for (k = 0; k < cost_classes_num; k++)
+ 	  {
+ 	    i = cost_classes[k];
+ 	    pp->cost[k]
+-	      += (ira_may_move_in_cost[Pmode][i][rclass] * scale) / 2;
++	      += (ira_get_may_move_cost (Pmode, i, rclass, true) * scale) / 2;
+ 	  }
+       }
+       break;
+@@ -1425,8 +1418,9 @@
+ 	continue;
+       mode = ALLOCNO_MODE (a);
+       hard_reg_class = REGNO_REG_CLASS (hard_regno);
+-      cost = (to_p ? ira_register_move_cost[mode][hard_reg_class][rclass]
+-	      : ira_register_move_cost[mode][rclass][hard_reg_class]) * freq;
++      cost
++	= (to_p ? ira_get_register_move_cost (mode, hard_reg_class, rclass)
++	   : ira_get_register_move_cost (mode, rclass, hard_reg_class)) * freq;
+       ira_allocate_and_set_costs (&ALLOCNO_HARD_REG_COSTS (a), rclass,
+ 				  ALLOCNO_COVER_CLASS_COST (a));
+       ira_allocate_and_set_costs (&ALLOCNO_CONFLICT_HARD_REG_COSTS (a),
+@@ -1579,9 +1573,6 @@
+ void
+ ira_costs (void)
+ {
+-  ira_allocno_t a;
+-  ira_allocno_iterator ai;
+-
+   allocno_costs = (struct costs *) ira_allocate (max_struct_costs_size
+ 					       * ira_allocnos_num);
+   total_costs = (struct costs *) ira_allocate (max_struct_costs_size
+@@ -1594,12 +1585,6 @@
+ 				       * max_reg_num ());
+   find_allocno_class_costs ();
+   setup_allocno_cover_class_and_costs ();
+-  /* Because we could process operands only as subregs, check mode of
+-     the registers themselves too.  */
+-  FOR_EACH_ALLOCNO (a, ai)
+-    if (ira_register_move_cost[ALLOCNO_MODE (a)] == NULL
+-	&& have_regs_of_mode[ALLOCNO_MODE (a)])
+-      ira_init_register_move_cost (ALLOCNO_MODE (a));
+   ira_free (common_classes);
+   ira_free (allocno_pref_buffer);
+   ira_free (total_costs);
+diff -Naur gcc-4.4.0.orig/gcc/ira-emit.c gcc-4.4.0/gcc/ira-emit.c
+--- gcc-4.4.0.orig/gcc/ira-emit.c	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/ira-emit.c	2009-04-22 13:16:13.000000000 -0700
+@@ -812,7 +812,8 @@
+ 	}
+       else
+ 	{
+-	  cost = ira_register_move_cost[mode][cover_class][cover_class] * freq;
++	  cost = (ira_get_register_move_cost (mode, cover_class, cover_class)
++		  * freq);
+ 	  ira_shuffle_cost += cost;
+ 	}
+       ira_overall_cost += cost;
+diff -Naur gcc-4.4.0.orig/gcc/ira-int.h gcc-4.4.0/gcc/ira-int.h
+--- gcc-4.4.0.orig/gcc/ira-int.h	2009-03-18 10:04:26.000000000 -0700
++++ gcc-4.4.0/gcc/ira-int.h	2009-04-22 13:16:13.000000000 -0700
+@@ -730,21 +730,24 @@
+ extern HARD_REG_SET ira_reg_mode_hard_regset
+                     [FIRST_PSEUDO_REGISTER][NUM_MACHINE_MODES];
+ 
+-/* Arrays analogous to macros MEMORY_MOVE_COST and
+-   REGISTER_MOVE_COST.  */
++/* Arrays analogous to macros MEMORY_MOVE_COST and REGISTER_MOVE_COST.
++   Don't use ira_register_move_cost directly.  Use function of
++   ira_get_may_move_cost instead.  */
+ extern short ira_memory_move_cost[MAX_MACHINE_MODE][N_REG_CLASSES][2];
+ extern move_table *ira_register_move_cost[MAX_MACHINE_MODE];
+ 
+ /* Similar to may_move_in_cost but it is calculated in IRA instead of
+    regclass.  Another difference we take only available hard registers
+    into account to figure out that one register class is a subset of
+-   the another one.  */
++   the another one.  Don't use it directly.  Use function of
++   ira_get_may_move_cost instead.  */
+ extern move_table *ira_may_move_in_cost[MAX_MACHINE_MODE];
+ 
+ /* Similar to may_move_out_cost but it is calculated in IRA instead of
+    regclass.  Another difference we take only available hard registers
+    into account to figure out that one register class is a subset of
+-   the another one.  */
++   the another one.  Don't use it directly.  Use function of
++   ira_get_may_move_cost instead.  */
+ extern move_table *ira_may_move_out_cost[MAX_MACHINE_MODE];
+ 
+ /* Register class subset relation: TRUE if the first class is a subset
+@@ -941,6 +944,34 @@
+ 
+ 
+
+ 
++/* Return cost of moving value of MODE from register of class FROM to
++   register of class TO.  */
++static inline int
++ira_get_register_move_cost (enum machine_mode mode,
++			    enum reg_class from, enum reg_class to)
++{
++  if (ira_register_move_cost[mode] == NULL)
++    ira_init_register_move_cost (mode);
++  return ira_register_move_cost[mode][from][to];
++}
++
++/* Return cost of moving value of MODE from register of class FROM to
++   register of class TO.  Return zero if IN_P is true and FROM is
++   subset of TO or if IN_P is false and FROM is superset of TO.  */
++static inline int
++ira_get_may_move_cost (enum machine_mode mode,
++		       enum reg_class from, enum reg_class to,
++		       bool in_p)
++{
++  if (ira_register_move_cost[mode] == NULL)
++    ira_init_register_move_cost (mode);
++  return (in_p
++	  ? ira_may_move_in_cost[mode][from][to]
++	  : ira_may_move_out_cost[mode][from][to]);
++}
++
++
+
++
+ /* The iterator for all allocnos.  */
+ typedef struct {
+   /* The number of the current element in IRA_ALLOCNOS.  */
+diff -Naur gcc-4.4.0.orig/gcc/ira-lives.c gcc-4.4.0/gcc/ira-lives.c
+--- gcc-4.4.0.orig/gcc/ira-lives.c	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/ira-lives.c	2009-04-22 13:16:13.000000000 -0700
+@@ -782,10 +782,11 @@
+ 		  [ira_class_hard_regs[cl][0]]) >= 0
+ 	      && reg_class_size[cl] <= (unsigned) CLASS_MAX_NREGS (cl, mode))
+ 	    {
+-	      /* ??? FREQ */
+-	      cost = freq * (in_p
+-			     ? ira_register_move_cost[mode][cover_class][cl]
+-			     : ira_register_move_cost[mode][cl][cover_class]);
++	      cost
++		= (freq
++		   * (in_p
++		      ? ira_get_register_move_cost (mode, cover_class, cl)
++		      : ira_get_register_move_cost (mode, cl, cover_class)));
+ 	      ira_allocate_and_set_costs
+ 		(&ALLOCNO_CONFLICT_HARD_REG_COSTS (operand_a), cover_class, 0);
+ 	      ALLOCNO_CONFLICT_HARD_REG_COSTS (operand_a)
+diff -Naur gcc-4.4.0.orig/gcc/po/ChangeLog gcc-4.4.0/gcc/po/ChangeLog
+--- gcc-4.4.0.orig/gcc/po/ChangeLog	2009-04-21 01:44:44.000000000 -0700
++++ gcc-4.4.0/gcc/po/ChangeLog	2009-04-22 09:34:22.000000000 -0700
+@@ -1,3 +1,12 @@
++2009-04-22  Joseph Myers  <joseph@codesourcery.com>
++
++	* gcc.pot: Regenerate.
++
++2009-04-22  Joseph Myers  <joseph@codesourcery.com>
++
++	* exgettext: Also look for */*/config-lang.in to find language
++	subdirectories.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/gcc/po/exgettext gcc-4.4.0/gcc/po/exgettext
+--- gcc-4.4.0.orig/gcc/po/exgettext	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/po/exgettext	2009-04-22 09:30:26.000000000 -0700
+@@ -83,7 +83,7 @@
+ echo "scanning for keywords and %e strings..." >&2
+ 
+ ( cd $srcdir
+-  lang_subdirs=`echo */config-lang.in | sed -e 's|config-lang\.in||g'`
++  lang_subdirs=`echo */config-lang.in */*/config-lang.in | sed -e 's|config-lang\.in||g'`
+   { for dir in "" config/ config/*/ $lang_subdirs
+     do  for glob in '*.c' '*.h' '*.def'
+         do  eval echo $dir$glob
+diff -Naur gcc-4.4.0.orig/gcc/po/gcc.pot gcc-4.4.0/gcc/po/gcc.pot
+--- gcc-4.4.0.orig/gcc/po/gcc.pot	2009-03-28 00:27:17.000000000 -0700
++++ gcc-4.4.0/gcc/po/gcc.pot	2009-04-22 09:34:22.000000000 -0700
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
+-"POT-Creation-Date: 2009-03-28 07:24+0000\n"
++"POT-Creation-Date: 2009-04-22 16:32+0000\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+@@ -286,49 +286,49 @@
+ msgid "<command-line>"
+ msgstr ""
+ 
+-#: c-typeck.c:2491 c-typeck.c:4961 c-typeck.c:4964 c-typeck.c:4972
+-#: c-typeck.c:5002 c-typeck.c:6388
++#: c-typeck.c:2491 c-typeck.c:4965 c-typeck.c:4968 c-typeck.c:4976
++#: c-typeck.c:5006 c-typeck.c:6392
+ msgid "initializer element is not constant"
+ msgstr ""
+ 
+-#: c-typeck.c:4751
++#: c-typeck.c:4755
+ msgid "array initialized from parenthesized string constant"
+ msgstr ""
+ 
+-#: c-typeck.c:4813 cp/typeck2.c:757
++#: c-typeck.c:4817 cp/typeck2.c:757
+ #, gcc-internal-format
+ msgid "char-array initialized from wide string"
+ msgstr ""
+ 
+-#: c-typeck.c:4821
++#: c-typeck.c:4825
+ msgid "wide character array initialized from non-wide string"
+ msgstr ""
+ 
+-#: c-typeck.c:4827
++#: c-typeck.c:4831
+ msgid "wide character array initialized from incompatible wide string"
+ msgstr ""
+ 
+-#: c-typeck.c:4845 cp/typeck2.c:785
++#: c-typeck.c:4849 cp/typeck2.c:785
+ #, gcc-internal-format
+ msgid "initializer-string for array of chars is too long"
+ msgstr ""
+ 
+-#: c-typeck.c:4851
++#: c-typeck.c:4855
+ msgid "array of inappropriate type initialized from string constant"
+ msgstr ""
+ 
+ #. ??? This should not be an error when inlining calls to
+ #. unprototyped functions.
+-#: c-typeck.c:4918 c-typeck.c:4421 cp/typeck.c:1645
++#: c-typeck.c:4922 c-typeck.c:4425 cp/typeck.c:1645
+ #, gcc-internal-format
+ msgid "invalid use of non-lvalue array"
+ msgstr ""
+ 
+-#: c-typeck.c:4944
++#: c-typeck.c:4948
+ msgid "array initialized from non-constant array expression"
+ msgstr ""
+ 
+-#: c-typeck.c:5009 c-typeck.c:6393
++#: c-typeck.c:5013 c-typeck.c:6397
+ #, gcc-internal-format
+ msgid "initializer element is not computable at load time"
+ msgstr ""
+@@ -337,108 +337,108 @@
+ #. of VLAs themselves count as VLAs, it does not make
+ #. sense to permit them to be initialized given that
+ #. ordinary VLAs may not be initialized.
+-#: c-typeck.c:5020 c-decl.c:3224 c-decl.c:3239
++#: c-typeck.c:5024 c-decl.c:3224 c-decl.c:3239
+ #, gcc-internal-format
+ msgid "variable-sized object may not be initialized"
+ msgstr ""
+ 
+-#: c-typeck.c:5024
++#: c-typeck.c:5028
+ msgid "invalid initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5498
++#: c-typeck.c:5502
+ msgid "extra brace group at end of initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5518
++#: c-typeck.c:5522
+ msgid "missing braces around initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5579
++#: c-typeck.c:5583
+ msgid "braces around scalar initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5636
++#: c-typeck.c:5640
+ msgid "initialization of flexible array member in a nested context"
+ msgstr ""
+ 
+-#: c-typeck.c:5639
++#: c-typeck.c:5643
+ msgid "initialization of a flexible array member"
+ msgstr ""
+ 
+-#: c-typeck.c:5667
++#: c-typeck.c:5671
+ msgid "missing initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5689
++#: c-typeck.c:5693
+ msgid "empty scalar initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5694
++#: c-typeck.c:5698
+ msgid "extra elements in scalar initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5791 c-typeck.c:5851
++#: c-typeck.c:5795 c-typeck.c:5855
+ msgid "array index in non-array initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5796 c-typeck.c:5904
++#: c-typeck.c:5800 c-typeck.c:5908
+ msgid "field name not in record or union initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5842
++#: c-typeck.c:5846
+ msgid "array index in initializer not of integer type"
+ msgstr ""
+ 
+-#: c-typeck.c:5847 c-typeck.c:5849
++#: c-typeck.c:5851 c-typeck.c:5853
+ msgid "nonconstant array index in initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5853 c-typeck.c:5856
++#: c-typeck.c:5857 c-typeck.c:5860
+ msgid "array index in initializer exceeds array bounds"
+ msgstr ""
+ 
+-#: c-typeck.c:5867
++#: c-typeck.c:5871
+ msgid "empty index range in initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:5876
++#: c-typeck.c:5880
+ msgid "array index range in initializer exceeds array bounds"
+ msgstr ""
+ 
+-#: c-typeck.c:5958 c-typeck.c:5984 c-typeck.c:6460
++#: c-typeck.c:5962 c-typeck.c:5988 c-typeck.c:6464
+ msgid "initialized field with side-effects overwritten"
+ msgstr ""
+ 
+-#: c-typeck.c:5960 c-typeck.c:5986 c-typeck.c:6462
++#: c-typeck.c:5964 c-typeck.c:5990 c-typeck.c:6466
+ msgid "initialized field overwritten"
+ msgstr ""
+ 
+-#: c-typeck.c:6676
++#: c-typeck.c:6680
+ msgid "excess elements in char array initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:6683 c-typeck.c:6730
++#: c-typeck.c:6687 c-typeck.c:6734
+ msgid "excess elements in struct initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:6745
++#: c-typeck.c:6749
+ msgid "non-static initialization of a flexible array member"
+ msgstr ""
+ 
+-#: c-typeck.c:6814
++#: c-typeck.c:6818
+ msgid "excess elements in union initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:6902
++#: c-typeck.c:6906
+ msgid "excess elements in array initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:6933
++#: c-typeck.c:6937
+ msgid "excess elements in vector initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:6958
++#: c-typeck.c:6962
+ msgid "excess elements in scalar initializer"
+ msgstr ""
+ 
+@@ -708,13 +708,13 @@
+ #. handle them.
+ #. We can't handle floating point constants;
+ #. PRINT_OPERAND must handle them.
+-#: final.c:3493 vmsdbgout.c:487 config/i386/i386.c:10138
++#: final.c:3493 vmsdbgout.c:487 config/i386/i386.c:10175
+ #: config/pdp11/pdp11.c:1710
+ #, c-format
+ msgid "floating constant misused"
+ msgstr ""
+ 
+-#: final.c:3555 vmsdbgout.c:544 config/i386/i386.c:10225
++#: final.c:3555 vmsdbgout.c:544 config/i386/i386.c:10262
+ #: config/pdp11/pdp11.c:1757
+ #, c-format
+ msgid "invalid expression as operand"
+@@ -1811,82 +1811,82 @@
+ msgid "This switch lacks documentation"
+ msgstr ""
+ 
+-#: opts.c:1306
++#: opts.c:1268
+ msgid "[enabled]"
+ msgstr ""
+ 
+-#: opts.c:1306
++#: opts.c:1268
+ msgid "[disabled]"
+ msgstr ""
+ 
+-#: opts.c:1321
++#: opts.c:1283
+ #, c-format
+ msgid " No options with the desired characteristics were found\n"
+ msgstr ""
+ 
+-#: opts.c:1330
++#: opts.c:1292
+ #, c-format
+ msgid ""
+ " None found.  Use --help=%s to show *all* the options supported by the %s "
+ "front-end\n"
+ msgstr ""
+ 
+-#: opts.c:1336
++#: opts.c:1298
+ #, c-format
+ msgid ""
+ " All options with the desired characteristics have already been displayed\n"
+ msgstr ""
+ 
+-#: opts.c:1390
++#: opts.c:1352
+ msgid "The following options are target specific"
+ msgstr ""
+ 
+-#: opts.c:1393
++#: opts.c:1355
+ msgid "The following options control compiler warning messages"
+ msgstr ""
+ 
+-#: opts.c:1396
++#: opts.c:1358
+ msgid "The following options control optimizations"
+ msgstr ""
+ 
+-#: opts.c:1399 opts.c:1438
++#: opts.c:1361 opts.c:1400
+ msgid "The following options are language-independent"
+ msgstr ""
+ 
+-#: opts.c:1402
++#: opts.c:1364
+ msgid "The --param option recognizes the following as parameters"
+ msgstr ""
+ 
+-#: opts.c:1408
++#: opts.c:1370
+ msgid "The following options are specific to just the language "
+ msgstr ""
+ 
+-#: opts.c:1410
++#: opts.c:1372
+ msgid "The following options are supported by the language "
+ msgstr ""
+ 
+-#: opts.c:1421
++#: opts.c:1383
+ msgid "The following options are not documented"
+ msgstr ""
+ 
+-#: opts.c:1423
++#: opts.c:1385
+ msgid "The following options take separate arguments"
+ msgstr ""
+ 
+-#: opts.c:1425
++#: opts.c:1387
+ msgid "The following options take joined arguments"
+ msgstr ""
+ 
+-#: opts.c:1436
++#: opts.c:1398
+ msgid "The following options are language-related"
+ msgstr ""
+ 
+-#: opts.c:1596
++#: opts.c:1558
+ #, c-format
+ msgid "warning: --help argument %.*s is ambiguous, please be more specific\n"
+ msgstr ""
+ 
+-#: opts.c:1604
++#: opts.c:1566
+ #, c-format
+ msgid "warning: unrecognized argument to --help= option: %.*s\n"
+ msgstr ""
+@@ -3078,47 +3078,47 @@
+ msgid "missing operand"
+ msgstr ""
+ 
+-#: config/avr/avr.c:1196
++#: config/avr/avr.c:1209
+ #, c-format
+ msgid "address operand requires constraint for X, Y, or Z register"
+ msgstr ""
+ 
+-#: config/avr/avr.c:1308
++#: config/avr/avr.c:1321
+ msgid "bad address, not (reg+disp):"
+ msgstr ""
+ 
+-#: config/avr/avr.c:1315
++#: config/avr/avr.c:1328
+ msgid "bad address, not post_inc or pre_dec:"
+ msgstr ""
+ 
+-#: config/avr/avr.c:1326
++#: config/avr/avr.c:1339
+ msgid "internal compiler error.  Bad address:"
+ msgstr ""
+ 
+-#: config/avr/avr.c:1339
++#: config/avr/avr.c:1352
+ msgid "internal compiler error.  Unknown mode:"
+ msgstr ""
+ 
+-#: config/avr/avr.c:1934 config/avr/avr.c:2622
++#: config/avr/avr.c:1947 config/avr/avr.c:2635
+ msgid "invalid insn:"
+ msgstr ""
+ 
+-#: config/avr/avr.c:1973 config/avr/avr.c:2059 config/avr/avr.c:2108
+-#: config/avr/avr.c:2136 config/avr/avr.c:2231 config/avr/avr.c:2400
+-#: config/avr/avr.c:2661 config/avr/avr.c:2773
++#: config/avr/avr.c:1986 config/avr/avr.c:2072 config/avr/avr.c:2121
++#: config/avr/avr.c:2149 config/avr/avr.c:2244 config/avr/avr.c:2413
++#: config/avr/avr.c:2674 config/avr/avr.c:2786
+ msgid "incorrect insn:"
+ msgstr ""
+ 
+-#: config/avr/avr.c:2155 config/avr/avr.c:2316 config/avr/avr.c:2471
+-#: config/avr/avr.c:2839
++#: config/avr/avr.c:2168 config/avr/avr.c:2329 config/avr/avr.c:2484
++#: config/avr/avr.c:2852
+ msgid "unknown move insn:"
+ msgstr ""
+ 
+-#: config/avr/avr.c:3069
++#: config/avr/avr.c:3082
+ msgid "bad shift insn:"
+ msgstr ""
+ 
+-#: config/avr/avr.c:3185 config/avr/avr.c:3605 config/avr/avr.c:3963
++#: config/avr/avr.c:3198 config/avr/avr.c:3618 config/avr/avr.c:3976
+ msgid "internal compiler error.  Incorrect shift:"
+ msgstr ""
+ 
+@@ -3132,7 +3132,7 @@
+ msgid "invalid const_double operand"
+ msgstr ""
+ 
+-#: config/cris/cris.c:504 c-typeck.c:4700 c-typeck.c:4716 c-typeck.c:4733
++#: config/cris/cris.c:504 c-typeck.c:4704 c-typeck.c:4720 c-typeck.c:4737
+ #: final.c:3000 final.c:3002 gcc.c:4828 loop-iv.c:2825 loop-iv.c:2834
+ #: rtl-error.c:105 toplev.c:601 tree-ssa-loop-niter.c:1882 cp/typeck.c:4720
+ #: java/expr.c:411
+@@ -3369,51 +3369,51 @@
+ msgid " (frv)"
+ msgstr ""
+ 
+-#: config/i386/i386.c:10219
++#: config/i386/i386.c:10256
+ #, c-format
+ msgid "invalid UNSPEC as operand"
+ msgstr ""
+ 
+-#: config/i386/i386.c:10944 config/i386/i386.c:10983 config/i386/i386.c:11157
++#: config/i386/i386.c:10981 config/i386/i386.c:11020 config/i386/i386.c:11194
+ #, c-format
+ msgid "operand is not a condition code, invalid operand code 'D'"
+ msgstr ""
+ 
+-#: config/i386/i386.c:11008
++#: config/i386/i386.c:11045
+ #, c-format
+ msgid ""
+ "operand is neither a constant nor a condition code, invalid operand code 'C'"
+ msgstr ""
+ 
+-#: config/i386/i386.c:11018
++#: config/i386/i386.c:11055
+ #, c-format
+ msgid ""
+ "operand is neither a constant nor a condition code, invalid operand code 'F'"
+ msgstr ""
+ 
+-#: config/i386/i386.c:11036
++#: config/i386/i386.c:11073
+ #, c-format
+ msgid ""
+ "operand is neither a constant nor a condition code, invalid operand code 'c'"
+ msgstr ""
+ 
+-#: config/i386/i386.c:11046
++#: config/i386/i386.c:11083
+ #, c-format
+ msgid ""
+ "operand is neither a constant nor a condition code, invalid operand code 'f'"
+ msgstr ""
+ 
+-#: config/i386/i386.c:11171
++#: config/i386/i386.c:11208
+ #, c-format
+ msgid "invalid operand code '%c'"
+ msgstr ""
+ 
+-#: config/i386/i386.c:11220
++#: config/i386/i386.c:11257
+ #, c-format
+ msgid "invalid constraints for operand"
+ msgstr ""
+ 
+-#: config/i386/i386.c:18908
++#: config/i386/i386.c:18945
+ msgid "unknown insn mode"
+ msgstr ""
+ 
+@@ -3439,15 +3439,15 @@
+ msgid "ia64_print_operand: unknown code"
+ msgstr ""
+ 
+-#: config/ia64/ia64.c:10473
++#: config/ia64/ia64.c:10485
+ msgid "invalid conversion from %<__fpreg%>"
+ msgstr ""
+ 
+-#: config/ia64/ia64.c:10476
++#: config/ia64/ia64.c:10488
+ msgid "invalid conversion to %<__fpreg%>"
+ msgstr ""
+ 
+-#: config/ia64/ia64.c:10489 config/ia64/ia64.c:10500
++#: config/ia64/ia64.c:10501 config/ia64/ia64.c:10512
+ msgid "invalid operation on %<__fpreg%>"
+ msgstr ""
+ 
+@@ -3860,11 +3860,11 @@
+ msgid "candidates are:"
+ msgstr ""
+ 
+-#: cp/call.c:6824
++#: cp/call.c:6885
+ msgid "candidate 1:"
+ msgstr ""
+ 
+-#: cp/call.c:6825
++#: cp/call.c:6886
+ msgid "candidate 2:"
+ msgstr ""
+ 
+@@ -5935,33 +5935,33 @@
+ "Extension: BOZ literal at %L used to initialize non-integer variable '%s'"
+ msgstr ""
+ 
+-#: fortran/expr.c:2956 fortran/resolve.c:6536
++#: fortran/expr.c:2956 fortran/resolve.c:6539
+ #, no-c-format
+ msgid ""
+ "Extension: BOZ literal at %L outside a DATA statement and outside INT/REAL/"
+ "DBLE/CMPLX"
+ msgstr ""
+ 
+-#: fortran/expr.c:2966 fortran/resolve.c:6546
++#: fortran/expr.c:2966 fortran/resolve.c:6549
+ #, no-c-format
+ msgid "BOZ literal at %L is bitwise transferred non-integer symbol '%s'"
+ msgstr ""
+ 
+-#: fortran/expr.c:2974 fortran/resolve.c:6555
++#: fortran/expr.c:2974 fortran/resolve.c:6558
+ #, no-c-format
+ msgid ""
+ "Arithmetic underflow of bit-wise transferred BOZ at %L. This check can be "
+ "disabled with the option -fno-range-check"
+ msgstr ""
+ 
+-#: fortran/expr.c:2978 fortran/resolve.c:6559
++#: fortran/expr.c:2978 fortran/resolve.c:6562
+ #, no-c-format
+ msgid ""
+ "Arithmetic overflow of bit-wise transferred BOZ at %L. This check can be "
+ "disabled with the option -fno-range-check"
+ msgstr ""
+ 
+-#: fortran/expr.c:2982 fortran/resolve.c:6563
++#: fortran/expr.c:2982 fortran/resolve.c:6566
+ #, no-c-format
+ msgid ""
+ "Arithmetic NaN of bit-wise transferred BOZ at %L. This check can be disabled "
+@@ -6192,12 +6192,12 @@
+ msgid "Second argument of defined assignment at %L must be INTENT(IN)"
+ msgstr ""
+ 
+-#: fortran/interface.c:662 fortran/resolve.c:10327
++#: fortran/interface.c:662 fortran/resolve.c:10330
+ #, no-c-format
+ msgid "First argument of operator interface at %L must be INTENT(IN)"
+ msgstr ""
+ 
+-#: fortran/interface.c:666 fortran/resolve.c:10339
++#: fortran/interface.c:666 fortran/resolve.c:10342
+ #, no-c-format
+ msgid "Second argument of operator interface at %L must be INTENT(IN)"
+ msgstr ""
+@@ -7106,7 +7106,7 @@
+ msgid "Block label is not appropriate for IF statement at %C"
+ msgstr ""
+ 
+-#: fortran/match.c:1570 fortran/primary.c:2881
++#: fortran/match.c:1570 fortran/primary.c:2888
+ #, no-c-format
+ msgid "Cannot assign to a named constant at %C"
+ msgstr ""
+@@ -7713,7 +7713,7 @@
+ msgid "Syntax error in !$OMP THREADPRIVATE list at %C"
+ msgstr ""
+ 
+-#: fortran/openmp.c:759 fortran/resolve.c:6445 fortran/resolve.c:6798
++#: fortran/openmp.c:759 fortran/resolve.c:6448 fortran/resolve.c:6801
+ #, no-c-format
+ msgid "IF clause at %L requires a scalar LOGICAL expression"
+ msgstr ""
+@@ -8226,166 +8226,166 @@
+ msgid "Fortran 2003:  CONTAINS block in derived type definition at %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:2046
++#: fortran/parse.c:2037
+ #, no-c-format
+ msgid "ENUM declaration at %C has no ENUMERATORS"
+ msgstr ""
+ 
+-#: fortran/parse.c:2140
++#: fortran/parse.c:2131
+ #, no-c-format
+ msgid "Unexpected %s statement in INTERFACE block at %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:2166
++#: fortran/parse.c:2157
+ #, no-c-format
+ msgid "SUBROUTINE at %C does not belong in a generic function interface"
+ msgstr ""
+ 
+-#: fortran/parse.c:2170
++#: fortran/parse.c:2161
+ #, no-c-format
+ msgid "FUNCTION at %C does not belong in a generic subroutine interface"
+ msgstr ""
+ 
+-#: fortran/parse.c:2180
++#: fortran/parse.c:2171
+ #, no-c-format
+ msgid ""
+ "Name '%s' of ABSTRACT INTERFACE at %C cannot be the same as an intrinsic type"
+ msgstr ""
+ 
+-#: fortran/parse.c:2211
++#: fortran/parse.c:2202
+ #, no-c-format
+ msgid "Unexpected %s statement at %C in INTERFACE body"
+ msgstr ""
+ 
+-#: fortran/parse.c:2225
++#: fortran/parse.c:2216
+ #, no-c-format
+ msgid ""
+ "INTERFACE procedure '%s' at %L has the same name as the enclosing procedure"
+ msgstr ""
+ 
+-#: fortran/parse.c:2411
++#: fortran/parse.c:2402
+ #, no-c-format
+ msgid "%s statement must appear in a MODULE"
+ msgstr ""
+ 
+-#: fortran/parse.c:2418
++#: fortran/parse.c:2409
+ #, no-c-format
+ msgid "%s statement at %C follows another accessibility specification"
+ msgstr ""
+ 
+-#: fortran/parse.c:2468
++#: fortran/parse.c:2459
+ #, no-c-format
+ msgid "Bad kind expression for function '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/parse.c:2472
++#: fortran/parse.c:2463
+ #, no-c-format
+ msgid "The type for function '%s' at %L is not accessible"
+ msgstr ""
+ 
+-#: fortran/parse.c:2530
++#: fortran/parse.c:2521
+ #, no-c-format
+ msgid "ELSEWHERE statement at %C follows previous unmasked ELSEWHERE"
+ msgstr ""
+ 
+-#: fortran/parse.c:2551
++#: fortran/parse.c:2542
+ #, no-c-format
+ msgid "Unexpected %s statement in WHERE block at %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:2610
++#: fortran/parse.c:2601
+ #, no-c-format
+ msgid "Unexpected %s statement in FORALL block at %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:2661
++#: fortran/parse.c:2652
+ #, no-c-format
+ msgid "ELSE IF statement at %C cannot follow ELSE statement at %L"
+ msgstr ""
+ 
+-#: fortran/parse.c:2679
++#: fortran/parse.c:2670
+ #, no-c-format
+ msgid "Duplicate ELSE statements at %L and %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:2740
++#: fortran/parse.c:2731
+ #, no-c-format
+ msgid "Expected a CASE or END SELECT statement following SELECT CASE at %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:2798
++#: fortran/parse.c:2789
+ #, no-c-format
+ msgid "Variable '%s' at %C cannot be redefined inside loop beginning at %L"
+ msgstr ""
+ 
+-#: fortran/parse.c:2832
++#: fortran/parse.c:2823
+ #, no-c-format
+ msgid "End of nonblock DO statement at %C is within another block"
+ msgstr ""
+ 
+-#: fortran/parse.c:2841
++#: fortran/parse.c:2832
+ #, no-c-format
+ msgid "End of nonblock DO statement at %C is interwoven with another DO loop"
+ msgstr ""
+ 
+-#: fortran/parse.c:2890
++#: fortran/parse.c:2881
+ #, no-c-format
+ msgid "Statement label in ENDDO at %C doesn't match DO label"
+ msgstr ""
+ 
+-#: fortran/parse.c:2906
++#: fortran/parse.c:2897
+ #, no-c-format
+ msgid "named block DO at %L requires matching ENDDO name"
+ msgstr ""
+ 
+-#: fortran/parse.c:3165
++#: fortran/parse.c:3156
+ #, no-c-format
+ msgid "Name after !$omp critical and !$omp end critical does not match at %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:3221
++#: fortran/parse.c:3212
+ #, no-c-format
+ msgid "%s statement at %C cannot terminate a non-block DO loop"
+ msgstr ""
+ 
+-#: fortran/parse.c:3408
++#: fortran/parse.c:3399
+ #, no-c-format
+ msgid "Contained procedure '%s' at %C is already ambiguous"
+ msgstr ""
+ 
+-#: fortran/parse.c:3458
++#: fortran/parse.c:3449
+ #, no-c-format
+ msgid "Unexpected %s statement in CONTAINS section at %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:3482
++#: fortran/parse.c:3473
+ #, no-c-format
+ msgid ""
+ "Fortran 2008: CONTAINS statement without FUNCTION or SUBROUTINE statement at "
+ "%C"
+ msgstr ""
+ 
+-#: fortran/parse.c:3553
++#: fortran/parse.c:3544
+ #, no-c-format
+ msgid "CONTAINS statement at %C is already in a contained program unit"
+ msgstr ""
+ 
+-#: fortran/parse.c:3602
++#: fortran/parse.c:3593
+ #, no-c-format
+ msgid "Global name '%s' at %L is already being used as a %s at %L"
+ msgstr ""
+ 
+-#: fortran/parse.c:3623
++#: fortran/parse.c:3614
+ #, no-c-format
+ msgid "Blank BLOCK DATA at %C conflicts with prior BLOCK DATA at %L"
+ msgstr ""
+ 
+-#: fortran/parse.c:3649
++#: fortran/parse.c:3640
+ #, no-c-format
+ msgid "Unexpected %s statement in BLOCK DATA at %C"
+ msgstr ""
+ 
+-#: fortran/parse.c:3692
++#: fortran/parse.c:3683
+ #, no-c-format
+ msgid "Unexpected %s statement in MODULE at %C"
+ msgstr ""
+@@ -8393,7 +8393,7 @@
+ #. If we see a duplicate main program, shut down.  If the second
+ #. instance is an implied main program, i.e. data decls or executable
+ #. statements, we're in for lots of errors.
+-#: fortran/parse.c:3875
++#: fortran/parse.c:3866
+ #, no-c-format
+ msgid "Two main PROGRAMs at %L and %C"
+ msgstr ""
+@@ -8546,138 +8546,138 @@
+ msgid "Syntax error in COMPLEX constant at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:1476
++#: fortran/primary.c:1483
+ #, no-c-format
+ msgid "Keyword '%s' at %C has already appeared in the current argument list"
+ msgstr ""
+ 
+-#: fortran/primary.c:1540
++#: fortran/primary.c:1547
+ #, no-c-format
+ msgid "Extension: argument list function at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:1607
++#: fortran/primary.c:1614
+ #, no-c-format
+ msgid "Expected alternate return label at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:1625
++#: fortran/primary.c:1632
+ #, no-c-format
+ msgid "Missing keyword name in actual argument list at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:1670
++#: fortran/primary.c:1677
+ #, no-c-format
+ msgid "Syntax error in argument list at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:1765
++#: fortran/primary.c:1772
+ #, no-c-format
+ msgid "Expected structure component name at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:1802
++#: fortran/primary.c:1809
+ #, no-c-format
+ msgid "Expected argument list at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2096
++#: fortran/primary.c:2103
+ #, no-c-format
+ msgid ""
+ "Fortran 2003: Structure constructor with missing optional arguments at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2104
++#: fortran/primary.c:2111
+ #, no-c-format
+ msgid ""
+ "No initializer for component '%s' given in the structure constructor at %C!"
+ msgstr ""
+ 
+-#: fortran/primary.c:2160
++#: fortran/primary.c:2167
+ #, no-c-format
+ msgid "Can't construct ABSTRACT type '%s' at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2188
++#: fortran/primary.c:2195
+ #, no-c-format
+ msgid "Fortran 2003: Structure constructor with named arguments at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2203
++#: fortran/primary.c:2210
+ #, no-c-format
+ msgid "Component initializer without name after component named %s at %C!"
+ msgstr ""
+ 
+-#: fortran/primary.c:2206
++#: fortran/primary.c:2213
+ #, no-c-format
+ msgid "Too many components in structure constructor at %C!"
+ msgstr ""
+ 
+-#: fortran/primary.c:2239
++#: fortran/primary.c:2246
+ #, no-c-format
+ msgid "Component '%s' is initialized twice in the structure constructor at %C!"
+ msgstr ""
+ 
+-#: fortran/primary.c:2295
++#: fortran/primary.c:2302
+ #, no-c-format
+ msgid ""
+ "component '%s' at %L has already been set by a parent derived type "
+ "constructor"
+ msgstr ""
+ 
+-#: fortran/primary.c:2318
++#: fortran/primary.c:2325
+ #, no-c-format
+ msgid "Syntax error in structure constructor at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2408
++#: fortran/primary.c:2415
+ #, no-c-format
+ msgid ""
+ "'%s' at %C is the name of a recursive function and so refers to the result "
+ "variable. Use an explicit RESULT variable for direct recursion (12.5.2.1)"
+ msgstr ""
+ 
+-#: fortran/primary.c:2529
++#: fortran/primary.c:2536
+ #, no-c-format
+ msgid "Unexpected use of subroutine name '%s' at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2560
++#: fortran/primary.c:2567
+ #, no-c-format
+ msgid "Statement function '%s' requires argument list at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2563
++#: fortran/primary.c:2570
+ #, no-c-format
+ msgid "Function '%s' requires an argument list at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2608
++#: fortran/primary.c:2615
+ #, no-c-format
+ msgid "Missing argument to '%s' at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2749
++#: fortran/primary.c:2756
+ #, no-c-format
+ msgid "Missing argument list in function '%s' at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2777
++#: fortran/primary.c:2784
+ #, no-c-format
+ msgid "Symbol at %C is not appropriate for an expression"
+ msgstr ""
+ 
+-#: fortran/primary.c:2845
++#: fortran/primary.c:2852
+ #, no-c-format
+ msgid "Assigning to PROTECTED variable at %C"
+ msgstr ""
+ 
+-#: fortran/primary.c:2879
++#: fortran/primary.c:2886
+ #, no-c-format
+ msgid "Named constant at %C in an EQUIVALENCE"
+ msgstr ""
+ 
+-#: fortran/primary.c:2914
++#: fortran/primary.c:2921
+ #, no-c-format
+ msgid "'%s' at %C is not a variable"
+ msgstr ""
+@@ -8713,7 +8713,7 @@
+ msgid "Dummy procedure at %L not allowed in ELEMENTAL procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:188 fortran/resolve.c:1277
++#: fortran/resolve.c:188 fortran/resolve.c:1280
+ #, no-c-format
+ msgid ""
+ "Unable to find a specific INTRINSIC procedure for the reference '%s' at %L"
+@@ -8850,136 +8850,136 @@
+ "Derived type variable '%s' in COMMON at %L may not have default initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:745
++#: fortran/resolve.c:748
+ #, no-c-format
+ msgid "COMMON block '%s' at %L is used as PARAMETER at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:749
++#: fortran/resolve.c:752
+ #, no-c-format
+ msgid "COMMON block '%s' at %L is also an intrinsic procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:753
++#: fortran/resolve.c:756
+ #, no-c-format
+ msgid "Fortran 2003: COMMON block '%s' at %L that is also a function result"
+ msgstr ""
+ 
+-#: fortran/resolve.c:758
++#: fortran/resolve.c:761
+ #, no-c-format
+ msgid "Fortran 2003: COMMON block '%s' at %L that is also a global procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:820
++#: fortran/resolve.c:823
+ #, no-c-format
+ msgid "Components of structure constructor '%s' at %L are PRIVATE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:842
++#: fortran/resolve.c:845
+ #, no-c-format
+ msgid ""
+ "The rank of the element in the derived type constructor at %L does not match "
+ "that of the component (%d/%d)"
+ msgstr ""
+ 
+-#: fortran/resolve.c:855
++#: fortran/resolve.c:858
+ #, no-c-format
+ msgid ""
+ "The element in the derived type constructor at %L, for pointer component '%"
+ "s', is %s but should be %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:868
++#: fortran/resolve.c:871
+ #, no-c-format
+ msgid ""
+ "The NULL in the derived type constructor at %L is being applied to component "
+ "'%s', which is neither a POINTER nor ALLOCATABLE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:882
++#: fortran/resolve.c:885
+ #, no-c-format
+ msgid ""
+ "The element in the derived type constructor at %L, for pointer component '%"
+ "s' should be a POINTER or a TARGET"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1003
++#: fortran/resolve.c:1006
+ #, no-c-format
+ msgid ""
+ "The upper bound in the last dimension must appear in the reference to the "
+ "assumed size array '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1065
++#: fortran/resolve.c:1068
+ #, no-c-format
+ msgid "'%s' at %L is ambiguous"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1069
++#: fortran/resolve.c:1072
+ #, no-c-format
+ msgid "GENERIC procedure '%s' is not allowed as an actual argument at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1148
++#: fortran/resolve.c:1151
+ #, no-c-format
+ msgid ""
+ "Non-RECURSIVE procedure '%s' at %L is possibly calling itself recursively.  "
+ "Declare it RECURSIVE or use -frecursive"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1181 fortran/resolve.c:6008 fortran/resolve.c:6763
++#: fortran/resolve.c:1184 fortran/resolve.c:6011 fortran/resolve.c:6766
+ #, no-c-format
+ msgid "Label %d referenced at %L is never defined"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1226
++#: fortran/resolve.c:1229
+ #, no-c-format
+ msgid "Statement function '%s' at %L is not allowed as an actual argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1234
++#: fortran/resolve.c:1237
+ #, no-c-format
+ msgid "Intrinsic '%s' at %L is not allowed as an actual argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1241
++#: fortran/resolve.c:1244
+ #, no-c-format
+ msgid "Internal procedure '%s' is not allowed as an actual argument at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1247
++#: fortran/resolve.c:1250
+ #, no-c-format
+ msgid ""
+ "ELEMENTAL non-INTRINSIC procedure '%s' is not allowed as an actual argument "
+ "at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1299
++#: fortran/resolve.c:1302
+ #, no-c-format
+ msgid "Symbol '%s' at %L is ambiguous"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1350
++#: fortran/resolve.c:1353
+ #, no-c-format
+ msgid "By-value argument at %L is not of numeric type"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1357
++#: fortran/resolve.c:1360
+ #, no-c-format
+ msgid "By-value argument at %L cannot be an array or an array section"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1371
++#: fortran/resolve.c:1374
+ #, no-c-format
+ msgid "By-value argument at %L is not allowed in this context"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1383
++#: fortran/resolve.c:1386
+ #, no-c-format
+ msgid "Passing internal procedure at %L by location not allowed"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1508
++#: fortran/resolve.c:1511
+ #, no-c-format
+ msgid ""
+ "'%s' at %L is an array and OPTIONAL; IF IT IS MISSING, it cannot be the "
+@@ -8987,572 +8987,572 @@
+ "argument with the same rank (12.4.1.5)"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1530
++#: fortran/resolve.c:1533
+ msgid "elemental procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1547
++#: fortran/resolve.c:1550
+ #, no-c-format
+ msgid ""
+ "Actual argument at %L for INTENT(%s) dummy '%s' of ELEMENTAL subroutine '%s' "
+ "is a scalar, but another actual argument is an array"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1684
++#: fortran/resolve.c:1687
+ #, no-c-format
+ msgid "There is no specific function for the generic '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1693
++#: fortran/resolve.c:1696
+ #, no-c-format
+ msgid ""
+ "Generic function '%s' at %L is not consistent with a specific intrinsic "
+ "interface"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1748
++#: fortran/resolve.c:1751
+ #, no-c-format
+ msgid ""
+ "Function '%s' at %L is INTRINSIC but is not compatible with an intrinsic"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1794
++#: fortran/resolve.c:1797
+ #, no-c-format
+ msgid "Unable to resolve the specific function '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:1850 fortran/resolve.c:10258
++#: fortran/resolve.c:1853 fortran/resolve.c:10261
+ #, no-c-format
+ msgid "Function '%s' at %L has no IMPLICIT type"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2059
++#: fortran/resolve.c:2062
+ #, no-c-format
+ msgid "Argument to '%s' at %L is not a variable"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2107
++#: fortran/resolve.c:2110
+ #, no-c-format
+ msgid "More actual than formal arguments in '%s' call at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2116
++#: fortran/resolve.c:2119
+ #, no-c-format
+ msgid ""
+ "Parameter '%s' to '%s' at %L must be either a TARGET or an associated pointer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2139
++#: fortran/resolve.c:2142
+ #, no-c-format
+ msgid ""
+ "Allocatable variable '%s' used as a parameter to '%s' at %L must not be an "
+ "array of zero size"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2156
++#: fortran/resolve.c:2159
+ #, no-c-format
+ msgid ""
+ "Assumed-shape array '%s' at %L cannot be an argument to the procedure '%s' "
+ "because it is not C interoperable"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2166
++#: fortran/resolve.c:2169
+ #, no-c-format
+ msgid ""
+ "Deferred-shape array '%s' at %L cannot be an argument to the procedure '%s' "
+ "because it is not C interoperable"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2189 fortran/resolve.c:2226
++#: fortran/resolve.c:2192 fortran/resolve.c:2229
+ #, no-c-format
+ msgid "CHARACTER argument '%s' to '%s' at %L must have a length of 1"
+ msgstr ""
+ 
+ #. Case 1c, section 15.1.2.5, J3/04-007: an associated
+ #. scalar pointer.
+-#: fortran/resolve.c:2202
++#: fortran/resolve.c:2205
+ #, no-c-format
+ msgid "Argument '%s' to '%s' at %L must be an associated scalar POINTER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2218
++#: fortran/resolve.c:2221
+ #, no-c-format
+ msgid "Parameter '%s' to '%s' at %L must be a scalar"
+ msgstr ""
+ 
+ #. TODO: Update this error message to allow for procedure
+ #. pointers once they are implemented.
+-#: fortran/resolve.c:2240
++#: fortran/resolve.c:2243
+ #, no-c-format
+ msgid "Parameter '%s' to '%s' at %L must be a procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2248
++#: fortran/resolve.c:2251
+ #, no-c-format
+ msgid "Parameter '%s' to '%s' at %L must be BIND(C)"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2294
++#: fortran/resolve.c:2297
+ #, no-c-format
+ msgid "Intrinsic subroutine '%s' used as a function at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2301
++#: fortran/resolve.c:2304
+ #, no-c-format
+ msgid "'%s' at %L is not a function"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2307
++#: fortran/resolve.c:2310
+ #, no-c-format
+ msgid "ABSTRACT INTERFACE '%s' must not be referenced at %L"
+ msgstr ""
+ 
+ #. Internal procedures are taken care of in resolve_contained_fntype.
+-#: fortran/resolve.c:2352
++#: fortran/resolve.c:2355
+ #, no-c-format
+ msgid ""
+ "Function '%s' is declared CHARACTER(*) and cannot be used at %L since it is "
+ "not a dummy argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2405
++#: fortran/resolve.c:2408
+ #, no-c-format
+ msgid ""
+ "User defined non-ELEMENTAL function '%s' at %L not allowed in WORKSHARE "
+ "construct"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2455
++#: fortran/resolve.c:2458
+ #, no-c-format
+ msgid "reference to non-PURE function '%s' at %L inside a FORALL %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2462
++#: fortran/resolve.c:2465
+ #, no-c-format
+ msgid ""
+ "Function reference to '%s' at %L is to a non-PURE procedure within a PURE "
+ "procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2478
++#: fortran/resolve.c:2481
+ #, no-c-format
+ msgid ""
+ "ENTRY '%s' at %L cannot be called recursively, as function '%s' is not "
+ "RECURSIVE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2482
++#: fortran/resolve.c:2485
+ #, no-c-format
+ msgid ""
+ "Function '%s' at %L cannot be called recursively, as it is not RECURSIVE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2529
++#: fortran/resolve.c:2532
+ #, no-c-format
+ msgid "Subroutine call to '%s' in FORALL block at %L is not PURE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2532
++#: fortran/resolve.c:2535
+ #, no-c-format
+ msgid "Subroutine call to '%s' at %L is not PURE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2595
++#: fortran/resolve.c:2598
+ #, no-c-format
+ msgid "There is no specific subroutine for the generic '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2604
++#: fortran/resolve.c:2607
+ #, no-c-format
+ msgid ""
+ "Generic subroutine '%s' at %L is not consistent with an intrinsic subroutine "
+ "interface"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2712
++#: fortran/resolve.c:2715
+ #, no-c-format
+ msgid "Missing SHAPE parameter for call to %s at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2720
++#: fortran/resolve.c:2723
+ #, no-c-format
+ msgid "SHAPE parameter for call to %s at %L must be a rank 1 INTEGER array"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2805
++#: fortran/resolve.c:2808
+ #, no-c-format
+ msgid ""
+ "Subroutine '%s' at %L is INTRINSIC but is not compatible with an intrinsic"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2849
++#: fortran/resolve.c:2852
+ #, no-c-format
+ msgid "Unable to resolve the specific subroutine '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2909
++#: fortran/resolve.c:2912
+ #, no-c-format
+ msgid "'%s' at %L has a type, which is not consistent with the CALL at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2942
++#: fortran/resolve.c:2945
+ #, no-c-format
+ msgid ""
+ "ENTRY '%s' at %L cannot be called recursively, as subroutine '%s' is not "
+ "RECURSIVE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:2946
++#: fortran/resolve.c:2949
+ #, no-c-format
+ msgid ""
+ "SUBROUTINE '%s' at %L cannot be called recursively, as it is not RECURSIVE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3020
++#: fortran/resolve.c:3023
+ #, no-c-format
+ msgid "Shapes for operands at %L and %L are not conformable"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3071
++#: fortran/resolve.c:3074
+ #, c-format
+ msgid "Invalid context for NULL() pointer at %%L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3087
++#: fortran/resolve.c:3090
+ #, c-format
+ msgid "Operand of unary numeric operator '%s' at %%L is %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3103
++#: fortran/resolve.c:3106
+ #, c-format
+ msgid "Operands of binary numeric operator '%s' at %%L are %s/%s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3118
++#: fortran/resolve.c:3121
+ #, c-format
+ msgid "Operands of string concatenation operator at %%L are %s/%s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3137
++#: fortran/resolve.c:3140
+ #, c-format
+ msgid "Operands of logical operator '%s' at %%L are %s/%s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3151
++#: fortran/resolve.c:3154
+ #, c-format
+ msgid "Operand of .not. operator at %%L is %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3165
++#: fortran/resolve.c:3168
+ msgid "COMPLEX quantities cannot be compared at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3194
++#: fortran/resolve.c:3197
+ #, c-format
+ msgid "Logicals at %%L must be compared with %s instead of %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3200
++#: fortran/resolve.c:3203
+ #, c-format
+ msgid "Operands of comparison operator '%s' at %%L are %s/%s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3208
++#: fortran/resolve.c:3211
+ #, c-format
+ msgid "Unknown operator '%s' at %%L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3210
++#: fortran/resolve.c:3213
+ #, c-format
+ msgid "Operand of user operator '%s' at %%L is %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3213
++#: fortran/resolve.c:3216
+ #, c-format
+ msgid "Operands of user operator '%s' at %%L are %s/%s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3299
++#: fortran/resolve.c:3302
+ #, c-format
+ msgid "Inconsistent ranks for operator at %%L and %%L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3496
++#: fortran/resolve.c:3499
+ #, no-c-format
+ msgid "Array reference at %L is out of bounds (%ld < %ld) in dimension %d"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3504
++#: fortran/resolve.c:3507
+ #, no-c-format
+ msgid "Array reference at %L is out of bounds (%ld > %ld) in dimension %d"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3523
++#: fortran/resolve.c:3526
+ #, no-c-format
+ msgid "Illegal stride of zero at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3540
++#: fortran/resolve.c:3543
+ #, no-c-format
+ msgid ""
+ "Lower array reference at %L is out of bounds (%ld < %ld) in dimension %d"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3548
++#: fortran/resolve.c:3551
+ #, no-c-format
+ msgid ""
+ "Lower array reference at %L is out of bounds (%ld > %ld) in dimension %d"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3564
++#: fortran/resolve.c:3567
+ #, no-c-format
+ msgid ""
+ "Upper array reference at %L is out of bounds (%ld < %ld) in dimension %d"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3573
++#: fortran/resolve.c:3576
+ #, no-c-format
+ msgid ""
+ "Upper array reference at %L is out of bounds (%ld > %ld) in dimension %d"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3612
++#: fortran/resolve.c:3615
+ #, no-c-format
+ msgid "Rightmost upper bound of assumed size array section not specified at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3622
++#: fortran/resolve.c:3625
+ #, no-c-format
+ msgid "Rank mismatch in array reference at %L (%d/%d)"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3650
++#: fortran/resolve.c:3653
+ #, no-c-format
+ msgid "Array index at %L must be scalar"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3656
++#: fortran/resolve.c:3659
+ #, no-c-format
+ msgid "Array index at %L must be of INTEGER type, found %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3662
++#: fortran/resolve.c:3665
+ #, no-c-format
+ msgid "Extension: REAL array index at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3692
++#: fortran/resolve.c:3695
+ #, no-c-format
+ msgid "Argument dim at %L must be scalar"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3699
++#: fortran/resolve.c:3702
+ #, no-c-format
+ msgid "Argument dim at %L must be of INTEGER type"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3820
++#: fortran/resolve.c:3823
+ #, no-c-format
+ msgid "Array index at %L is an array of rank %d"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3857
++#: fortran/resolve.c:3860
+ #, no-c-format
+ msgid "Substring start index at %L must be of type INTEGER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3864
++#: fortran/resolve.c:3867
+ #, no-c-format
+ msgid "Substring start index at %L must be scalar"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3873
++#: fortran/resolve.c:3876
+ #, no-c-format
+ msgid "Substring start index at %L is less than one"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3886
++#: fortran/resolve.c:3889
+ #, no-c-format
+ msgid "Substring end index at %L must be of type INTEGER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3893
++#: fortran/resolve.c:3896
+ #, no-c-format
+ msgid "Substring end index at %L must be scalar"
+ msgstr ""
+ 
+-#: fortran/resolve.c:3903
++#: fortran/resolve.c:3906
+ #, no-c-format
+ msgid "Substring end index at %L exceeds the string length"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4041
++#: fortran/resolve.c:4044
+ #, no-c-format
+ msgid ""
+ "Component to the right of a part reference with nonzero rank must not have "
+ "the POINTER attribute at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4048
++#: fortran/resolve.c:4051
+ #, no-c-format
+ msgid ""
+ "Component to the right of a part reference with nonzero rank must not have "
+ "the ALLOCATABLE attribute at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4067
++#: fortran/resolve.c:4070
+ #, no-c-format
+ msgid ""
+ "Two or more part references with nonzero rank must not be specified at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4246
++#: fortran/resolve.c:4249
+ #, no-c-format
+ msgid ""
+ "Variable '%s', used in a specification expression, is referenced at %L "
+ "before the ENTRY statement in which it is a parameter"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4251
++#: fortran/resolve.c:4254
+ #, no-c-format
+ msgid ""
+ "Variable '%s' is used at %L before the ENTRY statement in which it is a "
+ "parameter"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4535
++#: fortran/resolve.c:4538
+ #, no-c-format
+ msgid "Passed-object at %L must be scalar"
+ msgstr ""
+ 
+ #. Nothing matching found!
+-#: fortran/resolve.c:4645
++#: fortran/resolve.c:4648
+ #, no-c-format
+ msgid ""
+ "Found no matching specific binding for the call to the GENERIC '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4665
++#: fortran/resolve.c:4668
+ #, no-c-format
+ msgid "'%s' at %L should be a SUBROUTINE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4701
++#: fortran/resolve.c:4704
+ #, no-c-format
+ msgid "'%s' at %L should be a FUNCTION"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4837
++#: fortran/resolve.c:4840
+ #, no-c-format
+ msgid "%s at %L must be a scalar"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4847
++#: fortran/resolve.c:4850
+ #, no-c-format
+ msgid "Deleted feature: %s at %L must be integer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4851 fortran/resolve.c:4858
++#: fortran/resolve.c:4854 fortran/resolve.c:4861
+ #, no-c-format
+ msgid "%s at %L must be INTEGER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4878
++#: fortran/resolve.c:4881
+ #, no-c-format
+ msgid "Cannot assign to loop variable in PURE procedure at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4902
++#: fortran/resolve.c:4905
+ #, no-c-format
+ msgid "Step expression in DO loop at %L cannot be zero"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4978
++#: fortran/resolve.c:4981
+ #, no-c-format
+ msgid "FORALL index-name at %L must be a scalar INTEGER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4983
++#: fortran/resolve.c:4986
+ #, no-c-format
+ msgid "FORALL start expression at %L must be a scalar INTEGER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4990
++#: fortran/resolve.c:4993
+ #, no-c-format
+ msgid "FORALL end expression at %L must be a scalar INTEGER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:4998
++#: fortran/resolve.c:5001
+ #, no-c-format
+ msgid "FORALL stride expression at %L must be a scalar %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5003
++#: fortran/resolve.c:5006
+ #, no-c-format
+ msgid "FORALL stride expression at %L cannot be zero"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5019
++#: fortran/resolve.c:5022
+ #, no-c-format
+ msgid "FORALL index '%s' may not appear in triplet specification at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5099
++#: fortran/resolve.c:5102
+ #, no-c-format
+ msgid ""
+ "Expression in DEALLOCATE statement at %L must be ALLOCATABLE or a POINTER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5106
++#: fortran/resolve.c:5109
+ #, no-c-format
+ msgid "Cannot deallocate INTENT(IN) variable '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5210
++#: fortran/resolve.c:5213
+ #, no-c-format
+ msgid ""
+ "The STAT variable '%s' in an ALLOCATE statement must not be allocated in the "
+ "same statement at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5246
++#: fortran/resolve.c:5249
+ #, no-c-format
+ msgid "Expression in ALLOCATE statement at %L must be ALLOCATABLE or a POINTER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5254
++#: fortran/resolve.c:5257
+ #, no-c-format
+ msgid "Cannot allocate INTENT(IN) variable '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5278
++#: fortran/resolve.c:5281
+ #, no-c-format
+ msgid "Array specification required in ALLOCATE statement at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5308
++#: fortran/resolve.c:5311
+ #, no-c-format
+ msgid "Bad array specification in ALLOCATE statement at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5328
++#: fortran/resolve.c:5331
+ #, no-c-format
+ msgid ""
+ "'%s' must not appear in the array specification at %L in the same ALLOCATE "
+ "statement where it is itself allocated"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5351
++#: fortran/resolve.c:5354
+ #, no-c-format
+ msgid "STAT variable '%s' of %s statement at %C cannot be INTENT(IN)"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5355
++#: fortran/resolve.c:5358
+ #, no-c-format
+ msgid "Illegal STAT variable in %s statement at %C for a PURE procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5360
++#: fortran/resolve.c:5363
+ #, no-c-format
+ msgid "STAT tag in %s statement at %L must be of type INTEGER"
+ msgstr ""
+@@ -9561,99 +9561,99 @@
+ #. element in the list.  Either way, we must
+ #. issue an error and get the next case from P.
+ #. FIXME: Sort P and Q by line number.
+-#: fortran/resolve.c:5523
++#: fortran/resolve.c:5526
+ #, no-c-format
+ msgid "CASE label at %L overlaps with CASE label at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5574
++#: fortran/resolve.c:5577
+ #, no-c-format
+ msgid "Expression in CASE statement at %L must be of type %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5585
++#: fortran/resolve.c:5588
+ #, no-c-format
+ msgid "Expression in CASE statement at %L must be of kind %d"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5597
++#: fortran/resolve.c:5600
+ #, no-c-format
+ msgid "Expression in CASE statement at %L must be scalar"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5643
++#: fortran/resolve.c:5646
+ #, no-c-format
+ msgid ""
+ "Selection expression in computed GOTO statement at %L must be a scalar "
+ "integer expression"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5661
++#: fortran/resolve.c:5664
+ #, no-c-format
+ msgid "Argument of SELECT statement at %L cannot be %s"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5670
++#: fortran/resolve.c:5673
+ #, no-c-format
+ msgid "Argument of SELECT statement at %L must be a scalar expression"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5735
++#: fortran/resolve.c:5738
+ #, no-c-format
+ msgid ""
+ "The DEFAULT CASE at %L cannot be followed by a second DEFAULT CASE at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5761
++#: fortran/resolve.c:5764
+ #, no-c-format
+ msgid "Logical range in CASE statement at %L is not allowed"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5773
++#: fortran/resolve.c:5776
+ #, no-c-format
+ msgid "constant logical value in CASE statement is repeated at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5787
++#: fortran/resolve.c:5790
+ #, no-c-format
+ msgid "Range specification at %L can never be matched"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5890
++#: fortran/resolve.c:5893
+ #, no-c-format
+ msgid "Logical SELECT CASE block at %L has more that two cases"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5928
++#: fortran/resolve.c:5931
+ #, no-c-format
+ msgid "Data transfer element at %L cannot have POINTER components"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5935
++#: fortran/resolve.c:5938
+ #, no-c-format
+ msgid "Data transfer element at %L cannot have ALLOCATABLE components"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5942
++#: fortran/resolve.c:5945
+ #, no-c-format
+ msgid "Data transfer element at %L cannot have PRIVATE components"
+ msgstr ""
+ 
+-#: fortran/resolve.c:5951
++#: fortran/resolve.c:5954
+ #, no-c-format
+ msgid ""
+ "Data transfer element at %L cannot be a full reference to an assumed-size "
+ "array"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6015
++#: fortran/resolve.c:6018
+ #, no-c-format
+ msgid ""
+ "Statement at %L is not a valid branch target statement for the branch "
+ "statement at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6024
++#: fortran/resolve.c:6027
+ #, no-c-format
+ msgid "Branch at %L may result in an infinite loop"
+ msgstr ""
+@@ -9661,118 +9661,118 @@
+ #. The label is not in an enclosing block, so illegal.  This was
+ #. allowed in Fortran 66, so we allow it as extension.  No
+ #. further checks are necessary in this case.
+-#: fortran/resolve.c:6037
++#: fortran/resolve.c:6040
+ #, no-c-format
+ msgid "Label at %L is not in the same block as the GOTO statement at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6052 fortran/resolve.c:6066
++#: fortran/resolve.c:6055 fortran/resolve.c:6069
+ #, no-c-format
+ msgid "Deleted feature: GOTO at %L jumps to END of construct at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6143
++#: fortran/resolve.c:6146
+ #, no-c-format
+ msgid "WHERE mask at %L has inconsistent shape"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6159
++#: fortran/resolve.c:6162
+ #, no-c-format
+ msgid "WHERE assignment target at %L has inconsistent shape"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6167 fortran/resolve.c:6254
++#: fortran/resolve.c:6170 fortran/resolve.c:6257
+ #, no-c-format
+ msgid "Non-ELEMENTAL user-defined assignment in WHERE at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6177 fortran/resolve.c:6264
++#: fortran/resolve.c:6180 fortran/resolve.c:6267
+ #, no-c-format
+ msgid "Unsupported statement inside WHERE at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6208
++#: fortran/resolve.c:6211
+ #, no-c-format
+ msgid "Assignment to a FORALL index variable at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6217
++#: fortran/resolve.c:6220
+ #, no-c-format
+ msgid ""
+ "The FORALL with index '%s' is not used on the left side of the assignment at "
+ "%L and so might cause multiple assignment to this object"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6386
++#: fortran/resolve.c:6389
+ #, no-c-format
+ msgid "An outer FORALL construct already has an index with this name %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6453
++#: fortran/resolve.c:6456
+ #, no-c-format
+ msgid "WHERE/ELSEWHERE clause at %L requires a LOGICAL array"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6515
++#: fortran/resolve.c:6518
+ #, no-c-format
+ msgid "Subroutine '%s' called instead of assignment at %L must be PURE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6588
++#: fortran/resolve.c:6591
+ #, no-c-format
+ msgid "CHARACTER expression will be truncated in assignment (%d/%d) at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6613
++#: fortran/resolve.c:6616
+ #, no-c-format
+ msgid "Cannot assign to variable '%s' in PURE procedure at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6625
++#: fortran/resolve.c:6628
+ #, no-c-format
+ msgid ""
+ "The impure variable at %L is assigned to a derived type variable with a "
+ "POINTER component in a PURE procedure (12.6)"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6731
++#: fortran/resolve.c:6734
+ #, no-c-format
+ msgid "ASSIGNED GOTO statement at %L requires an INTEGER variable"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6734
++#: fortran/resolve.c:6737
+ #, no-c-format
+ msgid "Variable '%s' has not been assigned a target label at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6745
++#: fortran/resolve.c:6748
+ #, no-c-format
+ msgid ""
+ "Alternate RETURN statement at %L requires a SCALAR-INTEGER return specifier"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6771
++#: fortran/resolve.c:6774
+ #, no-c-format
+ msgid "ASSIGN statement at %L requires a scalar default INTEGER variable"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6786
++#: fortran/resolve.c:6789
+ #, no-c-format
+ msgid "Arithmetic IF statement at %L requires a numeric expression"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6832
++#: fortran/resolve.c:6835
+ #, no-c-format
+ msgid ""
+ "Exit condition of DO WHILE loop at %L must be a scalar LOGICAL expression"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6914
++#: fortran/resolve.c:6917
+ #, no-c-format
+ msgid "FORALL mask clause at %L requires a LOGICAL expression"
+ msgstr ""
+ 
+-#: fortran/resolve.c:6986 fortran/resolve.c:7042
++#: fortran/resolve.c:6989 fortran/resolve.c:7045
+ #, no-c-format
+ msgid ""
+ "Binding label '%s' for common block '%s' at %L collides with the global "
+@@ -9780,14 +9780,14 @@
+ msgstr ""
+ 
+ #. Common block names match but binding labels do not.
+-#: fortran/resolve.c:7007
++#: fortran/resolve.c:7010
+ #, no-c-format
+ msgid ""
+ "Binding label '%s' for common block '%s' at %L does not match the binding "
+ "label '%s' for common block '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7054
++#: fortran/resolve.c:7057
+ #, no-c-format
+ msgid ""
+ "Binding label '%s' for common block '%s' at %L collides with global entity '%"
+@@ -9795,57 +9795,57 @@
+ msgstr ""
+ 
+ #. Make sure global procedures don't collide with anything.
+-#: fortran/resolve.c:7106
++#: fortran/resolve.c:7109
+ #, no-c-format
+ msgid "Binding label '%s' at %L collides with the global entity '%s' at %L"
+ msgstr ""
+ 
+ #. Make sure procedures in interface bodies don't collide.
+-#: fortran/resolve.c:7119
++#: fortran/resolve.c:7122
+ #, no-c-format
+ msgid ""
+ "Binding label '%s' in interface body at %L collides with the global entity '%"
+ "s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7132
++#: fortran/resolve.c:7135
+ #, no-c-format
+ msgid "Binding label '%s' at %L collides with global entity '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7209
++#: fortran/resolve.c:7212
+ #, no-c-format
+ msgid "CHARACTER variable has zero length at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7496
++#: fortran/resolve.c:7499
+ #, no-c-format
+ msgid "Allocatable array '%s' at %L must have a deferred shape"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7499
++#: fortran/resolve.c:7502
+ #, no-c-format
+ msgid "Scalar object '%s' at %L may not be ALLOCATABLE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7506
++#: fortran/resolve.c:7509
+ #, no-c-format
+ msgid "Array pointer '%s' at %L must have a deferred shape"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7517
++#: fortran/resolve.c:7520
+ #, no-c-format
+ msgid "Array '%s' at %L cannot have a deferred shape"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7545
++#: fortran/resolve.c:7548
+ #, no-c-format
+ msgid ""
+ "The type '%s' cannot be host associated at %L because it is blocked by an "
+ "incompatible object of the same name declared at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7568
++#: fortran/resolve.c:7571
+ #, no-c-format
+ msgid ""
+ "Object '%s' at %L must have the SAVE attribute for default initialization of "
+@@ -9854,181 +9854,181 @@
+ 
+ #. The shape of a main program or module array needs to be
+ #. constant.
+-#: fortran/resolve.c:7615
++#: fortran/resolve.c:7618
+ #, no-c-format
+ msgid "The module or main program array '%s' at %L must have constant shape"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7628
++#: fortran/resolve.c:7631
+ #, no-c-format
+ msgid ""
+ "Entity with assumed character length at %L must be a dummy argument or a "
+ "PARAMETER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7647
++#: fortran/resolve.c:7650
+ #, no-c-format
+ msgid "'%s' at %L must have constant character length in this context"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7683
++#: fortran/resolve.c:7686
+ #, no-c-format
+ msgid "Allocatable '%s' at %L cannot have an initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7686
++#: fortran/resolve.c:7689
+ #, no-c-format
+ msgid "External '%s' at %L cannot have an initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7690
++#: fortran/resolve.c:7693
+ #, no-c-format
+ msgid "Dummy '%s' at %L cannot have an initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7693
++#: fortran/resolve.c:7696
+ #, no-c-format
+ msgid "Intrinsic '%s' at %L cannot have an initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7696
++#: fortran/resolve.c:7699
+ #, no-c-format
+ msgid "Function result '%s' at %L cannot have an initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7699
++#: fortran/resolve.c:7702
+ #, no-c-format
+ msgid "Automatic array '%s' at %L cannot have an initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7722
++#: fortran/resolve.c:7725
+ #, no-c-format
+ msgid "Although not referenced, '%s' at %L has ambiguous interfaces"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7741
++#: fortran/resolve.c:7744
+ #, no-c-format
+ msgid ""
+ "Character-valued statement function '%s' at %L must have constant length"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7749
++#: fortran/resolve.c:7752
+ #, no-c-format
+ msgid ""
+ "Automatic character length function '%s' at %L must have an explicit "
+ "interface"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7774
++#: fortran/resolve.c:7777
+ #, no-c-format
+ msgid ""
+ "Fortran 2003: '%s' is of a PRIVATE type and cannot be a dummy argument of '%"
+ "s', which is PUBLIC at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7797 fortran/resolve.c:7822
++#: fortran/resolve.c:7800 fortran/resolve.c:7825
+ #, no-c-format
+ msgid ""
+ "Fortran 2003: Procedure '%s' in PUBLIC interface '%s' at %L takes dummy "
+ "arguments of '%s' which is PRIVATE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7840
++#: fortran/resolve.c:7843
+ #, no-c-format
+ msgid "Function '%s' at %L cannot have an initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7849
++#: fortran/resolve.c:7852
+ #, no-c-format
+ msgid "External object '%s' at %L may not have an initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7857
++#: fortran/resolve.c:7860
+ #, no-c-format
+ msgid "ELEMENTAL function '%s' at %L must have a scalar result"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7878
++#: fortran/resolve.c:7881
+ #, no-c-format
+ msgid "CHARACTER(*) function '%s' at %L cannot be array-valued"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7882
++#: fortran/resolve.c:7885
+ #, no-c-format
+ msgid "CHARACTER(*) function '%s' at %L cannot be pointer-valued"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7886
++#: fortran/resolve.c:7889
+ #, no-c-format
+ msgid "CHARACTER(*) function '%s' at %L cannot be pure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7890
++#: fortran/resolve.c:7893
+ #, no-c-format
+ msgid "CHARACTER(*) function '%s' at %L cannot be recursive"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7899
++#: fortran/resolve.c:7902
+ #, no-c-format
+ msgid "CHARACTER(*) function '%s' at %L is obsolescent in fortran 95"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7952
++#: fortran/resolve.c:7955
+ #, no-c-format
+ msgid "PROCEDURE attribute conflicts with SAVE attribute in '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:7959
++#: fortran/resolve.c:7962
+ #, no-c-format
+ msgid "PROCEDURE attribute conflicts with INTENT attribute in '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8003
++#: fortran/resolve.c:8006
+ #, no-c-format
+ msgid "FINAL procedure '%s' at %L is not a SUBROUTINE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8011
++#: fortran/resolve.c:8014
+ #, no-c-format
+ msgid "FINAL procedure at %L must have exactly one argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8020
++#: fortran/resolve.c:8023
+ #, no-c-format
+ msgid "Argument of FINAL procedure at %L must be of type '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8028
++#: fortran/resolve.c:8031
+ #, no-c-format
+ msgid "Argument of FINAL procedure at %L must not be a POINTER"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8034
++#: fortran/resolve.c:8037
+ #, no-c-format
+ msgid "Argument of FINAL procedure at %L must not be ALLOCATABLE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8040
++#: fortran/resolve.c:8043
+ #, no-c-format
+ msgid "Argument of FINAL procedure at %L must not be OPTIONAL"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8048
++#: fortran/resolve.c:8051
+ #, no-c-format
+ msgid "Argument of FINAL procedure at %L must not be INTENT(OUT)"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8056
++#: fortran/resolve.c:8059
+ #, no-c-format
+ msgid "Non-scalar FINAL procedure at %L should have assumed shape argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8075
++#: fortran/resolve.c:8078
+ #, no-c-format
+ msgid "FINAL procedure '%s' declared at %L has the same rank (%d) as '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8108
++#: fortran/resolve.c:8111
+ #, no-c-format
+ msgid ""
+ "Only array FINAL procedures declared for derived type '%s' defined at %L, "
+@@ -10036,302 +10036,302 @@
+ msgstr ""
+ 
+ #. TODO:  Remove this error when finalization is finished.
+-#: fortran/resolve.c:8113
++#: fortran/resolve.c:8116
+ #, no-c-format
+ msgid "Finalization at %L is not yet implemented"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8139
++#: fortran/resolve.c:8142
+ #, no-c-format
+ msgid "Can't overwrite GENERIC '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8151
++#: fortran/resolve.c:8154
+ #, no-c-format
+ msgid "'%s' at %L overrides a procedure binding declared NON_OVERRIDABLE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8159
++#: fortran/resolve.c:8162
+ #, no-c-format
+ msgid "'%s' at %L overrides a PURE procedure and must also be PURE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8168
++#: fortran/resolve.c:8171
+ #, no-c-format
+ msgid "'%s' at %L overrides an ELEMENTAL procedure and must also be ELEMENTAL"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8174
++#: fortran/resolve.c:8177
+ #, no-c-format
+ msgid ""
+ "'%s' at %L overrides a non-ELEMENTAL procedure and must not be ELEMENTAL, "
+ "either"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8183
++#: fortran/resolve.c:8186
+ #, no-c-format
+ msgid "'%s' at %L overrides a SUBROUTINE and must also be a SUBROUTINE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8194
++#: fortran/resolve.c:8197
+ #, no-c-format
+ msgid "'%s' at %L overrides a FUNCTION and must also be a FUNCTION"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8205
++#: fortran/resolve.c:8208
+ #, no-c-format
+ msgid ""
+ "'%s' at %L and the overridden FUNCTION should have matching result types"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8216
++#: fortran/resolve.c:8219
+ #, no-c-format
+ msgid "'%s' at %L overrides a PUBLIC procedure and must not be PRIVATE"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8245
++#: fortran/resolve.c:8248
+ #, no-c-format
+ msgid ""
+ "Dummy argument '%s' of '%s' at %L should be named '%s' as to match the "
+ "corresponding argument of the overridden procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8258
++#: fortran/resolve.c:8261
+ #, no-c-format
+ msgid ""
+ "Types mismatch for dummy argument '%s' of '%s' %L in in respect to the "
+ "overridden procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8268
++#: fortran/resolve.c:8271
+ #, no-c-format
+ msgid ""
+ "'%s' at %L must have the same number of formal arguments as the overridden "
+ "procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8277
++#: fortran/resolve.c:8280
+ #, no-c-format
+ msgid "'%s' at %L overrides a NOPASS binding and must also be NOPASS"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8288
++#: fortran/resolve.c:8291
+ #, no-c-format
+ msgid "'%s' at %L overrides a binding with PASS and must also be PASS"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8295
++#: fortran/resolve.c:8298
+ #, no-c-format
+ msgid ""
+ "Passed-object dummy argument of '%s' at %L must be at the same position as "
+ "the passed-object dummy argument of the overridden procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8326
++#: fortran/resolve.c:8329
+ #, no-c-format
+ msgid "'%s' and '%s' can't be mixed FUNCTION/SUBROUTINE for GENERIC '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8335
++#: fortran/resolve.c:8338
+ #, no-c-format
+ msgid "'%s' and '%s' for GENERIC '%s' at %L are ambiguous"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8404
++#: fortran/resolve.c:8407
+ #, no-c-format
+ msgid "Undefined specific binding '%s' as target of GENERIC '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8416
++#: fortran/resolve.c:8419
+ #, no-c-format
+ msgid "GENERIC '%s' at %L must target a specific binding, '%s' is GENERIC, too"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8446
++#: fortran/resolve.c:8449
+ #, no-c-format
+ msgid "GENERIC '%s' at %L can't overwrite specific binding with the same name"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8504
++#: fortran/resolve.c:8507
+ #, no-c-format
+ msgid ""
+ "'%s' must be a module procedure or an external procedure with an explicit "
+ "interface at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8541
++#: fortran/resolve.c:8544
+ #, no-c-format
+ msgid "Procedure '%s' with PASS(%s) at %L has no argument '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8555
++#: fortran/resolve.c:8558
+ #, no-c-format
+ msgid "Procedure '%s' with PASS at %L must have at least one argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8567
++#: fortran/resolve.c:8570
+ #, no-c-format
+ msgid ""
+ "Argument '%s' of '%s' with PASS(%s) at %L must be of the derived-type '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8573
++#: fortran/resolve.c:8576
+ #, no-c-format
+ msgid ""
+ "Polymorphic entities are not yet implemented, non-polymorphic passed-object "
+ "dummy argument of '%s' at %L accepted"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8598
++#: fortran/resolve.c:8601
+ #, no-c-format
+ msgid "Procedure '%s' at %L has the same name as a component of '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8607
++#: fortran/resolve.c:8610
+ #, no-c-format
+ msgid ""
+ "Procedure '%s' at %L has the same name as an inherited component of '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8675
++#: fortran/resolve.c:8678
+ #, no-c-format
+ msgid "Non-extensible derived-type '%s' at %L must not be ABSTRACT"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8692
++#: fortran/resolve.c:8695
+ #, no-c-format
+ msgid ""
+ "Component '%s' of '%s' at %L has the same name as an inherited type-bound "
+ "procedure"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8704
++#: fortran/resolve.c:8707
+ #, no-c-format
+ msgid ""
+ "Character length of component '%s' needs to be a constant specification "
+ "expression at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8719
++#: fortran/resolve.c:8722
+ #, no-c-format
+ msgid ""
+ "The component '%s' is a PRIVATE type and cannot be a component of '%s', "
+ "which is PUBLIC at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8729
++#: fortran/resolve.c:8732
+ #, no-c-format
+ msgid ""
+ "Component %s of SEQUENCE type declared at %L does not have the SEQUENCE "
+ "attribute"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8740
++#: fortran/resolve.c:8743
+ #, no-c-format
+ msgid ""
+ "The pointer component '%s' of '%s' at %L is a type that has not been declared"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8768
++#: fortran/resolve.c:8771
+ #, no-c-format
+ msgid "Component '%s' of '%s' at %L must have constant array bounds"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8809
++#: fortran/resolve.c:8812
+ #, no-c-format
+ msgid ""
+ "NAMELIST object '%s' was declared PRIVATE and cannot be member of PUBLIC "
+ "namelist '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8819
++#: fortran/resolve.c:8822
+ #, no-c-format
+ msgid ""
+ "NAMELIST object '%s' has use-associated PRIVATE components and cannot be "
+ "member of namelist '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8832
++#: fortran/resolve.c:8835
+ #, no-c-format
+ msgid ""
+ "NAMELIST object '%s' has PRIVATE components and cannot be a member of PUBLIC "
+ "namelist '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8844
++#: fortran/resolve.c:8847
+ #, no-c-format
+ msgid ""
+ "NAMELIST array object '%s' must not have assumed shape in namelist '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8853
++#: fortran/resolve.c:8856
+ #, no-c-format
+ msgid ""
+ "NAMELIST array object '%s' must have constant shape in namelist '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8865
++#: fortran/resolve.c:8868
+ #, no-c-format
+ msgid ""
+ "NAMELIST object '%s' in namelist '%s' at %L cannot have ALLOCATABLE "
+ "components"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8873
++#: fortran/resolve.c:8876
+ #, no-c-format
+ msgid ""
+ "NAMELIST object '%s' in namelist '%s' at %L cannot have POINTER components"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8899
++#: fortran/resolve.c:8902
+ #, no-c-format
+ msgid "PROCEDURE attribute conflicts with NAMELIST attribute in '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8918
++#: fortran/resolve.c:8921
+ #, no-c-format
+ msgid "Parameter array '%s' at %L cannot be automatic or of deferred shape"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8929
++#: fortran/resolve.c:8932
+ #, no-c-format
+ msgid ""
+ "Implicitly typed PARAMETER '%s' at %L doesn't match a later IMPLICIT type"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8940
++#: fortran/resolve.c:8943
+ #, no-c-format
+ msgid "Incompatible derived type in PARAMETER at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:8999
++#: fortran/resolve.c:9002
+ #, no-c-format
+ msgid ""
+ "Interface '%s', used by procedure '%s' at %L, is declared in a later "
+ "PROCEDURE statement"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9047
++#: fortran/resolve.c:9050
+ #, no-c-format
+ msgid "Interface '%s' of procedure '%s' at %L must be explicit"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9080
++#: fortran/resolve.c:9083
+ #, no-c-format
+ msgid "Type specified for intrinsic function '%s' at %L is ignored"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9087
++#: fortran/resolve.c:9090
+ #, no-c-format
+ msgid "Intrinsic subroutine '%s' at %L shall not have a type specifier"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9094
++#: fortran/resolve.c:9097
+ #, no-c-format
+ msgid "'%s' declared INTRINSIC at %L does not exist"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9103
++#: fortran/resolve.c:9106
+ #, no-c-format
+ msgid ""
+ "The intrinsic '%s' declared INTRINSIC at %L is not available in the current "
+@@ -10339,229 +10339,229 @@
+ "intrinsics in order to use it."
+ msgstr ""
+ 
+-#: fortran/resolve.c:9147
++#: fortran/resolve.c:9150
+ #, no-c-format
+ msgid "Assumed size array at %L must be a dummy argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9150
++#: fortran/resolve.c:9153
+ #, no-c-format
+ msgid "Assumed shape array at %L must be a dummy argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9162
++#: fortran/resolve.c:9165
+ #, no-c-format
+ msgid "Symbol at %L is not a DUMMY variable"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9168
++#: fortran/resolve.c:9171
+ #, no-c-format
+ msgid ""
+ "'%s' at %L cannot have the VALUE attribute because it is not a dummy argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9178
++#: fortran/resolve.c:9181
+ #, no-c-format
+ msgid ""
+ "Character dummy variable '%s' at %L with VALUE attribute must have constant "
+ "length"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9187
++#: fortran/resolve.c:9190
+ #, no-c-format
+ msgid ""
+ "C interoperable character dummy variable '%s' at %L with VALUE attribute "
+ "must have length one"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9213
++#: fortran/resolve.c:9216
+ #, no-c-format
+ msgid ""
+ "Variable '%s' at %L cannot be BIND(C) because it is neither a COMMON block "
+ "nor declared at the module level scope"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9266
++#: fortran/resolve.c:9269
+ #, no-c-format
+ msgid "The derived type '%s' at %L is of type '%s', which has not been defined"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9307
++#: fortran/resolve.c:9310
+ #, no-c-format
+ msgid "Fortran 2003: PUBLIC %s '%s' at %L of PRIVATE derived type '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9326
++#: fortran/resolve.c:9329
+ #, no-c-format
+ msgid ""
+ "The INTENT(OUT) dummy argument '%s' at %L is ASSUMED SIZE and so cannot have "
+ "a default initializer"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9385
++#: fortran/resolve.c:9388
+ #, no-c-format
+ msgid "Threadprivate at %L isn't SAVEd"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9470
++#: fortran/resolve.c:9473
+ #, no-c-format
+ msgid "BLOCK DATA element '%s' at %L must be in COMMON"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9476
++#: fortran/resolve.c:9479
+ #, no-c-format
+ msgid "DATA array '%s' at %L must be specified in a previous declaration"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9521
++#: fortran/resolve.c:9524
+ #, no-c-format
+ msgid "Nonconstant array section at %L in DATA statement"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9534
++#: fortran/resolve.c:9537
+ #, no-c-format
+ msgid "DATA statement at %L has more variables than values"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9628
++#: fortran/resolve.c:9631
+ #, no-c-format
+ msgid "iterator start at %L does not simplify"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9635
++#: fortran/resolve.c:9638
+ #, no-c-format
+ msgid "iterator end at %L does not simplify"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9642
++#: fortran/resolve.c:9645
+ #, no-c-format
+ msgid "iterator step at %L does not simplify"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9768
++#: fortran/resolve.c:9771
+ #, no-c-format
+ msgid "DATA statement at %L has more values than variables"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9859
++#: fortran/resolve.c:9862
+ #, no-c-format
+ msgid "Label %d at %L defined but not used"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9864
++#: fortran/resolve.c:9867
+ #, no-c-format
+ msgid "Label %d at %L defined but cannot be used"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9949
++#: fortran/resolve.c:9952
+ #, no-c-format
+ msgid ""
+ "Derived type variable '%s' at %L must have SEQUENCE attribute to be an "
+ "EQUIVALENCE object"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9958
++#: fortran/resolve.c:9961
+ #, no-c-format
+ msgid ""
+ "Derived type variable '%s' at %L cannot have ALLOCATABLE components to be an "
+ "EQUIVALENCE object"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9966
++#: fortran/resolve.c:9969
+ #, no-c-format
+ msgid ""
+ "Derived type variable '%s' at %L with default initialization cannot be in "
+ "EQUIVALENCE with a variable in COMMON"
+ msgstr ""
+ 
+-#: fortran/resolve.c:9983
++#: fortran/resolve.c:9986
+ #, no-c-format
+ msgid ""
+ "Derived type variable '%s' at %L with pointer component(s) cannot be an "
+ "EQUIVALENCE object"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10088
++#: fortran/resolve.c:10091
+ #, no-c-format
+ msgid "Syntax error in EQUIVALENCE statement at %L"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10103
++#: fortran/resolve.c:10106
+ #, no-c-format
+ msgid ""
+ "Either all or none of the objects in the EQUIVALENCE set at %L shall have "
+ "the PROTECTED attribute"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10115
++#: fortran/resolve.c:10118
+ #, no-c-format
+ msgid ""
+ "Common block member '%s' at %L cannot be an EQUIVALENCE object in the pure "
+ "procedure '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10124
++#: fortran/resolve.c:10127
+ #, no-c-format
+ msgid "Named constant '%s' at %L cannot be an EQUIVALENCE object"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10203
++#: fortran/resolve.c:10206
+ #, no-c-format
+ msgid ""
+ "Array '%s' at %L with non-constant bounds cannot be an EQUIVALENCE object"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10214
++#: fortran/resolve.c:10217
+ #, no-c-format
+ msgid "Structure component '%s' at %L cannot be an EQUIVALENCE object"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10225
++#: fortran/resolve.c:10228
+ #, no-c-format
+ msgid "Substring at %L has length zero"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10269
++#: fortran/resolve.c:10272
+ #, no-c-format
+ msgid "Fortran 2003: PUBLIC function '%s' at %L of PRIVATE type '%s'"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10282
++#: fortran/resolve.c:10285
+ #, no-c-format
+ msgid "ENTRY '%s' at %L has no IMPLICIT type"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10308
++#: fortran/resolve.c:10311
+ #, no-c-format
+ msgid "User operator procedure '%s' at %L must be a FUNCTION"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10315
++#: fortran/resolve.c:10318
+ #, no-c-format
+ msgid "User operator procedure '%s' at %L cannot be assumed character length"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10321
++#: fortran/resolve.c:10324
+ #, no-c-format
+ msgid "User operator procedure '%s' at %L must have at least one argument"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10331
++#: fortran/resolve.c:10334
+ #, no-c-format
+ msgid "First argument of operator interface at %L cannot be optional"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10343
++#: fortran/resolve.c:10346
+ #, no-c-format
+ msgid "Second argument of operator interface at %L cannot be optional"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10347
++#: fortran/resolve.c:10350
+ #, no-c-format
+ msgid "Operator interface at %L must have, at most, two arguments"
+ msgstr ""
+ 
+-#: fortran/resolve.c:10401
++#: fortran/resolve.c:10404
+ #, no-c-format
+ msgid "Contained procedure '%s' at %L of a PURE procedure must also be PURE"
+ msgstr ""
+@@ -11367,32 +11367,32 @@
+ msgid "Assigning value other than 0 or 1 to LOGICAL has undefined result at %L"
+ msgstr ""
+ 
+-#: fortran/trans-decl.c:2868 fortran/trans-decl.c:3906
++#: fortran/trans-decl.c:2870 fortran/trans-decl.c:3908
+ #, no-c-format
+ msgid "Return value of function '%s' at %L not set"
+ msgstr ""
+ 
+-#: fortran/trans-decl.c:3527
++#: fortran/trans-decl.c:3529
+ #, no-c-format
+ msgid "Dummy argument '%s' at %L was declared INTENT(OUT) but was not set"
+ msgstr ""
+ 
+-#: fortran/trans-decl.c:3531
++#: fortran/trans-decl.c:3533
+ #, no-c-format
+ msgid "Unused dummy argument '%s' at %L"
+ msgstr ""
+ 
+-#: fortran/trans-decl.c:3537
++#: fortran/trans-decl.c:3539
+ #, no-c-format
+ msgid "Unused variable '%s' declared at %L"
+ msgstr ""
+ 
+-#: fortran/trans-decl.c:3583
++#: fortran/trans-decl.c:3585
+ #, no-c-format
+ msgid "Unused parameter '%s' declared at %L"
+ msgstr ""
+ 
+-#: fortran/trans-decl.c:3597
++#: fortran/trans-decl.c:3599
+ #, no-c-format
+ msgid "Return value '%s' of function '%s' declared at %L not set"
+ msgstr ""
+@@ -11662,7 +11662,7 @@
+ msgid "GCC does not support -C or -CC without -E"
+ msgstr ""
+ 
+-#: gcc.c:828 java/jvspec.c:80
++#: gcc.c:828 java/jvspec.c:80 ada/gcc-interface/lang-specs.h:33
+ msgid "-pg and -fomit-frame-pointer are incompatible"
+ msgstr ""
+ 
+@@ -11670,46 +11670,50 @@
+ msgid "-E or -x required when input is from standard input"
+ msgstr ""
+ 
+-#: config/darwin.h:270
++#: config/darwin.h:274
+ msgid "-current_version only allowed with -dynamiclib"
+ msgstr ""
+ 
+-#: config/darwin.h:272
++#: config/darwin.h:276
+ msgid "-install_name only allowed with -dynamiclib"
+ msgstr ""
+ 
+-#: config/darwin.h:277
++#: config/darwin.h:281
+ msgid "-bundle not allowed with -dynamiclib"
+ msgstr ""
+ 
+-#: config/darwin.h:278
++#: config/darwin.h:282
+ msgid "-bundle_loader not allowed with -dynamiclib"
+ msgstr ""
+ 
+-#: config/darwin.h:279
++#: config/darwin.h:283
+ msgid "-client_name not allowed with -dynamiclib"
+ msgstr ""
+ 
+-#: config/darwin.h:284
++#: config/darwin.h:288
+ msgid "-force_flat_namespace not allowed with -dynamiclib"
+ msgstr ""
+ 
+-#: config/darwin.h:286
++#: config/darwin.h:290
+ msgid "-keep_private_externs not allowed with -dynamiclib"
+ msgstr ""
+ 
+-#: config/darwin.h:287
++#: config/darwin.h:291
+ msgid "-private_bundle not allowed with -dynamiclib"
+ msgstr ""
+ 
++#: ada/gcc-interface/lang-specs.h:34
++msgid "-c or -S required for Ada"
++msgstr ""
++
+ #: config/sparc/sol2-bi.h:189 config/sparc/sol2-bi.h:194
+ #: config/sparc/sol2-gld-bi.h:17 config/sparc/sol2-gld-bi.h:22
+ msgid "does not support multilib"
+ msgstr ""
+ 
+-#: config/rs6000/linux64.h:345 config/rs6000/linux64.h:347
+-#: config/rs6000/sysv4.h:902 config/rs6000/sysv4.h:904 config/linux.h:106
+-#: config/linux.h:108 config/alpha/linux-elf.h:33 config/alpha/linux-elf.h:35
++#: config/rs6000/linux64.h:350 config/rs6000/linux64.h:352
++#: config/rs6000/sysv4.h:907 config/rs6000/sysv4.h:909 config/linux.h:111
++#: config/linux.h:113 config/alpha/linux-elf.h:33 config/alpha/linux-elf.h:35
+ msgid "-mglibc and -muclibc used together"
+ msgstr ""
+ 
+@@ -16257,1218 +16261,1214 @@
+ msgstr ""
+ 
+ #: common.opt:99
+-msgid "Warn on calls to these functions"
+-msgstr ""
+-
+-#: common.opt:103
+ msgid "Treat all warnings as errors"
+ msgstr ""
+ 
+-#: common.opt:107
++#: common.opt:103
+ msgid "Treat specified warning as error"
+ msgstr ""
+ 
+-#: common.opt:111
++#: common.opt:107
+ msgid "Print extra (possibly unwanted) warnings"
+ msgstr ""
+ 
+-#: common.opt:115
++#: common.opt:111
+ msgid "Exit on the first error occurred"
+ msgstr ""
+ 
+-#: common.opt:119
++#: common.opt:115
+ msgid ""
+ "-Wframe-larger-than=<number> Warn if a function's stack frame requires more "
+ "than <number> bytes"
+ msgstr ""
+ 
+-#: common.opt:123
++#: common.opt:119
+ msgid "Warn when an inlined function cannot be inlined"
+ msgstr ""
+ 
+-#: common.opt:130
++#: common.opt:126
+ msgid "Warn if an object is larger than <number> bytes"
+ msgstr ""
+ 
+-#: common.opt:134
++#: common.opt:130
+ msgid ""
+ "Warn when a logical operator is suspicously always evaluating to true or "
+ "false"
+ msgstr ""
+ 
+-#: common.opt:138
++#: common.opt:134
+ msgid "Warn if the loop cannot be optimized due to nontrivial assumptions."
+ msgstr ""
+ 
+-#: common.opt:142
++#: common.opt:138
+ msgid ""
+ "Warn about functions which might be candidates for __attribute__((noreturn))"
+ msgstr ""
+ 
+-#: common.opt:146
++#: common.opt:142
+ msgid "Warn about constructs not instrumented by -fmudflap"
+ msgstr ""
+ 
+-#: common.opt:150
++#: common.opt:146
+ msgid "Warn about overflow in arithmetic expressions"
+ msgstr ""
+ 
+-#: common.opt:154
++#: common.opt:150
+ msgid "Warn when the packed attribute has no effect on struct layout"
+ msgstr ""
+ 
+-#: common.opt:158
++#: common.opt:154
+ msgid "Warn when padding is required to align structure members"
+ msgstr ""
+ 
+-#: common.opt:162
++#: common.opt:158
+ msgid "Warn when one local variable shadows another"
+ msgstr ""
+ 
+-#: common.opt:166
++#: common.opt:162
+ msgid "Warn when not issuing stack smashing protection for some reason"
+ msgstr ""
+ 
+-#: common.opt:170 common.opt:174
++#: common.opt:166 common.opt:170
+ msgid "Warn about code which might break strict aliasing rules"
+ msgstr ""
+ 
+-#: common.opt:178 common.opt:182
++#: common.opt:174 common.opt:178
+ msgid "Warn about optimizations that assume that signed overflow is undefined"
+ msgstr ""
+ 
+-#: common.opt:186
++#: common.opt:182
+ msgid "Warn about enumerated switches, with no default, missing a case"
+ msgstr ""
+ 
+-#: common.opt:190
++#: common.opt:186
+ msgid "Warn about enumerated switches missing a \"default:\" statement"
+ msgstr ""
+ 
+-#: common.opt:194
++#: common.opt:190
+ msgid "Warn about all enumerated switches missing a specific case"
+ msgstr ""
+ 
+-#: common.opt:198
++#: common.opt:194
+ msgid "Do not suppress warnings from system headers"
+ msgstr ""
+ 
+-#: common.opt:202
++#: common.opt:198
+ msgid ""
+ "Warn if a comparison is always true or always false due to the limited range "
+ "of the data type"
+ msgstr ""
+ 
+-#: common.opt:206
++#: common.opt:202
+ msgid "Warn about uninitialized automatic variables"
+ msgstr ""
+ 
+-#: common.opt:210
++#: common.opt:206
+ msgid "Warn about code that will never be executed"
+ msgstr ""
+ 
+-#: common.opt:214
++#: common.opt:210
+ msgid "Enable all -Wunused- warnings"
+ msgstr ""
+ 
+-#: common.opt:218
++#: common.opt:214
+ msgid "Warn when a function is unused"
+ msgstr ""
+ 
+-#: common.opt:222
++#: common.opt:218
+ msgid "Warn when a label is unused"
+ msgstr ""
+ 
+-#: common.opt:226
++#: common.opt:222
+ msgid "Warn when a function parameter is unused"
+ msgstr ""
+ 
+-#: common.opt:230
++#: common.opt:226
+ msgid "Warn when an expression value is unused"
+ msgstr ""
+ 
+-#: common.opt:234
++#: common.opt:230
+ msgid "Warn when a variable is unused"
+ msgstr ""
+ 
+-#: common.opt:238
++#: common.opt:234
+ msgid "Warn instead of error in case profiles in -fprofile-use do not match"
+ msgstr ""
+ 
+-#: common.opt:242
++#: common.opt:238
+ msgid "Emit declaration information into <file>"
+ msgstr ""
+ 
+-#: common.opt:255
++#: common.opt:251
+ msgid "Enable dumps from specific passes of the compiler"
+ msgstr ""
+ 
+-#: common.opt:259
++#: common.opt:255
+ msgid "Set the file basename to be used for dumps"
+ msgstr ""
+ 
+-#: common.opt:279
++#: common.opt:275
+ msgid "Align the start of functions"
+ msgstr ""
+ 
+-#: common.opt:286
++#: common.opt:282
+ msgid "Align labels which are only reached by jumping"
+ msgstr ""
+ 
+-#: common.opt:293
++#: common.opt:289
+ msgid "Align all labels"
+ msgstr ""
+ 
+-#: common.opt:300
++#: common.opt:296
+ msgid "Align the start of loops"
+ msgstr ""
+ 
+-#: common.opt:315
++#: common.opt:311
+ msgid "Specify that arguments may alias each other and globals"
+ msgstr ""
+ 
+-#: common.opt:319
++#: common.opt:315
+ msgid "Assume arguments may alias globals but not each other"
+ msgstr ""
+ 
+-#: common.opt:323
++#: common.opt:319
+ msgid "Assume arguments alias neither each other nor globals"
+ msgstr ""
+ 
+-#: common.opt:327
++#: common.opt:323
+ msgid "Assume arguments alias no other storage"
+ msgstr ""
+ 
+-#: common.opt:331
++#: common.opt:327
+ msgid "Generate unwind tables that are exact at each instruction boundary"
+ msgstr ""
+ 
+-#: common.opt:335
++#: common.opt:331
+ msgid "Generate auto-inc/dec instructions"
+ msgstr ""
+ 
+-#: common.opt:343
++#: common.opt:339
+ msgid "Generate code to check bounds before indexing arrays"
+ msgstr ""
+ 
+-#: common.opt:347
++#: common.opt:343
+ msgid "Replace add, compare, branch with branch on count register"
+ msgstr ""
+ 
+-#: common.opt:351
++#: common.opt:347
+ msgid "Use profiling information for branch probabilities"
+ msgstr ""
+ 
+-#: common.opt:355
++#: common.opt:351
+ msgid ""
+ "Perform branch target load optimization before prologue / epilogue threading"
+ msgstr ""
+ 
+-#: common.opt:359
++#: common.opt:355
+ msgid ""
+ "Perform branch target load optimization after prologue / epilogue threading"
+ msgstr ""
+ 
+-#: common.opt:363
++#: common.opt:359
+ msgid ""
+ "Restrict target load migration not to re-use registers in any basic block"
+ msgstr ""
+ 
+-#: common.opt:367
++#: common.opt:363
+ msgid "Mark <register> as being preserved across functions"
+ msgstr ""
+ 
+-#: common.opt:371
++#: common.opt:367
+ msgid "Mark <register> as being corrupted by function calls"
+ msgstr ""
+ 
+-#: common.opt:378
++#: common.opt:374
+ msgid "Save registers around function calls"
+ msgstr ""
+ 
+-#: common.opt:382
++#: common.opt:378
+ msgid "Compare the results of several data dependence analyzers."
+ msgstr ""
+ 
+-#: common.opt:386
++#: common.opt:382
+ msgid "Do not put uninitialized globals in the common section"
+ msgstr ""
+ 
+-#: common.opt:390
++#: common.opt:386
+ msgid "Do not perform optimizations increasing noticeably stack usage"
+ msgstr ""
+ 
+-#: common.opt:394
++#: common.opt:390
+ msgid "Perform a register copy-propagation optimization pass"
+ msgstr ""
+ 
+-#: common.opt:398
++#: common.opt:394
+ msgid "Perform cross-jumping optimization"
+ msgstr ""
+ 
+-#: common.opt:402
++#: common.opt:398
+ msgid "When running CSE, follow jumps to their targets"
+ msgstr ""
+ 
+-#: common.opt:406
++#: common.opt:402
+ msgid "When running CSE, follow conditional jumps"
+ msgstr ""
+ 
+-#: common.opt:410
++#: common.opt:406
+ msgid "Omit range reduction step when performing complex division"
+ msgstr ""
+ 
+-#: common.opt:414
++#: common.opt:410
+ msgid "Complex multiplication and division follow Fortran rules"
+ msgstr ""
+ 
+-#: common.opt:418
++#: common.opt:414
+ msgid "Place data items into their own section"
+ msgstr ""
+ 
+-#: common.opt:422
++#: common.opt:418
+ msgid "List all available debugging counters with their limits and counts."
+ msgstr ""
+ 
+-#: common.opt:426
++#: common.opt:422
+ msgid ""
+ "-fdbg-cnt=<counter>:<limit>[,<counter>:<limit>,...]    Set the debug counter "
+ "limit.   "
+ msgstr ""
+ 
+-#: common.opt:430
++#: common.opt:426
+ msgid "Map one directory name to another in debug information"
+ msgstr ""
+ 
+-#: common.opt:436
++#: common.opt:432
+ msgid "Defer popping functions args from stack until later"
+ msgstr ""
+ 
+-#: common.opt:440
++#: common.opt:436
+ msgid "Attempt to fill delay slots of branch instructions"
+ msgstr ""
+ 
+-#: common.opt:444
++#: common.opt:440
+ msgid "Delete useless null pointer checks"
+ msgstr ""
+ 
+-#: common.opt:448
++#: common.opt:444
+ msgid ""
+ "How often to emit source location at the beginning of line-wrapped "
+ "diagnostics"
+ msgstr ""
+ 
+-#: common.opt:452
++#: common.opt:448
+ msgid ""
+ "Amend appropriate diagnostic messages with the command line option that "
+ "controls them"
+ msgstr ""
+ 
+-#: common.opt:456
++#: common.opt:452
+ msgid "Dump various compiler internals to a file"
+ msgstr ""
+ 
+-#: common.opt:460
++#: common.opt:456
+ msgid "Suppress output of addresses in debugging dumps"
+ msgstr ""
+ 
+-#: common.opt:464
++#: common.opt:460
+ msgid ""
+ "Suppress output of instruction numbers, line number notes and addresses in "
+ "debugging dumps"
+ msgstr ""
+ 
+-#: common.opt:468
++#: common.opt:464
+ msgid "Enable CFI tables via GAS assembler directives."
+ msgstr ""
+ 
+-#: common.opt:472
++#: common.opt:468
+ msgid "Perform early inlining"
+ msgstr ""
+ 
+-#: common.opt:476
++#: common.opt:472
+ msgid "Perform DWARF2 duplicate elimination"
+ msgstr ""
+ 
+-#: common.opt:480 common.opt:484
++#: common.opt:476 common.opt:480
+ msgid "Perform unused type elimination in debug info"
+ msgstr ""
+ 
+-#: common.opt:488
++#: common.opt:484
+ msgid "Do not suppress C++ class debug information."
+ msgstr ""
+ 
+-#: common.opt:492
++#: common.opt:488
+ msgid "Enable exception handling"
+ msgstr ""
+ 
+-#: common.opt:496
++#: common.opt:492
+ msgid "Perform a number of minor, expensive optimizations"
+ msgstr ""
+ 
+-#: common.opt:503
++#: common.opt:499
+ msgid "Assume no NaNs or infinities are generated"
+ msgstr ""
+ 
+-#: common.opt:507
++#: common.opt:503
+ msgid "Mark <register> as being unavailable to the compiler"
+ msgstr ""
+ 
+-#: common.opt:511
++#: common.opt:507
+ msgid "Don't allocate floats and doubles in extended-precision registers"
+ msgstr ""
+ 
+-#: common.opt:515 common.opt:728 common.opt:949 common.opt:1105
+-#: common.opt:1164 common.opt:1180 common.opt:1240
++#: common.opt:511 common.opt:724 common.opt:945 common.opt:1101
++#: common.opt:1160 common.opt:1176 common.opt:1236
+ msgid "Does nothing.  Preserved for backward compatibility."
+ msgstr ""
+ 
+-#: common.opt:519
++#: common.opt:515
+ msgid "Perform a forward propagation pass on RTL"
+ msgstr ""
+ 
+-#: common.opt:526
++#: common.opt:522
+ msgid "Allow function addresses to be held in registers"
+ msgstr ""
+ 
+-#: common.opt:530
++#: common.opt:526
+ msgid "Place each function into its own section"
+ msgstr ""
+ 
+-#: common.opt:534
++#: common.opt:530
+ msgid "Perform global common subexpression elimination"
+ msgstr ""
+ 
+-#: common.opt:538
++#: common.opt:534
+ msgid ""
+ "Perform enhanced load motion during global common subexpression elimination"
+ msgstr ""
+ 
+-#: common.opt:542
++#: common.opt:538
+ msgid "Perform store motion after global common subexpression elimination"
+ msgstr ""
+ 
+-#: common.opt:546
++#: common.opt:542
+ msgid ""
+ "Perform redundant load after store elimination in global common subexpression"
+ msgstr ""
+ 
+-#: common.opt:551
++#: common.opt:547
+ msgid ""
+ "Perform global common subexpression elimination after register allocation"
+ msgstr ""
+ 
+-#: common.opt:557
++#: common.opt:553
+ msgid "Enable in and out of Graphite representation"
+ msgstr ""
+ 
+-#: common.opt:561
++#: common.opt:557
+ msgid "Enable Loop Strip Mining transformation"
+ msgstr ""
+ 
+-#: common.opt:565
++#: common.opt:561
+ msgid "Enable Loop Interchange transformation"
+ msgstr ""
+ 
+-#: common.opt:569
++#: common.opt:565
+ msgid "Enable Loop Blocking transformation"
+ msgstr ""
+ 
+-#: common.opt:574
++#: common.opt:570
+ msgid "Enable Graphite Identity transformation"
+ msgstr ""
+ 
+-#: common.opt:578
++#: common.opt:574
+ msgid "Enable guessing of branch probabilities"
+ msgstr ""
+ 
+-#: common.opt:586
++#: common.opt:582
+ msgid "Process #ident directives"
+ msgstr ""
+ 
+-#: common.opt:590
++#: common.opt:586
+ msgid "Perform conversion of conditional jumps to branchless equivalents"
+ msgstr ""
+ 
+-#: common.opt:594
++#: common.opt:590
+ msgid "Perform conversion of conditional jumps to conditional execution"
+ msgstr ""
+ 
+-#: common.opt:602
++#: common.opt:598
+ msgid "Do not generate .size directives"
+ msgstr ""
+ 
+-#: common.opt:606
++#: common.opt:602
+ msgid "Perform indirect inlining"
+ msgstr ""
+ 
+-#: common.opt:615
++#: common.opt:611
+ msgid "Pay attention to the \"inline\" keyword"
+ msgstr ""
+ 
+-#: common.opt:619
++#: common.opt:615
+ msgid ""
+ "Integrate simple functions into their callers when code size is known to not "
+ "growth"
+ msgstr ""
+ 
+-#: common.opt:623
++#: common.opt:619
+ msgid "Integrate simple functions into their callers"
+ msgstr ""
+ 
+-#: common.opt:627
++#: common.opt:623
+ msgid "Integrate functions called once into their callers"
+ msgstr ""
+ 
+-#: common.opt:634
++#: common.opt:630
+ msgid "Limit the size of inlined functions to <number>"
+ msgstr ""
+ 
+-#: common.opt:638
++#: common.opt:634
+ msgid "Instrument function entry and exit with profiling calls"
+ msgstr ""
+ 
+-#: common.opt:642
++#: common.opt:638
+ msgid ""
+ "-finstrument-functions-exclude-function-list=name,...  Do not instrument "
+ "listed functions"
+ msgstr ""
+ 
+-#: common.opt:646
++#: common.opt:642
+ msgid ""
+ "-finstrument-functions-exclude-file-list=filename,...  Do not instrument "
+ "functions listed in files"
+ msgstr ""
+ 
+-#: common.opt:650
++#: common.opt:646
+ msgid "Perform Interprocedural constant propagation"
+ msgstr ""
+ 
+-#: common.opt:654
++#: common.opt:650
+ msgid "Perform cloning to make Interprocedural constant propagation stronger"
+ msgstr ""
+ 
+-#: common.opt:658
++#: common.opt:654
+ msgid "Discover pure and const functions"
+ msgstr ""
+ 
+-#: common.opt:662
++#: common.opt:658
+ msgid "Perform interprocedural points-to analysis"
+ msgstr ""
+ 
+-#: common.opt:666
++#: common.opt:662
+ msgid "Discover readonly and non addressable static variables"
+ msgstr ""
+ 
+-#: common.opt:670
++#: common.opt:666
+ msgid "Type based escape and alias analysis"
+ msgstr ""
+ 
+-#: common.opt:674
++#: common.opt:670
+ msgid "Perform matrix layout flattening and transposing based"
+ msgstr ""
+ 
+-#: common.opt:679
++#: common.opt:675
+ msgid "Perform structure layout optimizations based"
+ msgstr ""
+ 
+-#: common.opt:684
++#: common.opt:680
+ msgid "-fira-algorithm=[CB|priority] Set the used IRA algorithm"
+ msgstr ""
+ 
+-#: common.opt:688
++#: common.opt:684
+ msgid "-fira-region=[one|all|mixed] Set regions for IRA"
+ msgstr ""
+ 
+-#: common.opt:692
++#: common.opt:688
+ msgid "Do optimistic coalescing."
+ msgstr ""
+ 
+-#: common.opt:696
++#: common.opt:692
+ msgid "Share slots for saving different hard registers."
+ msgstr ""
+ 
+-#: common.opt:700
++#: common.opt:696
+ msgid "Share stack slots for spilled pseudo-registers."
+ msgstr ""
+ 
+-#: common.opt:704
++#: common.opt:700
+ msgid "-fira-verbose=<number> Control IRA's level of diagnostic messages."
+ msgstr ""
+ 
+-#: common.opt:708
++#: common.opt:704
+ msgid "Optimize induction variables on trees"
+ msgstr ""
+ 
+-#: common.opt:712
++#: common.opt:708
+ msgid "Use jump tables for sufficiently large switch statements"
+ msgstr ""
+ 
+-#: common.opt:716
++#: common.opt:712
+ msgid "Generate code for functions even if they are fully inlined"
+ msgstr ""
+ 
+-#: common.opt:720
++#: common.opt:716
+ msgid "Emit static const variables even if they are not used"
+ msgstr ""
+ 
+-#: common.opt:724
++#: common.opt:720
+ msgid "Give external symbols a leading underscore"
+ msgstr ""
+ 
+-#: common.opt:732
++#: common.opt:728
+ msgid "Set errno after built-in math functions"
+ msgstr ""
+ 
+-#: common.opt:736
++#: common.opt:732
+ msgid "Report on permanent memory allocation"
+ msgstr ""
+ 
+-#: common.opt:743
++#: common.opt:739
+ msgid "Attempt to merge identical constants and constant variables"
+ msgstr ""
+ 
+-#: common.opt:747
++#: common.opt:743
+ msgid "Attempt to merge identical constants across compilation units"
+ msgstr ""
+ 
+-#: common.opt:751
++#: common.opt:747
+ msgid "Attempt to merge identical debug strings across compilation units"
+ msgstr ""
+ 
+-#: common.opt:755
++#: common.opt:751
+ msgid ""
+ "Limit diagnostics to <number> characters per line.  0 suppresses line-"
+ "wrapping"
+ msgstr ""
+ 
+-#: common.opt:759
++#: common.opt:755
+ msgid "Perform SMS based modulo scheduling before the first scheduling pass"
+ msgstr ""
+ 
+-#: common.opt:763
++#: common.opt:759
+ msgid "Perform SMS based modulo scheduling with register moves allowed"
+ msgstr ""
+ 
+-#: common.opt:767
++#: common.opt:763
+ msgid "Move loop invariant computations out of loops"
+ msgstr ""
+ 
+-#: common.opt:771
++#: common.opt:767
+ msgid "Add mudflap bounds-checking instrumentation for single-threaded program"
+ msgstr ""
+ 
+-#: common.opt:775
++#: common.opt:771
+ msgid "Add mudflap bounds-checking instrumentation for multi-threaded program"
+ msgstr ""
+ 
+-#: common.opt:779
++#: common.opt:775
+ msgid "Ignore read operations when inserting mudflap instrumentation"
+ msgstr ""
+ 
+-#: common.opt:783
++#: common.opt:779
+ msgid "Use the RTL dead code elimination pass"
+ msgstr ""
+ 
+-#: common.opt:787
++#: common.opt:783
+ msgid "Use the RTL dead store elimination pass"
+ msgstr ""
+ 
+-#: common.opt:791
++#: common.opt:787
+ msgid ""
+ "Enable/Disable the traditional scheduling in loops that already passed "
+ "modulo scheduling"
+ msgstr ""
+ 
+-#: common.opt:795
++#: common.opt:791
+ msgid "Support synchronous non-call exceptions"
+ msgstr ""
+ 
+-#: common.opt:799
++#: common.opt:795
+ msgid "When possible do not generate stack frames"
+ msgstr ""
+ 
+-#: common.opt:803
++#: common.opt:799
+ msgid "Do the full register move optimization pass"
+ msgstr ""
+ 
+-#: common.opt:807
++#: common.opt:803
+ msgid "Optimize sibling and tail recursive calls"
+ msgstr ""
+ 
+-#: common.opt:811 common.opt:815
++#: common.opt:807 common.opt:811
+ msgid "Report on memory allocation before interprocedural optimization"
+ msgstr ""
+ 
+-#: common.opt:819
++#: common.opt:815
+ msgid "Pack structure members together without holes"
+ msgstr ""
+ 
+-#: common.opt:823
++#: common.opt:819
+ msgid "Set initial maximum structure member alignment"
+ msgstr ""
+ 
+-#: common.opt:827
++#: common.opt:823
+ msgid "Return small aggregates in memory, not registers"
+ msgstr ""
+ 
+-#: common.opt:831
++#: common.opt:827
+ msgid "Perform loop peeling"
+ msgstr ""
+ 
+-#: common.opt:835
++#: common.opt:831
+ msgid "Enable machine specific peephole optimizations"
+ msgstr ""
+ 
+-#: common.opt:839
++#: common.opt:835
+ msgid "Enable an RTL peephole pass before sched2"
+ msgstr ""
+ 
+-#: common.opt:843
++#: common.opt:839
+ msgid "Generate position-independent code if possible (large mode)"
+ msgstr ""
+ 
+-#: common.opt:847
++#: common.opt:843
+ msgid ""
+ "Generate position-independent code for executables if possible (large mode)"
+ msgstr ""
+ 
+-#: common.opt:851
++#: common.opt:847
+ msgid "Generate position-independent code if possible (small mode)"
+ msgstr ""
+ 
+-#: common.opt:855
++#: common.opt:851
+ msgid ""
+ "Generate position-independent code for executables if possible (small mode)"
+ msgstr ""
+ 
+-#: common.opt:859
++#: common.opt:855
+ msgid "Run predictive commoning optimization."
+ msgstr ""
+ 
+-#: common.opt:863
++#: common.opt:859
+ msgid "Generate prefetch instructions, if available, for arrays in loops"
+ msgstr ""
+ 
+-#: common.opt:867
++#: common.opt:863
+ msgid "Enable basic program profiling code"
+ msgstr ""
+ 
+-#: common.opt:871
++#: common.opt:867
+ msgid "Insert arc-based program profiling code"
+ msgstr ""
+ 
+-#: common.opt:875
++#: common.opt:871
+ msgid "Set the top-level directory for storing the profile data."
+ msgstr ""
+ 
+-#: common.opt:880
++#: common.opt:876
+ msgid "Enable correction of flow inconsistent profile data input"
+ msgstr ""
+ 
+-#: common.opt:884
++#: common.opt:880
+ msgid ""
+ "Enable common options for generating profile info for profile feedback "
+ "directed optimizations"
+ msgstr ""
+ 
+-#: common.opt:888
++#: common.opt:884
+ msgid ""
+ "Enable common options for generating profile info for profile feedback "
+ "directed optimizations, and set -fprofile-dir="
+ msgstr ""
+ 
+-#: common.opt:892
++#: common.opt:888
+ msgid ""
+ "Enable common options for performing profile feedback directed optimizations"
+ msgstr ""
+ 
+-#: common.opt:896
++#: common.opt:892
+ msgid ""
+ "Enable common options for performing profile feedback directed "
+ "optimizations, and set -fprofile-dir="
+ msgstr ""
+ 
+-#: common.opt:900
++#: common.opt:896
+ msgid "Insert code to profile values of expressions"
+ msgstr ""
+ 
+-#: common.opt:907
++#: common.opt:903
+ msgid "Make compile reproducible using <string>"
+ msgstr ""
+ 
+-#: common.opt:917
++#: common.opt:913
+ msgid "Record gcc command line switches in the object file."
+ msgstr ""
+ 
+-#: common.opt:921
++#: common.opt:917
+ msgid "Return small aggregates in registers"
+ msgstr ""
+ 
+-#: common.opt:925
++#: common.opt:921
+ msgid "Enables a register move optimization"
+ msgstr ""
+ 
+-#: common.opt:929
++#: common.opt:925
+ msgid "Perform a register renaming optimization pass"
+ msgstr ""
+ 
+-#: common.opt:933
++#: common.opt:929
+ msgid "Reorder basic blocks to improve code placement"
+ msgstr ""
+ 
+-#: common.opt:937
++#: common.opt:933
+ msgid "Reorder basic blocks and partition into hot and cold sections"
+ msgstr ""
+ 
+-#: common.opt:941
++#: common.opt:937
+ msgid "Reorder functions to improve code placement"
+ msgstr ""
+ 
+-#: common.opt:945
++#: common.opt:941
+ msgid "Add a common subexpression elimination pass after loop optimizations"
+ msgstr ""
+ 
+-#: common.opt:953
++#: common.opt:949
+ msgid "Disable optimizations that assume default FP rounding behavior"
+ msgstr ""
+ 
+-#: common.opt:957
++#: common.opt:953
+ msgid "Enable scheduling across basic blocks"
+ msgstr ""
+ 
+-#: common.opt:961
++#: common.opt:957
+ msgid "Allow speculative motion of non-loads"
+ msgstr ""
+ 
+-#: common.opt:965
++#: common.opt:961
+ msgid "Allow speculative motion of some loads"
+ msgstr ""
+ 
+-#: common.opt:969
++#: common.opt:965
+ msgid "Allow speculative motion of more loads"
+ msgstr ""
+ 
+-#: common.opt:973
++#: common.opt:969
+ msgid "Set the verbosity level of the scheduler"
+ msgstr ""
+ 
+-#: common.opt:977
++#: common.opt:973
+ msgid "If scheduling post reload, do superblock scheduling"
+ msgstr ""
+ 
+-#: common.opt:981
++#: common.opt:977
+ msgid "If scheduling post reload, do trace scheduling"
+ msgstr ""
+ 
+-#: common.opt:985
++#: common.opt:981
+ msgid "Reschedule instructions before register allocation"
+ msgstr ""
+ 
+-#: common.opt:989
++#: common.opt:985
+ msgid "Reschedule instructions after register allocation"
+ msgstr ""
+ 
+-#: common.opt:996
++#: common.opt:992
+ msgid "Schedule instructions using selective scheduling algorithm"
+ msgstr ""
+ 
+-#: common.opt:1000
++#: common.opt:996
+ msgid "Run selective scheduling after reload"
+ msgstr ""
+ 
+-#: common.opt:1004
++#: common.opt:1000
+ msgid "Perform software pipelining of inner loops during selective scheduling"
+ msgstr ""
+ 
+-#: common.opt:1008
++#: common.opt:1004
+ msgid "Perform software pipelining of outer loops during selective scheduling"
+ msgstr ""
+ 
+-#: common.opt:1012
++#: common.opt:1008
+ msgid "Reschedule pipelined regions without pipelining"
+ msgstr ""
+ 
+-#: common.opt:1018
++#: common.opt:1014
+ msgid "Allow premature scheduling of queued insns"
+ msgstr ""
+ 
+-#: common.opt:1022
++#: common.opt:1018
+ msgid "Set number of queued insns that can be prematurely scheduled"
+ msgstr ""
+ 
+-#: common.opt:1030 common.opt:1034
++#: common.opt:1026 common.opt:1030
+ msgid ""
+ "Set dependence distance checking in premature scheduling of queued insns"
+ msgstr ""
+ 
+-#: common.opt:1038
++#: common.opt:1034
+ msgid "Access data in the same section from shared anchor points"
+ msgstr ""
+ 
+-#: common.opt:1042
++#: common.opt:1038
+ msgid "Perform sequence abstraction optimization on RTL"
+ msgstr ""
+ 
+-#: common.opt:1046
++#: common.opt:1042
+ msgid "Eliminate redundant sign extensions using LCM."
+ msgstr ""
+ 
+-#: common.opt:1050
++#: common.opt:1046
+ msgid "Show column numbers in diagnostics, when available.  Default off"
+ msgstr ""
+ 
+-#: common.opt:1054
++#: common.opt:1050
+ msgid "Disable optimizations observable by IEEE signaling NaNs"
+ msgstr ""
+ 
+-#: common.opt:1058
++#: common.opt:1054
+ msgid ""
+ "Disable floating point optimizations that ignore the IEEE signedness of zero"
+ msgstr ""
+ 
+-#: common.opt:1062
++#: common.opt:1058
+ msgid "Convert floating point constants to single precision constants"
+ msgstr ""
+ 
+-#: common.opt:1066
++#: common.opt:1062
+ msgid "Split lifetimes of induction variables when loops are unrolled"
+ msgstr ""
+ 
+-#: common.opt:1070
++#: common.opt:1066
+ msgid "Split wide types into independent registers"
+ msgstr ""
+ 
+-#: common.opt:1074
++#: common.opt:1070
+ msgid "Apply variable expansion when loops are unrolled"
+ msgstr ""
+ 
+-#: common.opt:1078
++#: common.opt:1074
+ msgid "Insert stack checking code into the program"
+ msgstr ""
+ 
+-#: common.opt:1082
++#: common.opt:1078
+ msgid ""
+ "Insert stack checking code into the program.  Same as -fstack-check=specific"
+ msgstr ""
+ 
+-#: common.opt:1089
++#: common.opt:1085
+ msgid "Trap if the stack goes past <register>"
+ msgstr ""
+ 
+-#: common.opt:1093
++#: common.opt:1089
+ msgid "Trap if the stack goes past symbol <name>"
+ msgstr ""
+ 
+-#: common.opt:1097
++#: common.opt:1093
+ msgid "Use propolice as a stack protection method"
+ msgstr ""
+ 
+-#: common.opt:1101
++#: common.opt:1097
+ msgid "Use a stack protection method for every function"
+ msgstr ""
+ 
+-#: common.opt:1113
++#: common.opt:1109
+ msgid "Assume strict aliasing rules apply"
+ msgstr ""
+ 
+-#: common.opt:1117
++#: common.opt:1113
+ msgid "Treat signed overflow as undefined"
+ msgstr ""
+ 
+-#: common.opt:1121
++#: common.opt:1117
+ msgid "Check for syntax errors, then stop"
+ msgstr ""
+ 
+-#: common.opt:1125
++#: common.opt:1121
+ msgid "Create data files needed by \"gcov\""
+ msgstr ""
+ 
+-#: common.opt:1129
++#: common.opt:1125
+ msgid "Perform jump threading optimizations"
+ msgstr ""
+ 
+-#: common.opt:1133
++#: common.opt:1129
+ msgid "Report the time taken by each compiler pass"
+ msgstr ""
+ 
+-#: common.opt:1137
++#: common.opt:1133
+ msgid "Set the default thread-local storage code generation model"
+ msgstr ""
+ 
+-#: common.opt:1141
++#: common.opt:1137
+ msgid "Reorder top level functions, variables, and asms"
+ msgstr ""
+ 
+-#: common.opt:1145
++#: common.opt:1141
+ msgid "Perform superblock formation via tail duplication"
+ msgstr ""
+ 
+-#: common.opt:1152
++#: common.opt:1148
+ msgid "Assume floating-point operations can trap"
+ msgstr ""
+ 
+-#: common.opt:1156
++#: common.opt:1152
+ msgid "Trap for signed overflow in addition, subtraction and multiplication"
+ msgstr ""
+ 
+-#: common.opt:1160
++#: common.opt:1156
+ msgid "Enable SSA-CCP optimization on trees"
+ msgstr ""
+ 
+-#: common.opt:1168
++#: common.opt:1164
+ msgid "Enable loop header copying on trees"
+ msgstr ""
+ 
+-#: common.opt:1172
++#: common.opt:1168
+ msgid "Replace SSA temporaries with better names in copies"
+ msgstr ""
+ 
+-#: common.opt:1176
++#: common.opt:1172
+ msgid "Enable copy propagation on trees"
+ msgstr ""
+ 
+-#: common.opt:1184
++#: common.opt:1180
+ msgid "Transform condition stores into unconditional ones"
+ msgstr ""
+ 
+-#: common.opt:1188
++#: common.opt:1184
+ msgid "Perform conversions of switch initializations."
+ msgstr ""
+ 
+-#: common.opt:1192
++#: common.opt:1188
+ msgid "Enable SSA dead code elimination optimization on trees"
+ msgstr ""
+ 
+-#: common.opt:1196
++#: common.opt:1192
+ msgid "Enable dominator optimizations"
+ msgstr ""
+ 
+-#: common.opt:1200
++#: common.opt:1196
+ msgid "Enable dead store elimination"
+ msgstr ""
+ 
+-#: common.opt:1204
++#: common.opt:1200
+ msgid "Enable Full Redundancy Elimination (FRE) on trees"
+ msgstr ""
+ 
+-#: common.opt:1208
++#: common.opt:1204
+ msgid "Enable loop distribution on trees"
+ msgstr ""
+ 
+-#: common.opt:1212
++#: common.opt:1208
+ msgid "Enable loop invariant motion on trees"
+ msgstr ""
+ 
+-#: common.opt:1216
++#: common.opt:1212
+ msgid "Enable linear loop transforms on trees"
+ msgstr ""
+ 
+-#: common.opt:1220
++#: common.opt:1216
+ msgid "Create canonical induction variables in loops"
+ msgstr ""
+ 
+-#: common.opt:1224
++#: common.opt:1220
+ msgid "Enable loop optimizations on tree level"
+ msgstr ""
+ 
+-#: common.opt:1228
++#: common.opt:1224
+ msgid "Enable automatic parallelization of loops"
+ msgstr ""
+ 
+-#: common.opt:1232
++#: common.opt:1228
+ msgid "Enable SSA-PRE optimization on trees"
+ msgstr ""
+ 
+-#: common.opt:1236
++#: common.opt:1232
+ msgid "Enable reassociation on tree level"
+ msgstr ""
+ 
+-#: common.opt:1244
++#: common.opt:1240
+ msgid "Enable SSA code sinking on trees"
+ msgstr ""
+ 
+-#: common.opt:1248
++#: common.opt:1244
+ msgid "Perform scalar replacement of aggregates"
+ msgstr ""
+ 
+-#: common.opt:1252
++#: common.opt:1248
+ msgid "Replace temporary expressions in the SSA->normal pass"
+ msgstr ""
+ 
+-#: common.opt:1256
++#: common.opt:1252
+ msgid "Perform live range splitting during the SSA->normal pass"
+ msgstr ""
+ 
+-#: common.opt:1260
++#: common.opt:1256
+ msgid "Perform Value Range Propagation on trees"
+ msgstr ""
+ 
+-#: common.opt:1264
++#: common.opt:1260
+ msgid "Compile whole compilation unit at a time"
+ msgstr ""
+ 
+-#: common.opt:1268
++#: common.opt:1264
+ msgid "Perform loop unrolling when iteration count is known"
+ msgstr ""
+ 
+-#: common.opt:1272
++#: common.opt:1268
+ msgid "Perform loop unrolling for all loops"
+ msgstr ""
+ 
+-#: common.opt:1279
++#: common.opt:1275
+ msgid "Allow loop optimizations to assume that the loops behave in normal way"
+ msgstr ""
+ 
+-#: common.opt:1283
++#: common.opt:1279
+ msgid "Allow optimization for floating-point arithmetic which may change the"
+ msgstr ""
+ 
+-#: common.opt:1288
++#: common.opt:1284
+ msgid "Same as -fassociative-math for expressions which include division."
+ msgstr ""
+ 
+-#: common.opt:1296
++#: common.opt:1292
+ msgid "Allow math optimizations that may violate IEEE or ISO standards"
+ msgstr ""
+ 
+-#: common.opt:1300
++#: common.opt:1296
+ msgid "Perform loop unswitching"
+ msgstr ""
+ 
+-#: common.opt:1304
++#: common.opt:1300
+ msgid "Just generate unwind tables for exception handling"
+ msgstr ""
+ 
+-#: common.opt:1308
++#: common.opt:1304
+ msgid "Perform variable tracking"
+ msgstr ""
+ 
+-#: common.opt:1312
++#: common.opt:1308
+ msgid "Perform variable tracking and also tag variables that are uninitialized"
+ msgstr ""
+ 
+-#: common.opt:1316
++#: common.opt:1312
+ msgid "Enable loop vectorization on trees"
+ msgstr ""
+ 
+-#: common.opt:1320
++#: common.opt:1316
+ msgid "Enable use of cost model in vectorization"
+ msgstr ""
+ 
+-#: common.opt:1324
++#: common.opt:1320
+ msgid "Enable loop versioning when doing loop vectorization on trees"
+ msgstr ""
+ 
+-#: common.opt:1328
++#: common.opt:1324
+ msgid "Set the verbosity level of the vectorizer"
+ msgstr ""
+ 
+-#: common.opt:1332
++#: common.opt:1328
+ msgid "Enable copy propagation of scalar-evolution information."
+ msgstr ""
+ 
+-#: common.opt:1342
++#: common.opt:1338
+ msgid "Add extra commentary to assembler output"
+ msgstr ""
+ 
+-#: common.opt:1346
++#: common.opt:1342
+ msgid "Set the default symbol visibility"
+ msgstr ""
+ 
+-#: common.opt:1351
++#: common.opt:1347
+ msgid "Use expression value profiles in optimizations"
+ msgstr ""
+ 
+-#: common.opt:1355
++#: common.opt:1351
+ msgid "Construct webs and split unrelated uses of single variable"
+ msgstr ""
+ 
+-#: common.opt:1359
++#: common.opt:1355
+ msgid "Enable conditional dead code elimination for builtin calls"
+ msgstr ""
+ 
+-#: common.opt:1363
++#: common.opt:1359
+ msgid "Perform whole program optimizations"
+ msgstr ""
+ 
+-#: common.opt:1367
++#: common.opt:1363
+ msgid "Assume signed arithmetic overflow wraps around"
+ msgstr ""
+ 
+-#: common.opt:1371
++#: common.opt:1367
+ msgid "Put zero initialized data in the bss section"
+ msgstr ""
+ 
+-#: common.opt:1375
++#: common.opt:1371
+ msgid "Generate debug information in default format"
+ msgstr ""
+ 
+-#: common.opt:1379
++#: common.opt:1375
+ msgid "Generate debug information in COFF format"
+ msgstr ""
+ 
+-#: common.opt:1383
++#: common.opt:1379
+ msgid "Generate debug information in DWARF v2 format"
+ msgstr ""
+ 
+-#: common.opt:1387
++#: common.opt:1383
+ msgid "Generate debug information in default extended format"
+ msgstr ""
+ 
+-#: common.opt:1391
++#: common.opt:1387
+ msgid "Generate debug information in STABS format"
+ msgstr ""
+ 
+-#: common.opt:1395
++#: common.opt:1391
+ msgid "Generate debug information in extended STABS format"
+ msgstr ""
+ 
+-#: common.opt:1399
++#: common.opt:1395
+ msgid "Generate debug information in VMS format"
+ msgstr ""
+ 
+-#: common.opt:1403
++#: common.opt:1399
+ msgid "Generate debug information in XCOFF format"
+ msgstr ""
+ 
+-#: common.opt:1407
++#: common.opt:1403
+ msgid "Generate debug information in extended XCOFF format"
+ msgstr ""
+ 
+-#: common.opt:1411
++#: common.opt:1407
+ msgid "Place output into <file>"
+ msgstr ""
+ 
+-#: common.opt:1415
++#: common.opt:1411
+ msgid "Enable function profiling"
+ msgstr ""
+ 
+-#: common.opt:1419
++#: common.opt:1415
+ msgid "Issue warnings needed for strict compliance to the standard"
+ msgstr ""
+ 
+-#: common.opt:1423
++#: common.opt:1419
+ msgid "Like -pedantic but issue them as errors"
+ msgstr ""
+ 
+-#: common.opt:1427
++#: common.opt:1423
+ msgid "Do not display functions compiled or elapsed time"
+ msgstr ""
+ 
+-#: common.opt:1431
++#: common.opt:1427
+ msgid "Display the compiler's version"
+ msgstr ""
+ 
+-#: common.opt:1435
++#: common.opt:1431
+ msgid "Suppress warnings"
+ msgstr ""
+ 
+-#: common.opt:1439
++#: common.opt:1435
+ msgid "Create a shared library"
+ msgstr ""
+ 
+-#: common.opt:1443
++#: common.opt:1439
+ msgid "Create a position independent executable"
+ msgstr ""
+ 
+@@ -17508,47 +17508,52 @@
+ "branch target register load optimization is not intended to be run twice"
+ msgstr ""
+ 
+-#: builtins.c:1039
++#: builtins.c:479
++#, gcc-internal-format
++msgid "offset outside bounds of constant string"
++msgstr ""
++
++#: builtins.c:1042
+ #, gcc-internal-format
+ msgid "second argument to %<__builtin_prefetch%> must be a constant"
+ msgstr ""
+ 
+-#: builtins.c:1046
++#: builtins.c:1049
+ #, gcc-internal-format
+ msgid "invalid second argument to %<__builtin_prefetch%>; using zero"
+ msgstr ""
+ 
+-#: builtins.c:1054
++#: builtins.c:1057
+ #, gcc-internal-format
+ msgid "third argument to %<__builtin_prefetch%> must be a constant"
+ msgstr ""
+ 
+-#: builtins.c:1061
++#: builtins.c:1064
+ #, gcc-internal-format
+ msgid "invalid third argument to %<__builtin_prefetch%>; using zero"
+ msgstr ""
+ 
+-#: builtins.c:4665
++#: builtins.c:4668
+ #, gcc-internal-format
+ msgid "argument of %<__builtin_args_info%> must be constant"
+ msgstr ""
+ 
+-#: builtins.c:4671
++#: builtins.c:4674
+ #, gcc-internal-format
+ msgid "argument of %<__builtin_args_info%> out of range"
+ msgstr ""
+ 
+-#: builtins.c:4677
++#: builtins.c:4680
+ #, gcc-internal-format
+ msgid "missing argument in %<__builtin_args_info%>"
+ msgstr ""
+ 
+-#: builtins.c:4813 gimplify.c:2324
++#: builtins.c:4816 gimplify.c:2324
+ #, gcc-internal-format
+ msgid "too few arguments to function %<va_start%>"
+ msgstr ""
+ 
+-#: builtins.c:4971
++#: builtins.c:4974
+ #, gcc-internal-format
+ msgid "first argument to %<va_arg%> not of type %<va_list%>"
+ msgstr ""
+@@ -17556,93 +17561,93 @@
+ #. Unfortunately, this is merely undefined, rather than a constraint
+ #. violation, so we cannot make this an error.  If this call is never
+ #. executed, the program is still strictly conforming.
+-#: builtins.c:4986
++#: builtins.c:4989
+ #, gcc-internal-format
+ msgid "%qT is promoted to %qT when passed through %<...%>"
+ msgstr ""
+ 
+-#: builtins.c:4991
++#: builtins.c:4994
+ #, gcc-internal-format
+ msgid "(so you should pass %qT not %qT to %<va_arg%>)"
+ msgstr ""
+ 
+ #. We can, however, treat "undefined" any way we please.
+ #. Call abort to encourage the user to fix the program.
+-#: builtins.c:4998 c-typeck.c:2451
++#: builtins.c:5001 c-typeck.c:2451
+ #, gcc-internal-format
+ msgid "if this code is reached, the program will abort"
+ msgstr ""
+ 
+-#: builtins.c:5122
++#: builtins.c:5125
+ #, gcc-internal-format
+ msgid "invalid argument to %<__builtin_frame_address%>"
+ msgstr ""
+ 
+-#: builtins.c:5124
++#: builtins.c:5127
+ #, gcc-internal-format
+ msgid "invalid argument to %<__builtin_return_address%>"
+ msgstr ""
+ 
+-#: builtins.c:5137
++#: builtins.c:5140
+ #, gcc-internal-format
+ msgid "unsupported argument to %<__builtin_frame_address%>"
+ msgstr ""
+ 
+-#: builtins.c:5139
++#: builtins.c:5142
+ #, gcc-internal-format
+ msgid "unsupported argument to %<__builtin_return_address%>"
+ msgstr ""
+ 
+-#: builtins.c:5685
++#: builtins.c:5688
+ #, gcc-internal-format
+ msgid "both arguments to %<__builtin___clear_cache%> must be pointers"
+ msgstr ""
+ 
+-#: builtins.c:6047 builtins.c:6062
++#: builtins.c:6050 builtins.c:6065
+ #, gcc-internal-format
+ msgid "%qD changed semantics in GCC 4.4"
+ msgstr ""
+ 
+ #. All valid uses of __builtin_va_arg_pack () are removed during
+ #. inlining.
+-#: builtins.c:6448 expr.c:8051
++#: builtins.c:6451 expr.c:8051
+ msgid "%Kinvalid use of %<__builtin_va_arg_pack ()%>"
+ msgstr ""
+ 
+ #. All valid uses of __builtin_va_arg_pack_len () are removed during
+ #. inlining.
+-#: builtins.c:6454
++#: builtins.c:6457
+ msgid "%Kinvalid use of %<__builtin_va_arg_pack_len ()%>"
+ msgstr ""
+ 
+-#: builtins.c:6750
++#: builtins.c:6753
+ #, gcc-internal-format
+ msgid "%<__builtin_longjmp%> second argument must be 1"
+ msgstr ""
+ 
+-#: builtins.c:7386
++#: builtins.c:7389
+ #, gcc-internal-format
+ msgid "target format does not support infinity"
+ msgstr ""
+ 
+-#: builtins.c:11730
++#: builtins.c:11733
+ #, gcc-internal-format
+ msgid "%<va_start%> used in function with fixed args"
+ msgstr ""
+ 
+-#: builtins.c:11738
++#: builtins.c:11741
+ #, gcc-internal-format
+ msgid "wrong number of arguments to function %<va_start%>"
+ msgstr ""
+ 
+ #. Evidently an out of date version of <stdarg.h>; can't validate
+ #. va_start's second argument, but can still work as intended.
+-#: builtins.c:11751
++#: builtins.c:11754
+ #, gcc-internal-format
+ msgid "%<__builtin_next_arg%> called without an argument"
+ msgstr ""
+ 
+-#: builtins.c:11756
++#: builtins.c:11759
+ #, gcc-internal-format
+ msgid "wrong number of arguments to function %<__builtin_next_arg%>"
+ msgstr ""
+@@ -17652,39 +17657,39 @@
+ #. argument.  We just warn and set the arg to be the last
+ #. argument so that we will get wrong-code because of
+ #. it.
+-#: builtins.c:11783
++#: builtins.c:11786
+ #, gcc-internal-format
+ msgid "second parameter of %<va_start%> not last named argument"
+ msgstr ""
+ 
+-#: builtins.c:11793
++#: builtins.c:11796
+ #, gcc-internal-format
+ msgid ""
+ "undefined behaviour when second parameter of %<va_start%> is declared with %"
+ "<register%> storage"
+ msgstr ""
+ 
+-#: builtins.c:11908
++#: builtins.c:11911
+ msgid "%Kfirst argument of %D must be a pointer, second integer constant"
+ msgstr ""
+ 
+-#: builtins.c:11921
++#: builtins.c:11924
+ msgid "%Klast argument of %D is not integer constant between 0 and 3"
+ msgstr ""
+ 
+-#: builtins.c:11966 builtins.c:12131 builtins.c:12190
++#: builtins.c:11969 builtins.c:12134 builtins.c:12193
+ msgid "%Kcall to %D will always overflow destination buffer"
+ msgstr ""
+ 
+-#: builtins.c:12121
++#: builtins.c:12124
+ msgid "%Kcall to %D might overflow destination buffer"
+ msgstr ""
+ 
+-#: builtins.c:12211
++#: builtins.c:12214
+ msgid "%Kattempt to free a non-heap object %qD"
+ msgstr ""
+ 
+-#: builtins.c:12214
++#: builtins.c:12217
+ msgid "%Kattempt to free a non-heap object"
+ msgstr ""
+ 
+@@ -17884,704 +17889,701 @@
+ msgid "comparison of unsigned expression < 0 is always false"
+ msgstr ""
+ 
+-#: c-common.c:3225
++#: c-common.c:3224
+ #, gcc-internal-format
+ msgid "pointer of type %<void *%> used in arithmetic"
+ msgstr ""
+ 
+-#: c-common.c:3231
++#: c-common.c:3230
+ #, gcc-internal-format
+ msgid "pointer to a function used in arithmetic"
+ msgstr ""
+ 
+-#: c-common.c:3237
++#: c-common.c:3236
+ #, gcc-internal-format
+ msgid "pointer to member function used in arithmetic"
+ msgstr ""
+ 
+-#: c-common.c:3319
+-#, gcc-internal-format
+-msgid "offset %<%wd%> outside bounds of constant string"
+-msgstr ""
+-
+-#: c-common.c:3422
++#: c-common.c:3396
+ #, gcc-internal-format
+ msgid "the address of %qD will always evaluate as %<true%>"
+ msgstr ""
+ 
+-#: c-common.c:3498 cp/semantics.c:594 cp/typeck.c:6638
++#: c-common.c:3472 cp/semantics.c:594 cp/typeck.c:6638
+ #, gcc-internal-format
+ msgid "suggest parentheses around assignment used as truth value"
+ msgstr ""
+ 
+-#: c-common.c:3577 c-typeck.c:8970
++#: c-common.c:3551 c-typeck.c:8974
+ #, gcc-internal-format
+ msgid "invalid use of %<restrict%>"
+ msgstr ""
+ 
+-#: c-common.c:3794
++#: c-common.c:3768
+ #, gcc-internal-format
+ msgid "invalid application of %<sizeof%> to a function type"
+ msgstr ""
+ 
+-#: c-common.c:3807
++#: c-common.c:3781
+ #, gcc-internal-format
+ msgid "invalid application of %qs to a void type"
+ msgstr ""
+ 
+-#: c-common.c:3815
++#: c-common.c:3789
+ #, gcc-internal-format
+ msgid "invalid application of %qs to incomplete type %qT "
+ msgstr ""
+ 
+-#: c-common.c:3856
++#: c-common.c:3830
+ #, gcc-internal-format
+ msgid "%<__alignof%> applied to a bit-field"
+ msgstr ""
+ 
+-#: c-common.c:4495
++#: c-common.c:4469
+ #, gcc-internal-format
+ msgid "cannot disable built-in function %qs"
+ msgstr ""
+ 
+-#: c-common.c:4686
++#: c-common.c:4660
+ #, gcc-internal-format
+ msgid "pointers are not permitted as case values"
+ msgstr ""
+ 
+-#: c-common.c:4693
++#: c-common.c:4667
+ #, gcc-internal-format
+ msgid "range expressions in switch statements are non-standard"
+ msgstr ""
+ 
+-#: c-common.c:4719
++#: c-common.c:4693
+ #, gcc-internal-format
+ msgid "empty range specified"
+ msgstr ""
+ 
+-#: c-common.c:4779
++#: c-common.c:4753
+ #, gcc-internal-format
+ msgid "duplicate (or overlapping) case value"
+ msgstr ""
+ 
+-#: c-common.c:4780
++#: c-common.c:4754
+ #, gcc-internal-format
+ msgid "%Jthis is the first entry overlapping that value"
+ msgstr ""
+ 
+-#: c-common.c:4784
++#: c-common.c:4758
+ #, gcc-internal-format
+ msgid "duplicate case value"
+ msgstr ""
+ 
+-#: c-common.c:4785
++#: c-common.c:4759
+ #, gcc-internal-format
+ msgid "%Jpreviously used here"
+ msgstr ""
+ 
+-#: c-common.c:4789
++#: c-common.c:4763
+ #, gcc-internal-format
+ msgid "multiple default labels in one switch"
+ msgstr ""
+ 
+-#: c-common.c:4790
++#: c-common.c:4764
+ #, gcc-internal-format
+ msgid "%Jthis is the first default label"
+ msgstr ""
+ 
+-#: c-common.c:4841
++#: c-common.c:4815
+ #, gcc-internal-format
+ msgid "%Jcase value %qs not in enumerated type"
+ msgstr ""
+ 
+-#: c-common.c:4845
++#: c-common.c:4819
+ #, gcc-internal-format
+ msgid "%Jcase value %qs not in enumerated type %qT"
+ msgstr ""
+ 
+-#: c-common.c:4904
++#: c-common.c:4878
+ #, gcc-internal-format
+ msgid "%Hswitch missing default case"
+ msgstr ""
+ 
+-#: c-common.c:4975
++#: c-common.c:4949
+ #, gcc-internal-format
+ msgid "%Henumeration value %qE not handled in switch"
+ msgstr ""
+ 
+-#: c-common.c:5010
++#: c-common.c:4984
+ #, gcc-internal-format
+ msgid "taking the address of a label is non-standard"
+ msgstr ""
+ 
+-#: c-common.c:5166
++#: c-common.c:5140
+ #, gcc-internal-format
+ msgid "%qE attribute ignored for field of type %qT"
+ msgstr ""
+ 
+-#: c-common.c:5177 c-common.c:5196 c-common.c:5214 c-common.c:5241
+-#: c-common.c:5268 c-common.c:5294 c-common.c:5313 c-common.c:5337
+-#: c-common.c:5360 c-common.c:5383 c-common.c:5404 c-common.c:5425
+-#: c-common.c:5449 c-common.c:5475 c-common.c:5512 c-common.c:5539
+-#: c-common.c:5582 c-common.c:5666 c-common.c:5696 c-common.c:5715
+-#: c-common.c:6050 c-common.c:6066 c-common.c:6114 c-common.c:6137
+-#: c-common.c:6201 c-common.c:6329 c-common.c:6395 c-common.c:6439
+-#: c-common.c:6485 c-common.c:6555 c-common.c:6579 c-common.c:6865
+-#: c-common.c:6888 c-common.c:6927 c-common.c:7016 c-common.c:7156
++#: c-common.c:5151 c-common.c:5170 c-common.c:5188 c-common.c:5215
++#: c-common.c:5242 c-common.c:5268 c-common.c:5287 c-common.c:5311
++#: c-common.c:5334 c-common.c:5357 c-common.c:5378 c-common.c:5399
++#: c-common.c:5423 c-common.c:5449 c-common.c:5486 c-common.c:5513
++#: c-common.c:5556 c-common.c:5640 c-common.c:5670 c-common.c:5689
++#: c-common.c:6024 c-common.c:6040 c-common.c:6088 c-common.c:6111
++#: c-common.c:6175 c-common.c:6303 c-common.c:6369 c-common.c:6413
++#: c-common.c:6459 c-common.c:6529 c-common.c:6553 c-common.c:6839
++#: c-common.c:6862 c-common.c:6901 c-common.c:6990 c-common.c:7130
++#: ada/gcc-interface/utils.c:5186 ada/gcc-interface/utils.c:5359
++#: ada/gcc-interface/utils.c:5378
+ #, gcc-internal-format
+ msgid "%qE attribute ignored"
+ msgstr ""
+ 
+-#: c-common.c:5259 c-common.c:5285
++#: c-common.c:5233 c-common.c:5259
+ #, gcc-internal-format
+ msgid "%qE attribute conflicts with attribute %s"
+ msgstr ""
+ 
+-#: c-common.c:5506
++#: c-common.c:5480
+ #, gcc-internal-format
+ msgid "%qE attribute have effect only on public objects"
+ msgstr ""
+ 
+-#: c-common.c:5603
++#: c-common.c:5577
+ #, gcc-internal-format
+ msgid "destructor priorities are not supported"
+ msgstr ""
+ 
+-#: c-common.c:5605
++#: c-common.c:5579
+ #, gcc-internal-format
+ msgid "constructor priorities are not supported"
+ msgstr ""
+ 
+-#: c-common.c:5622
++#: c-common.c:5596
+ #, gcc-internal-format
+ msgid "destructor priorities from 0 to %d are reserved for the implementation"
+ msgstr ""
+ 
+-#: c-common.c:5627
++#: c-common.c:5601
+ #, gcc-internal-format
+ msgid "constructor priorities from 0 to %d are reserved for the implementation"
+ msgstr ""
+ 
+-#: c-common.c:5635
++#: c-common.c:5609
+ #, gcc-internal-format
+ msgid "destructor priorities must be integers from 0 to %d inclusive"
+ msgstr ""
+ 
+-#: c-common.c:5638
++#: c-common.c:5612
+ #, gcc-internal-format
+ msgid "constructor priorities must be integers from 0 to %d inclusive"
+ msgstr ""
+ 
+-#: c-common.c:5759
++#: c-common.c:5733
+ #, gcc-internal-format
+ msgid "unknown machine mode %qs"
+ msgstr ""
+ 
+-#: c-common.c:5788
++#: c-common.c:5762
+ #, gcc-internal-format
+ msgid "specifying vector types with __attribute__ ((mode)) is deprecated"
+ msgstr ""
+ 
+-#: c-common.c:5791
++#: c-common.c:5765
+ #, gcc-internal-format
+ msgid "use __attribute__ ((vector_size)) instead"
+ msgstr ""
+ 
+-#: c-common.c:5800
++#: c-common.c:5774
+ #, gcc-internal-format
+ msgid "unable to emulate %qs"
+ msgstr ""
+ 
+-#: c-common.c:5810
++#: c-common.c:5784
+ #, gcc-internal-format
+ msgid "invalid pointer mode %qs"
+ msgstr ""
+ 
+-#: c-common.c:5827
++#: c-common.c:5801
+ #, gcc-internal-format
+ msgid "signness of type and machine mode %qs don't match"
+ msgstr ""
+ 
+-#: c-common.c:5838
++#: c-common.c:5812
+ #, gcc-internal-format
+ msgid "no data type for mode %qs"
+ msgstr ""
+ 
+-#: c-common.c:5848
++#: c-common.c:5822
+ #, gcc-internal-format
+ msgid "cannot use mode %qs for enumeral types"
+ msgstr ""
+ 
+-#: c-common.c:5875
++#: c-common.c:5849
+ #, gcc-internal-format
+ msgid "mode %qs applied to inappropriate type"
+ msgstr ""
+ 
+-#: c-common.c:5906
++#: c-common.c:5880
+ #, gcc-internal-format
+ msgid "%Jsection attribute cannot be specified for local variables"
+ msgstr ""
+ 
+-#: c-common.c:5917 config/bfin/bfin.c:5329 config/bfin/bfin.c:5380
++#: c-common.c:5891 config/bfin/bfin.c:5329 config/bfin/bfin.c:5380
+ #, gcc-internal-format
+ msgid "section of %q+D conflicts with previous declaration"
+ msgstr ""
+ 
+-#: c-common.c:5925
++#: c-common.c:5899
+ #, gcc-internal-format
+ msgid "section of %q+D cannot be overridden"
+ msgstr ""
+ 
+-#: c-common.c:5933
++#: c-common.c:5907
+ #, gcc-internal-format
+ msgid "section attribute not allowed for %q+D"
+ msgstr ""
+ 
+-#: c-common.c:5939
++#: c-common.c:5913
+ #, gcc-internal-format
+ msgid "%Jsection attributes are not supported for this target"
+ msgstr ""
+ 
+-#: c-common.c:5971
++#: c-common.c:5945
+ #, gcc-internal-format
+ msgid "requested alignment is not a constant"
+ msgstr ""
+ 
+-#: c-common.c:5976
++#: c-common.c:5950
+ #, gcc-internal-format
+ msgid "requested alignment is not a power of 2"
+ msgstr ""
+ 
+-#: c-common.c:5981
++#: c-common.c:5955
+ #, gcc-internal-format
+ msgid "requested alignment is too large"
+ msgstr ""
+ 
+-#: c-common.c:6007
++#: c-common.c:5981
+ #, gcc-internal-format
+ msgid "alignment may not be specified for %q+D"
+ msgstr ""
+ 
+-#: c-common.c:6014
++#: c-common.c:5988
+ #, gcc-internal-format
+ msgid ""
+ "alignment for %q+D was previously specified as %d and may not be decreased"
+ msgstr ""
+ 
+-#: c-common.c:6018
++#: c-common.c:5992
+ #, gcc-internal-format
+ msgid "alignment for %q+D must be at least %d"
+ msgstr ""
+ 
+-#: c-common.c:6043
++#: c-common.c:6017
+ #, gcc-internal-format
+ msgid "inline function %q+D cannot be declared weak"
+ msgstr ""
+ 
+-#: c-common.c:6077
++#: c-common.c:6051
+ #, gcc-internal-format
+ msgid "%q+D defined both normally and as an alias"
+ msgstr ""
+ 
+-#: c-common.c:6093
++#: c-common.c:6067
+ #, gcc-internal-format
+ msgid "alias argument not a string"
+ msgstr ""
+ 
+-#: c-common.c:6158
++#: c-common.c:6132
+ #, gcc-internal-format
+ msgid "%Jweakref attribute must appear before alias attribute"
+ msgstr ""
+ 
+-#: c-common.c:6188
++#: c-common.c:6162
+ #, gcc-internal-format
+ msgid "%qE attribute ignored on non-class types"
+ msgstr ""
+ 
+-#: c-common.c:6194
++#: c-common.c:6168
+ #, gcc-internal-format
+ msgid "%qE attribute ignored because %qT is already defined"
+ msgstr ""
+ 
+-#: c-common.c:6207
++#: c-common.c:6181
+ #, gcc-internal-format
+ msgid "visibility argument not a string"
+ msgstr ""
+ 
+-#: c-common.c:6219
++#: c-common.c:6193
+ #, gcc-internal-format
+ msgid "%qE attribute ignored on types"
+ msgstr ""
+ 
+-#: c-common.c:6235
++#: c-common.c:6209
+ #, gcc-internal-format
+ msgid ""
+ "visibility argument must be one of \"default\", \"hidden\", \"protected\" or "
+ "\"internal\""
+ msgstr ""
+ 
+-#: c-common.c:6246
++#: c-common.c:6220
+ #, gcc-internal-format
+ msgid "%qD redeclared with different visibility"
+ msgstr ""
+ 
+-#: c-common.c:6249 c-common.c:6253
++#: c-common.c:6223 c-common.c:6227
+ #, gcc-internal-format
+ msgid "%qD was declared %qs which implies default visibility"
+ msgstr ""
+ 
+-#: c-common.c:6337
++#: c-common.c:6311
+ #, gcc-internal-format
+ msgid "tls_model argument not a string"
+ msgstr ""
+ 
+-#: c-common.c:6350
++#: c-common.c:6324
+ #, gcc-internal-format
+ msgid ""
+ "tls_model argument must be one of \"local-exec\", \"initial-exec\", \"local-"
+ "dynamic\" or \"global-dynamic\""
+ msgstr ""
+ 
+-#: c-common.c:6369 c-common.c:6459
++#: c-common.c:6343 c-common.c:6433
+ #, gcc-internal-format
+ msgid "%J%qE attribute applies only to functions"
+ msgstr ""
+ 
+-#: c-common.c:6374 c-common.c:6464
++#: c-common.c:6348 c-common.c:6438
+ #, gcc-internal-format
+ msgid "%Jcan%'t set %qE attribute after definition"
+ msgstr ""
+ 
+-#: c-common.c:6420
++#: c-common.c:6394
+ #, gcc-internal-format
+ msgid "alloc_size parameter outside range"
+ msgstr ""
+ 
+-#: c-common.c:6553
++#: c-common.c:6527
+ #, gcc-internal-format
+ msgid "%qE attribute ignored for %qE"
+ msgstr ""
+ 
+-#: c-common.c:6613
++#: c-common.c:6587
+ #, gcc-internal-format
+ msgid "invalid vector type for attribute %qE"
+ msgstr ""
+ 
+-#: c-common.c:6619
++#: c-common.c:6593
+ #, gcc-internal-format
+ msgid "vector size not an integral multiple of component size"
+ msgstr ""
+ 
+-#: c-common.c:6625
++#: c-common.c:6599
+ #, gcc-internal-format
+ msgid "zero vector size"
+ msgstr ""
+ 
+-#: c-common.c:6633
++#: c-common.c:6607
+ #, gcc-internal-format
+ msgid "number of components of the vector not a power of two"
+ msgstr ""
+ 
+-#: c-common.c:6661
++#: c-common.c:6635 ada/gcc-interface/utils.c:5237
+ #, gcc-internal-format
+ msgid "nonnull attribute without arguments on a non-prototype"
+ msgstr ""
+ 
+-#: c-common.c:6676
++#: c-common.c:6650 ada/gcc-interface/utils.c:5252
+ #, gcc-internal-format
+ msgid "nonnull argument has invalid operand number (argument %lu)"
+ msgstr ""
+ 
+-#: c-common.c:6695
++#: c-common.c:6669 ada/gcc-interface/utils.c:5271
+ #, gcc-internal-format
+ msgid ""
+ "nonnull argument with out-of-range operand number (argument %lu, operand %lu)"
+ msgstr ""
+ 
+-#: c-common.c:6703
++#: c-common.c:6677 ada/gcc-interface/utils.c:5279
+ #, gcc-internal-format
+ msgid ""
+ "nonnull argument references non-pointer operand (argument %lu, operand %lu)"
+ msgstr ""
+ 
+-#: c-common.c:6779
++#: c-common.c:6753
+ #, gcc-internal-format
+ msgid "not enough variable arguments to fit a sentinel"
+ msgstr ""
+ 
+-#: c-common.c:6793
++#: c-common.c:6767
+ #, gcc-internal-format
+ msgid "missing sentinel in function call"
+ msgstr ""
+ 
+-#: c-common.c:6834
++#: c-common.c:6808
+ #, gcc-internal-format
+ msgid "null argument where non-null required (argument %lu)"
+ msgstr ""
+ 
+-#: c-common.c:6899
++#: c-common.c:6873
+ #, gcc-internal-format
+ msgid "cleanup argument not an identifier"
+ msgstr ""
+ 
+-#: c-common.c:6906
++#: c-common.c:6880
+ #, gcc-internal-format
+ msgid "cleanup argument not a function"
+ msgstr ""
+ 
+-#: c-common.c:6945
++#: c-common.c:6919 ada/gcc-interface/utils.c:5301
+ #, gcc-internal-format
+ msgid "%qE attribute requires prototypes with named arguments"
+ msgstr ""
+ 
+-#: c-common.c:6956
++#: c-common.c:6930 ada/gcc-interface/utils.c:5312
+ #, gcc-internal-format
+ msgid "%qE attribute only applies to variadic functions"
+ msgstr ""
+ 
+-#: c-common.c:6968
++#: c-common.c:6942 ada/gcc-interface/utils.c:5323
+ #, gcc-internal-format
+ msgid "requested position is not an integer constant"
+ msgstr ""
+ 
+-#: c-common.c:6976
++#: c-common.c:6950 ada/gcc-interface/utils.c:5330
+ #, gcc-internal-format
+ msgid "requested position is less than zero"
+ msgstr ""
+ 
+-#: c-common.c:7100
++#: c-common.c:7074
+ #, gcc-internal-format
+ msgid "Bad option %s to optimize attribute."
+ msgstr ""
+ 
+-#: c-common.c:7103
++#: c-common.c:7077
+ #, gcc-internal-format
+ msgid "Bad option %s to pragma attribute"
+ msgstr ""
+ 
+-#: c-common.c:7296
++#: c-common.c:7270
+ #, gcc-internal-format
+ msgid "not enough arguments to function %qE"
+ msgstr ""
+ 
+-#: c-common.c:7301 c-typeck.c:2558
++#: c-common.c:7275 c-typeck.c:2558
+ #, gcc-internal-format
+ msgid "too many arguments to function %qE"
+ msgstr ""
+ 
+-#: c-common.c:7331 c-common.c:7377
++#: c-common.c:7305 c-common.c:7351
+ #, gcc-internal-format
+ msgid "non-floating-point argument in call to function %qE"
+ msgstr ""
+ 
+-#: c-common.c:7354
++#: c-common.c:7328
+ #, gcc-internal-format
+ msgid "non-floating-point arguments in call to function %qE"
+ msgstr ""
+ 
+-#: c-common.c:7370
++#: c-common.c:7344
+ #, gcc-internal-format
+ msgid "non-const integer argument %u in call to function %qE"
+ msgstr ""
+ 
+-#: c-common.c:7596
++#: c-common.c:7570
+ #, gcc-internal-format
+ msgid ""
+ "%Hignoring return value of %qD, declared with attribute warn_unused_result"
+ msgstr ""
+ 
+-#: c-common.c:7600
++#: c-common.c:7574
+ #, gcc-internal-format
+ msgid ""
+ "%Hignoring return value of function declared with attribute "
+ "warn_unused_result"
+ msgstr ""
+ 
+-#: c-common.c:7654
++#: c-common.c:7628
+ #, gcc-internal-format
+ msgid "cannot apply %<offsetof%> to static data member %qD"
+ msgstr ""
+ 
+-#: c-common.c:7659
++#: c-common.c:7633
+ #, gcc-internal-format
+ msgid "cannot apply %<offsetof%> when %<operator[]%> is overloaded"
+ msgstr ""
+ 
+-#: c-common.c:7680 cp/typeck.c:4685
++#: c-common.c:7654 cp/typeck.c:4685
+ #, gcc-internal-format
+ msgid "attempt to take address of bit-field structure member %qD"
+ msgstr ""
+ 
+-#: c-common.c:7733
++#: c-common.c:7707
+ #, gcc-internal-format
+ msgid "lvalue required as left operand of assignment"
+ msgstr ""
+ 
+-#: c-common.c:7736
++#: c-common.c:7710
+ #, gcc-internal-format
+ msgid "lvalue required as increment operand"
+ msgstr ""
+ 
+-#: c-common.c:7739
++#: c-common.c:7713
+ #, gcc-internal-format
+ msgid "lvalue required as decrement operand"
+ msgstr ""
+ 
+-#: c-common.c:7742
++#: c-common.c:7716
+ #, gcc-internal-format
+ msgid "lvalue required as unary %<&%> operand"
+ msgstr ""
+ 
+-#: c-common.c:7745
++#: c-common.c:7719
+ #, gcc-internal-format
+ msgid "lvalue required in asm statement"
+ msgstr ""
+ 
+-#: c-common.c:7874
++#: c-common.c:7848
+ #, gcc-internal-format
+ msgid "size of array is too large"
+ msgstr ""
+ 
+-#: c-common.c:7910 c-common.c:7959 c-typeck.c:2748
++#: c-common.c:7884 c-common.c:7933 c-typeck.c:2748
+ #, gcc-internal-format
+ msgid "too few arguments to function %qE"
+ msgstr ""
+ 
+-#: c-common.c:7927 c-typeck.c:4461
++#: c-common.c:7901 c-typeck.c:4465
+ #, gcc-internal-format
+ msgid "incompatible type for argument %d of %qE"
+ msgstr ""
+ 
+-#: c-common.c:8119
++#: c-common.c:8093
+ #, gcc-internal-format
+ msgid "array subscript has type %<char%>"
+ msgstr ""
+ 
+-#: c-common.c:8154
++#: c-common.c:8128
+ #, gcc-internal-format
+ msgid "suggest parentheses around %<+%> inside %<<<%>"
+ msgstr ""
+ 
+-#: c-common.c:8157
++#: c-common.c:8131
+ #, gcc-internal-format
+ msgid "suggest parentheses around %<-%> inside %<<<%>"
+ msgstr ""
+ 
+-#: c-common.c:8163
++#: c-common.c:8137
+ #, gcc-internal-format
+ msgid "suggest parentheses around %<+%> inside %<>>%>"
+ msgstr ""
+ 
+-#: c-common.c:8166
++#: c-common.c:8140
+ #, gcc-internal-format
+ msgid "suggest parentheses around %<-%> inside %<>>%>"
+ msgstr ""
+ 
+-#: c-common.c:8172
++#: c-common.c:8146
+ #, gcc-internal-format
+ msgid "suggest parentheses around %<&&%> within %<||%>"
+ msgstr ""
+ 
+-#: c-common.c:8181
++#: c-common.c:8155
+ #, gcc-internal-format
+ msgid "suggest parentheses around arithmetic in operand of %<|%>"
+ msgstr ""
+ 
+-#: c-common.c:8186
++#: c-common.c:8160
+ #, gcc-internal-format
+ msgid "suggest parentheses around comparison in operand of %<|%>"
+ msgstr ""
+ 
+-#: c-common.c:8190
++#: c-common.c:8164
+ #, gcc-internal-format
+ msgid ""
+ "suggest parentheses around operand of %<!%> or change %<|%> to %<||%> or %<!%"
+ "> to %<~%>"
+ msgstr ""
+ 
+-#: c-common.c:8200
++#: c-common.c:8174
+ #, gcc-internal-format
+ msgid "suggest parentheses around arithmetic in operand of %<^%>"
+ msgstr ""
+ 
+-#: c-common.c:8205
++#: c-common.c:8179
+ #, gcc-internal-format
+ msgid "suggest parentheses around comparison in operand of %<^%>"
+ msgstr ""
+ 
+-#: c-common.c:8211
++#: c-common.c:8185
+ #, gcc-internal-format
+ msgid "suggest parentheses around %<+%> in operand of %<&%>"
+ msgstr ""
+ 
+-#: c-common.c:8214
++#: c-common.c:8188
+ #, gcc-internal-format
+ msgid "suggest parentheses around %<-%> in operand of %<&%>"
+ msgstr ""
+ 
+-#: c-common.c:8219
++#: c-common.c:8193
+ #, gcc-internal-format
+ msgid "suggest parentheses around comparison in operand of %<&%>"
+ msgstr ""
+ 
+-#: c-common.c:8223
++#: c-common.c:8197
+ #, gcc-internal-format
+ msgid ""
+ "suggest parentheses around operand of %<!%> or change %<&%> to %<&&%> or %<!%"
+ "> to %<~%>"
+ msgstr ""
+ 
+-#: c-common.c:8231
++#: c-common.c:8205
+ #, gcc-internal-format
+ msgid "suggest parentheses around comparison in operand of %<==%>"
+ msgstr ""
+ 
+-#: c-common.c:8237
++#: c-common.c:8211
+ #, gcc-internal-format
+ msgid "suggest parentheses around comparison in operand of %<!=%>"
+ msgstr ""
+ 
+-#: c-common.c:8248
++#: c-common.c:8222
+ #, gcc-internal-format
+ msgid "comparisons like %<X<=Y<=Z%> do not have their mathematical meaning"
+ msgstr ""
+ 
+-#: c-common.c:8263
++#: c-common.c:8237
+ #, gcc-internal-format
+ msgid "label %q+D defined but not used"
+ msgstr ""
+ 
+-#: c-common.c:8265
++#: c-common.c:8239
+ #, gcc-internal-format
+ msgid "label %q+D declared but not defined"
+ msgstr ""
+ 
+-#: c-common.c:8285
++#: c-common.c:8259
+ #, gcc-internal-format
+ msgid "division by zero"
+ msgstr ""
+ 
+-#: c-common.c:8317
++#: c-common.c:8291
+ #, gcc-internal-format
+ msgid "comparison between types %qT and %qT"
+ msgstr ""
+ 
+-#: c-common.c:8368
++#: c-common.c:8342
+ #, gcc-internal-format
+ msgid "comparison between signed and unsigned integer expressions"
+ msgstr ""
+ 
+-#: c-common.c:8419
++#: c-common.c:8393
+ #, gcc-internal-format
+ msgid "promoted ~unsigned is always non-zero"
+ msgstr ""
+ 
+-#: c-common.c:8422
++#: c-common.c:8396
+ #, gcc-internal-format
+ msgid "comparison of promoted ~unsigned with constant"
+ msgstr ""
+ 
+-#: c-common.c:8432
++#: c-common.c:8406
+ #, gcc-internal-format
+ msgid "comparison of promoted ~unsigned with unsigned"
+ msgstr ""
+@@ -18591,7 +18593,7 @@
+ #. an unprototyped function, it is compile-time undefined;
+ #. making it a constraint in that case was rejected in
+ #. DR#252.
+-#: c-convert.c:95 c-typeck.c:1796 c-typeck.c:4096 cp/typeck.c:1619
++#: c-convert.c:95 c-typeck.c:1796 c-typeck.c:4100 cp/typeck.c:1619
+ #: cp/typeck.c:5936 cp/typeck.c:6546 fortran/convert.c:88
+ #, gcc-internal-format
+ msgid "void value not ignored as it ought to be"
+@@ -18831,8 +18833,8 @@
+ msgid "declaration of %q+D shadows a previous local"
+ msgstr ""
+ 
+-#: c-decl.c:1972 cp/name-lookup.c:1041 cp/name-lookup.c:1072
+-#: cp/name-lookup.c:1080
++#: c-decl.c:1972 cp/name-lookup.c:1043 cp/name-lookup.c:1074
++#: cp/name-lookup.c:1082
+ #, gcc-internal-format
+ msgid "%Jshadowed declaration is here"
+ msgstr ""
+@@ -19015,7 +19017,7 @@
+ msgid "variable %qD has initializer but incomplete type"
+ msgstr ""
+ 
+-#: c-decl.c:3319 c-decl.c:6138 cp/decl.c:4114 cp/decl.c:11484
++#: c-decl.c:3319 c-decl.c:6138 cp/decl.c:4117 cp/decl.c:11498
+ #, gcc-internal-format
+ msgid "inline function %q+D given attribute noinline"
+ msgstr ""
+@@ -19135,7 +19137,7 @@
+ msgid "variable length array %qs is used"
+ msgstr ""
+ 
+-#: c-decl.c:3932 cp/decl.c:7274
++#: c-decl.c:3932 cp/decl.c:7277
+ #, gcc-internal-format
+ msgid "variable length array is used"
+ msgstr ""
+@@ -19190,22 +19192,22 @@
+ msgid "storage class specified for structure field %qs"
+ msgstr ""
+ 
+-#: c-decl.c:4150 cp/decl.c:8169
++#: c-decl.c:4150 cp/decl.c:8175
+ #, gcc-internal-format
+ msgid "storage class specified for parameter %qs"
+ msgstr ""
+ 
+-#: c-decl.c:4153 cp/decl.c:8171
++#: c-decl.c:4153 cp/decl.c:8177
+ #, gcc-internal-format
+ msgid "storage class specified for typename"
+ msgstr ""
+ 
+-#: c-decl.c:4170 cp/decl.c:9450
++#: c-decl.c:4170 cp/decl.c:9464
+ #, gcc-internal-format
+ msgid "%qs initialized and declared %<extern%>"
+ msgstr ""
+ 
+-#: c-decl.c:4173 cp/decl.c:9454
++#: c-decl.c:4173 cp/decl.c:9468
+ #, gcc-internal-format
+ msgid "%qs has both %<extern%> and initializer"
+ msgstr ""
+@@ -19220,12 +19222,12 @@
+ msgid "file-scope declaration of %qs specifies %<register%>"
+ msgstr ""
+ 
+-#: c-decl.c:4186 cp/decl.c:8182
++#: c-decl.c:4186 cp/decl.c:8188
+ #, gcc-internal-format
+ msgid "nested function %qs declared %<extern%>"
+ msgstr ""
+ 
+-#: c-decl.c:4189 cp/decl.c:8192
++#: c-decl.c:4189 cp/decl.c:8198
+ #, gcc-internal-format
+ msgid "function-scope %qs implicitly auto and declared %<__thread%>"
+ msgstr ""
+@@ -19268,7 +19270,7 @@
+ msgid "size of array %qs is negative"
+ msgstr ""
+ 
+-#: c-decl.c:4382 c-decl.c:4655 cp/decl.c:8694
++#: c-decl.c:4382 c-decl.c:4655 cp/decl.c:8706
+ #, gcc-internal-format
+ msgid "size of array %qs is too large"
+ msgstr ""
+@@ -19289,12 +19291,12 @@
+ msgid "array type has incomplete element type"
+ msgstr ""
+ 
+-#: c-decl.c:4526 cp/decl.c:8288
++#: c-decl.c:4526 cp/decl.c:8294
+ #, gcc-internal-format
+ msgid "%qs declared as function returning a function"
+ msgstr ""
+ 
+-#: c-decl.c:4531 cp/decl.c:8293
++#: c-decl.c:4531 cp/decl.c:8299
+ #, gcc-internal-format
+ msgid "%qs declared as function returning an array"
+ msgstr ""
+@@ -19304,7 +19306,7 @@
+ msgid "function definition has qualified void return type"
+ msgstr ""
+ 
+-#: c-decl.c:4557 cp/decl.c:8277
++#: c-decl.c:4557 cp/decl.c:8283
+ #, gcc-internal-format
+ msgid "type qualifiers ignored on function return type"
+ msgstr ""
+@@ -19585,7 +19587,7 @@
+ msgid "%q+D was used with no prototype before its definition"
+ msgstr ""
+ 
+-#: c-decl.c:6254 cp/decl.c:11625
++#: c-decl.c:6254 cp/decl.c:11639
+ #, gcc-internal-format
+ msgid "no previous declaration for %q+D"
+ msgstr ""
+@@ -19700,7 +19702,7 @@
+ msgid "argument %qD doesn%'t match prototype"
+ msgstr ""
+ 
+-#: c-decl.c:6782 cp/decl.c:12329
++#: c-decl.c:6782 cp/decl.c:12343
+ #, gcc-internal-format
+ msgid "no return statement in function returning non-void"
+ msgstr ""
+@@ -20074,7 +20076,7 @@
+ msgid "ISO C does not support decimal floating point"
+ msgstr ""
+ 
+-#: c-decl.c:7613 c-decl.c:7792 c-parser.c:5101
++#: c-decl.c:7613 c-decl.c:7792 c-parser.c:5107
+ #, gcc-internal-format
+ msgid "fixed-point types not supported for this target"
+ msgstr ""
+@@ -20762,12 +20764,12 @@
+ msgid "ISO C forbids an empty translation unit"
+ msgstr ""
+ 
+-#: c-parser.c:1056 c-parser.c:6109
++#: c-parser.c:1056 c-parser.c:6113
+ #, gcc-internal-format
+ msgid "ISO C does not allow extra %<;%> outside of a function"
+ msgstr ""
+ 
+-#: c-parser.c:1158 c-parser.c:6667
++#: c-parser.c:1158 c-parser.c:6671
+ #, gcc-internal-format
+ msgid "expected declaration specifiers"
+ msgstr ""
+@@ -20796,16 +20798,16 @@
+ msgstr ""
+ 
+ #: c-parser.c:1641 c-parser.c:2454 c-parser.c:3094 c-parser.c:3352
+-#: c-parser.c:4286 c-parser.c:4886 c-parser.c:5308 c-parser.c:5329
+-#: c-parser.c:5446 c-parser.c:5598 c-parser.c:5615 c-parser.c:5751
+-#: c-parser.c:5763 c-parser.c:5788 c-parser.c:5922 c-parser.c:5951
+-#: c-parser.c:5959 c-parser.c:5987 c-parser.c:6001 c-parser.c:6217
+-#: c-parser.c:6316 c-parser.c:6837 c-parser.c:7538
++#: c-parser.c:4292 c-parser.c:4892 c-parser.c:5314 c-parser.c:5335
++#: c-parser.c:5452 c-parser.c:5602 c-parser.c:5619 c-parser.c:5755
++#: c-parser.c:5767 c-parser.c:5792 c-parser.c:5926 c-parser.c:5955
++#: c-parser.c:5963 c-parser.c:5991 c-parser.c:6005 c-parser.c:6221
++#: c-parser.c:6320 c-parser.c:6841 c-parser.c:7542
+ #, gcc-internal-format
+ msgid "expected identifier"
+ msgstr ""
+ 
+-#: c-parser.c:1674 cp/parser.c:11972
++#: c-parser.c:1674 cp/parser.c:11977
+ #, gcc-internal-format
+ msgid "comma at end of enumerator list"
+ msgstr ""
+@@ -20815,7 +20817,7 @@
+ msgid "expected %<,%> or %<}%>"
+ msgstr ""
+ 
+-#: c-parser.c:1694 c-parser.c:1877 c-parser.c:6076
++#: c-parser.c:1694 c-parser.c:1877 c-parser.c:6080
+ #, gcc-internal-format
+ msgid "expected %<{%>"
+ msgstr ""
+@@ -20830,7 +20832,7 @@
+ msgid "expected class name"
+ msgstr ""
+ 
+-#: c-parser.c:1831 c-parser.c:5855
++#: c-parser.c:1831 c-parser.c:5859
+ #, gcc-internal-format
+ msgid "extra semicolon in struct or union specified"
+ msgstr ""
+@@ -20890,7 +20892,7 @@
+ msgid "wide string literal in %<asm%>"
+ msgstr ""
+ 
+-#: c-parser.c:2689 c-parser.c:6722
++#: c-parser.c:2689 c-parser.c:6726
+ #, gcc-internal-format
+ msgid "expected string literal"
+ msgstr ""
+@@ -20980,12 +20982,12 @@
+ msgid "expected statement"
+ msgstr ""
+ 
+-#: c-parser.c:3872 cp/parser.c:7296
++#: c-parser.c:3872 cp/parser.c:7301
+ #, gcc-internal-format
+ msgid "suggest braces around empty body in an %<if%> statement"
+ msgstr ""
+ 
+-#: c-parser.c:3898 cp/parser.c:7317
++#: c-parser.c:3898 cp/parser.c:7322
+ #, gcc-internal-format
+ msgid "suggest braces around empty body in an %<else%> statement"
+ msgstr ""
+@@ -21000,199 +21002,199 @@
+ msgid "%E qualifier ignored on asm"
+ msgstr ""
+ 
+-#: c-parser.c:4459
++#: c-parser.c:4465
+ #, gcc-internal-format
+ msgid "ISO C forbids omitting the middle term of a ?: expression"
+ msgstr ""
+ 
+-#: c-parser.c:4855
++#: c-parser.c:4861
+ #, gcc-internal-format
+ msgid "traditional C rejects the unary plus operator"
+ msgstr ""
+ 
+-#: c-parser.c:4972
++#: c-parser.c:4978
+ #, gcc-internal-format
+ msgid "%<sizeof%> applied to a bit-field"
+ msgstr ""
+ 
+-#: c-parser.c:5131 c-parser.c:5488 c-parser.c:5510
++#: c-parser.c:5137 c-parser.c:5494 c-parser.c:5516
+ #, gcc-internal-format
+ msgid "expected expression"
+ msgstr ""
+ 
+-#: c-parser.c:5158
++#: c-parser.c:5164
+ #, gcc-internal-format
+ msgid "braced-group within expression allowed only inside a function"
+ msgstr ""
+ 
+-#: c-parser.c:5172
++#: c-parser.c:5178
+ #, gcc-internal-format
+ msgid "ISO C forbids braced-groups within expressions"
+ msgstr ""
+ 
+-#: c-parser.c:5370
++#: c-parser.c:5376
+ #, gcc-internal-format
+ msgid "first argument to %<__builtin_choose_expr%> not a constant"
+ msgstr ""
+ 
+-#: c-parser.c:5539
++#: c-parser.c:5545
+ #, gcc-internal-format
+ msgid "compound literal has variable size"
+ msgstr ""
+ 
+-#: c-parser.c:5547
++#: c-parser.c:5553
+ #, gcc-internal-format
+ msgid "ISO C90 forbids compound literals"
+ msgstr ""
+ 
+-#: c-parser.c:6072
++#: c-parser.c:6076
+ #, gcc-internal-format
+ msgid "extra semicolon in method definition specified"
+ msgstr ""
+ 
+-#: c-parser.c:6616
++#: c-parser.c:6620
+ #, gcc-internal-format
+ msgid "%<#pragma omp barrier%> may only be used in compound statements"
+ msgstr ""
+ 
+-#: c-parser.c:6627
++#: c-parser.c:6631
+ #, gcc-internal-format
+ msgid "%<#pragma omp flush%> may only be used in compound statements"
+ msgstr ""
+ 
+-#: c-parser.c:6638
++#: c-parser.c:6642
+ #, gcc-internal-format
+ msgid "%<#pragma omp taskwait%> may only be used in compound statements"
+ msgstr ""
+ 
+-#: c-parser.c:6651
++#: c-parser.c:6655
+ #, gcc-internal-format
+ msgid ""
+ "%<#pragma omp section%> may only be used in %<#pragma omp sections%> "
+ "construct"
+ msgstr ""
+ 
+-#: c-parser.c:6657
++#: c-parser.c:6661
+ #, gcc-internal-format
+ msgid "%<#pragma GCC pch_preprocess%> must be first"
+ msgstr ""
+ 
+-#: c-parser.c:6815
++#: c-parser.c:6819
+ #, gcc-internal-format
+ msgid "too many %qs clauses"
+ msgstr ""
+ 
+-#: c-parser.c:6911
++#: c-parser.c:6915
+ #, gcc-internal-format
+ msgid "collapse argument needs positive constant integer expression"
+ msgstr ""
+ 
+-#: c-parser.c:6976
++#: c-parser.c:6980
+ #, gcc-internal-format
+ msgid "expected %<none%> or %<shared%>"
+ msgstr ""
+ 
+-#: c-parser.c:7019
++#: c-parser.c:7023
+ #, gcc-internal-format
+ msgid "expected %<(%>"
+ msgstr ""
+ 
+-#: c-parser.c:7063 c-parser.c:7247
++#: c-parser.c:7067 c-parser.c:7251
+ #, gcc-internal-format
+ msgid "expected integer expression"
+ msgstr ""
+ 
+-#: c-parser.c:7073
++#: c-parser.c:7077
+ #, gcc-internal-format
+ msgid "%<num_threads%> value must be positive"
+ msgstr ""
+ 
+-#: c-parser.c:7153
++#: c-parser.c:7157
+ #, gcc-internal-format
+ msgid "expected %<+%>, %<*%>, %<-%>, %<&%>, %<^%>, %<|%>, %<&&%>, or %<||%>"
+ msgstr ""
+ 
+-#: c-parser.c:7238
++#: c-parser.c:7242
+ #, gcc-internal-format
+ msgid "schedule %<runtime%> does not take a %<chunk_size%> parameter"
+ msgstr ""
+ 
+-#: c-parser.c:7242
++#: c-parser.c:7246
+ #, gcc-internal-format
+ msgid "schedule %<auto%> does not take a %<chunk_size%> parameter"
+ msgstr ""
+ 
+-#: c-parser.c:7260
++#: c-parser.c:7264
+ #, gcc-internal-format
+ msgid "invalid schedule kind"
+ msgstr ""
+ 
+-#: c-parser.c:7378
++#: c-parser.c:7382
+ #, gcc-internal-format
+ msgid "expected %<#pragma omp%> clause"
+ msgstr ""
+ 
+-#: c-parser.c:7387
++#: c-parser.c:7391
+ #, gcc-internal-format
+ msgid "%qs is not valid for %qs"
+ msgstr ""
+ 
+-#: c-parser.c:7488
++#: c-parser.c:7492
+ #, gcc-internal-format
+ msgid "invalid operator for %<#pragma omp atomic%>"
+ msgstr ""
+ 
+-#: c-parser.c:7541 c-parser.c:7561
++#: c-parser.c:7545 c-parser.c:7565
+ #, gcc-internal-format
+ msgid "expected %<(%> or end of line"
+ msgstr ""
+ 
+-#: c-parser.c:7593
++#: c-parser.c:7597
+ #, gcc-internal-format
+ msgid "for statement expected"
+ msgstr ""
+ 
+-#: c-parser.c:7643
++#: c-parser.c:7647
+ #, gcc-internal-format
+ msgid "expected iteration declaration or initialization"
+ msgstr ""
+ 
+-#: c-parser.c:7722
++#: c-parser.c:7726
+ #, gcc-internal-format
+ msgid "not enough perfectly nested loops"
+ msgstr ""
+ 
+-#: c-parser.c:7770
++#: c-parser.c:7774
+ #, gcc-internal-format
+ msgid "collapsed loops not perfectly nested"
+ msgstr ""
+ 
+-#: c-parser.c:7807 cp/pt.c:10533
++#: c-parser.c:7811 cp/pt.c:10534
+ #, gcc-internal-format
+ msgid "iteration variable %qD should not be firstprivate"
+ msgstr ""
+ 
+-#: c-parser.c:7957
++#: c-parser.c:7961
+ #, gcc-internal-format
+ msgid "expected %<#pragma omp section%> or %<}%>"
+ msgstr ""
+ 
+-#: c-parser.c:8227
++#: c-parser.c:8231
+ #, gcc-internal-format
+ msgid "%qD is not a variable"
+ msgstr ""
+ 
+-#: c-parser.c:8229 cp/semantics.c:3802
++#: c-parser.c:8233 cp/semantics.c:3804
+ #, gcc-internal-format
+ msgid "%qE declared %<threadprivate%> after first use"
+ msgstr ""
+ 
+-#: c-parser.c:8231 cp/semantics.c:3804
++#: c-parser.c:8235 cp/semantics.c:3806
+ #, gcc-internal-format
+ msgid "automatic variable %qE cannot be %<threadprivate%>"
+ msgstr ""
+ 
+-#: c-parser.c:8235 cp/semantics.c:3806
++#: c-parser.c:8239 cp/semantics.c:3808
+ #, gcc-internal-format
+ msgid "%<threadprivate%> %qE has incomplete type"
+ msgstr ""
+@@ -21930,109 +21932,109 @@
+ msgid "address of register variable %qD requested"
+ msgstr ""
+ 
+-#: c-typeck.c:3462
++#: c-typeck.c:3463
+ #, gcc-internal-format
+ msgid "non-lvalue array in conditional expression"
+ msgstr ""
+ 
+-#: c-typeck.c:3510
++#: c-typeck.c:3513
+ #, gcc-internal-format
+ msgid "signed and unsigned type in conditional expression"
+ msgstr ""
+ 
+-#: c-typeck.c:3518
++#: c-typeck.c:3521
+ #, gcc-internal-format
+ msgid "ISO C forbids conditional expr with only one void side"
+ msgstr ""
+ 
+-#: c-typeck.c:3533 c-typeck.c:3542
++#: c-typeck.c:3536 c-typeck.c:3545
+ #, gcc-internal-format
+ msgid "ISO C forbids conditional expr between %<void *%> and function pointer"
+ msgstr ""
+ 
+-#: c-typeck.c:3550
++#: c-typeck.c:3554
+ #, gcc-internal-format
+ msgid "pointer type mismatch in conditional expression"
+ msgstr ""
+ 
+-#: c-typeck.c:3558 c-typeck.c:3569
++#: c-typeck.c:3562 c-typeck.c:3573
+ #, gcc-internal-format
+ msgid "pointer/integer type mismatch in conditional expression"
+ msgstr ""
+ 
+-#: c-typeck.c:3583
++#: c-typeck.c:3587
+ #, gcc-internal-format
+ msgid "type mismatch in conditional expression"
+ msgstr ""
+ 
+-#: c-typeck.c:3624
++#: c-typeck.c:3628
+ #, gcc-internal-format
+ msgid "left-hand operand of comma expression has no effect"
+ msgstr ""
+ 
+-#: c-typeck.c:3661
++#: c-typeck.c:3665
+ #, gcc-internal-format
+ msgid "cast specifies array type"
+ msgstr ""
+ 
+-#: c-typeck.c:3667
++#: c-typeck.c:3671
+ #, gcc-internal-format
+ msgid "cast specifies function type"
+ msgstr ""
+ 
+-#: c-typeck.c:3683
++#: c-typeck.c:3687
+ #, gcc-internal-format
+ msgid "ISO C forbids casting nonscalar to the same type"
+ msgstr ""
+ 
+-#: c-typeck.c:3700
++#: c-typeck.c:3704
+ #, gcc-internal-format
+ msgid "ISO C forbids casts to union type"
+ msgstr ""
+ 
+-#: c-typeck.c:3707
++#: c-typeck.c:3711
+ #, gcc-internal-format
+ msgid "cast to union type from type not present in union"
+ msgstr ""
+ 
+-#: c-typeck.c:3753
++#: c-typeck.c:3757
+ #, gcc-internal-format
+ msgid "cast adds new qualifiers to function type"
+ msgstr ""
+ 
+ #. There are qualifiers present in IN_OTYPE that are not
+ #. present in IN_TYPE.
+-#: c-typeck.c:3758
++#: c-typeck.c:3762
+ #, gcc-internal-format
+ msgid "cast discards qualifiers from pointer target type"
+ msgstr ""
+ 
+-#: c-typeck.c:3774
++#: c-typeck.c:3778
+ #, gcc-internal-format
+ msgid "cast increases required alignment of target type"
+ msgstr ""
+ 
+-#: c-typeck.c:3785
++#: c-typeck.c:3789
+ #, gcc-internal-format
+ msgid "cast from pointer to integer of different size"
+ msgstr ""
+ 
+-#: c-typeck.c:3789
++#: c-typeck.c:3793
+ #, gcc-internal-format
+ msgid "cast from function call of type %qT to non-matching type %qT"
+ msgstr ""
+ 
+-#: c-typeck.c:3797
++#: c-typeck.c:3801
+ #, gcc-internal-format
+ msgid "cast to pointer from integer of different size"
+ msgstr ""
+ 
+-#: c-typeck.c:3811
++#: c-typeck.c:3815
+ #, gcc-internal-format
+ msgid "ISO C forbids conversion of function pointer to object pointer type"
+ msgstr ""
+ 
+-#: c-typeck.c:3820
++#: c-typeck.c:3824
+ #, gcc-internal-format
+ msgid "ISO C forbids conversion of object pointer to function pointer type"
+ msgstr ""
+@@ -22040,458 +22042,458 @@
+ #. This macro is used to emit diagnostics to ensure that all format
+ #. strings are complete sentences, visible to gettext and checked at
+ #. compile time.
+-#: c-typeck.c:4031 c-typeck.c:4464
++#: c-typeck.c:4035 c-typeck.c:4468
+ #, gcc-internal-format
+ msgid "expected %qT but argument is of type %qT"
+ msgstr ""
+ 
+-#: c-typeck.c:4110
++#: c-typeck.c:4114
+ #, gcc-internal-format
+ msgid "cannot pass rvalue to reference parameter"
+ msgstr ""
+ 
+-#: c-typeck.c:4224 c-typeck.c:4393
++#: c-typeck.c:4228 c-typeck.c:4397
+ #, gcc-internal-format
+ msgid ""
+ "passing argument %d of %qE makes qualified function pointer from unqualified"
+ msgstr ""
+ 
+-#: c-typeck.c:4227 c-typeck.c:4396
++#: c-typeck.c:4231 c-typeck.c:4400
+ #, gcc-internal-format
+ msgid "assignment makes qualified function pointer from unqualified"
+ msgstr ""
+ 
+-#: c-typeck.c:4230 c-typeck.c:4398
++#: c-typeck.c:4234 c-typeck.c:4402
+ #, gcc-internal-format
+ msgid "initialization makes qualified function pointer from unqualified"
+ msgstr ""
+ 
+-#: c-typeck.c:4233 c-typeck.c:4400
++#: c-typeck.c:4237 c-typeck.c:4404
+ #, gcc-internal-format
+ msgid "return makes qualified function pointer from unqualified"
+ msgstr ""
+ 
+-#: c-typeck.c:4238 c-typeck.c:4358
++#: c-typeck.c:4242 c-typeck.c:4362
+ #, gcc-internal-format
+ msgid "passing argument %d of %qE discards qualifiers from pointer target type"
+ msgstr ""
+ 
+-#: c-typeck.c:4240 c-typeck.c:4360
++#: c-typeck.c:4244 c-typeck.c:4364
+ #, gcc-internal-format
+ msgid "assignment discards qualifiers from pointer target type"
+ msgstr ""
+ 
+-#: c-typeck.c:4242 c-typeck.c:4362
++#: c-typeck.c:4246 c-typeck.c:4366
+ #, gcc-internal-format
+ msgid "initialization discards qualifiers from pointer target type"
+ msgstr ""
+ 
+-#: c-typeck.c:4244 c-typeck.c:4364
++#: c-typeck.c:4248 c-typeck.c:4368
+ #, gcc-internal-format
+ msgid "return discards qualifiers from pointer target type"
+ msgstr ""
+ 
+-#: c-typeck.c:4252
++#: c-typeck.c:4256
+ #, gcc-internal-format
+ msgid "ISO C prohibits argument conversion to union type"
+ msgstr ""
+ 
+-#: c-typeck.c:4285
++#: c-typeck.c:4289
+ #, gcc-internal-format
+ msgid "request for implicit conversion from %qT to %qT not permitted in C++"
+ msgstr ""
+ 
+-#: c-typeck.c:4297
++#: c-typeck.c:4301
+ #, gcc-internal-format
+ msgid "argument %d of %qE might be a candidate for a format attribute"
+ msgstr ""
+ 
+-#: c-typeck.c:4303
++#: c-typeck.c:4307
+ #, gcc-internal-format
+ msgid "assignment left-hand side might be a candidate for a format attribute"
+ msgstr ""
+ 
+-#: c-typeck.c:4308
++#: c-typeck.c:4312
+ #, gcc-internal-format
+ msgid ""
+ "initialization left-hand side might be a candidate for a format attribute"
+ msgstr ""
+ 
+-#: c-typeck.c:4313
++#: c-typeck.c:4317
+ #, gcc-internal-format
+ msgid "return type might be a candidate for a format attribute"
+ msgstr ""
+ 
+-#: c-typeck.c:4337
++#: c-typeck.c:4341
+ #, gcc-internal-format
+ msgid ""
+ "ISO C forbids passing argument %d of %qE between function pointer and %<void "
+ "*%>"
+ msgstr ""
+ 
+-#: c-typeck.c:4340
++#: c-typeck.c:4344
+ #, gcc-internal-format
+ msgid "ISO C forbids assignment between function pointer and %<void *%>"
+ msgstr ""
+ 
+-#: c-typeck.c:4342
++#: c-typeck.c:4346
+ #, gcc-internal-format
+ msgid "ISO C forbids initialization between function pointer and %<void *%>"
+ msgstr ""
+ 
+-#: c-typeck.c:4344
++#: c-typeck.c:4348
+ #, gcc-internal-format
+ msgid "ISO C forbids return between function pointer and %<void *%>"
+ msgstr ""
+ 
+-#: c-typeck.c:4375
++#: c-typeck.c:4379
+ #, gcc-internal-format
+ msgid "pointer targets in passing argument %d of %qE differ in signedness"
+ msgstr ""
+ 
+-#: c-typeck.c:4377
++#: c-typeck.c:4381
+ #, gcc-internal-format
+ msgid "pointer targets in assignment differ in signedness"
+ msgstr ""
+ 
+-#: c-typeck.c:4379
++#: c-typeck.c:4383
+ #, gcc-internal-format
+ msgid "pointer targets in initialization differ in signedness"
+ msgstr ""
+ 
+-#: c-typeck.c:4381
++#: c-typeck.c:4385
+ #, gcc-internal-format
+ msgid "pointer targets in return differ in signedness"
+ msgstr ""
+ 
+-#: c-typeck.c:4408
++#: c-typeck.c:4412
+ #, gcc-internal-format
+ msgid "passing argument %d of %qE from incompatible pointer type"
+ msgstr ""
+ 
+-#: c-typeck.c:4410
++#: c-typeck.c:4414
+ #, gcc-internal-format
+ msgid "assignment from incompatible pointer type"
+ msgstr ""
+ 
+-#: c-typeck.c:4411
++#: c-typeck.c:4415
+ #, gcc-internal-format
+ msgid "initialization from incompatible pointer type"
+ msgstr ""
+ 
+-#: c-typeck.c:4413
++#: c-typeck.c:4417
+ #, gcc-internal-format
+ msgid "return from incompatible pointer type"
+ msgstr ""
+ 
+-#: c-typeck.c:4431
++#: c-typeck.c:4435
+ #, gcc-internal-format
+ msgid "passing argument %d of %qE makes pointer from integer without a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:4433
++#: c-typeck.c:4437
+ #, gcc-internal-format
+ msgid "assignment makes pointer from integer without a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:4435
++#: c-typeck.c:4439
+ #, gcc-internal-format
+ msgid "initialization makes pointer from integer without a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:4437
++#: c-typeck.c:4441
+ #, gcc-internal-format
+ msgid "return makes pointer from integer without a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:4445
++#: c-typeck.c:4449
+ #, gcc-internal-format
+ msgid "passing argument %d of %qE makes integer from pointer without a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:4447
++#: c-typeck.c:4451
+ #, gcc-internal-format
+ msgid "assignment makes integer from pointer without a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:4449
++#: c-typeck.c:4453
+ #, gcc-internal-format
+ msgid "initialization makes integer from pointer without a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:4451
++#: c-typeck.c:4455
+ #, gcc-internal-format
+ msgid "return makes integer from pointer without a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:4467
++#: c-typeck.c:4471
+ #, gcc-internal-format
+ msgid "incompatible types when assigning to type %qT from type %qT"
+ msgstr ""
+ 
+-#: c-typeck.c:4471
++#: c-typeck.c:4475
+ #, gcc-internal-format
+ msgid "incompatible types when initializing type %qT using type %qT"
+ msgstr ""
+ 
+-#: c-typeck.c:4475
++#: c-typeck.c:4479
+ #, gcc-internal-format
+ msgid "incompatible types when returning type %qT but %qT was expected"
+ msgstr ""
+ 
+-#: c-typeck.c:4532
++#: c-typeck.c:4536
+ #, gcc-internal-format
+ msgid "traditional C rejects automatic aggregate initialization"
+ msgstr ""
+ 
+-#: c-typeck.c:4703 c-typeck.c:4719 c-typeck.c:4736
++#: c-typeck.c:4707 c-typeck.c:4723 c-typeck.c:4740
+ #, gcc-internal-format
+ msgid "(near initialization for %qs)"
+ msgstr ""
+ 
+-#: c-typeck.c:5291 cp/decl.c:5158
++#: c-typeck.c:5295 cp/decl.c:5161
+ #, gcc-internal-format
+ msgid "opaque vector types cannot be initialized"
+ msgstr ""
+ 
+-#: c-typeck.c:5916
++#: c-typeck.c:5920
+ #, gcc-internal-format
+ msgid "unknown field %qE specified in initializer"
+ msgstr ""
+ 
+-#: c-typeck.c:6836
++#: c-typeck.c:6840
+ #, gcc-internal-format
+ msgid "traditional C rejects initialization of unions"
+ msgstr ""
+ 
+-#: c-typeck.c:7147
++#: c-typeck.c:7151
+ #, gcc-internal-format
+ msgid "jump into statement expression"
+ msgstr ""
+ 
+-#: c-typeck.c:7153
++#: c-typeck.c:7157
+ #, gcc-internal-format
+ msgid "jump into scope of identifier with variably modified type"
+ msgstr ""
+ 
+-#: c-typeck.c:7189
++#: c-typeck.c:7193
+ #, gcc-internal-format
+ msgid "ISO C forbids %<goto *expr;%>"
+ msgstr ""
+ 
+-#: c-typeck.c:7204 cp/typeck.c:6820
++#: c-typeck.c:7208 cp/typeck.c:6820
+ #, gcc-internal-format
+ msgid "function declared %<noreturn%> has a %<return%> statement"
+ msgstr ""
+ 
+-#: c-typeck.c:7213
++#: c-typeck.c:7217
+ #, gcc-internal-format
+ msgid "%<return%> with no value, in function returning non-void"
+ msgstr ""
+ 
+-#: c-typeck.c:7223
++#: c-typeck.c:7227
+ #, gcc-internal-format
+ msgid "%<return%> with a value, in function returning void"
+ msgstr ""
+ 
+-#: c-typeck.c:7225
++#: c-typeck.c:7229
+ #, gcc-internal-format
+ msgid "ISO C forbids %<return%> with expression, in function returning void"
+ msgstr ""
+ 
+-#: c-typeck.c:7284
++#: c-typeck.c:7288
+ #, gcc-internal-format
+ msgid "function returns address of local variable"
+ msgstr ""
+ 
+-#: c-typeck.c:7359 cp/semantics.c:952
++#: c-typeck.c:7363 cp/semantics.c:952
+ #, gcc-internal-format
+ msgid "switch quantity not an integer"
+ msgstr ""
+ 
+-#: c-typeck.c:7371
++#: c-typeck.c:7375
+ #, gcc-internal-format
+ msgid "%<long%> switch expression not converted to %<int%> in ISO C"
+ msgstr ""
+ 
+-#: c-typeck.c:7414
++#: c-typeck.c:7418
+ #, gcc-internal-format
+ msgid ""
+ "case label in statement expression not containing enclosing switch statement"
+ msgstr ""
+ 
+-#: c-typeck.c:7417
++#: c-typeck.c:7421
+ #, gcc-internal-format
+ msgid ""
+ "%<default%> label in statement expression not containing enclosing switch "
+ "statement"
+ msgstr ""
+ 
+-#: c-typeck.c:7423
++#: c-typeck.c:7427
+ #, gcc-internal-format
+ msgid ""
+ "case label in scope of identifier with variably modified type not containing "
+ "enclosing switch statement"
+ msgstr ""
+ 
+-#: c-typeck.c:7426
++#: c-typeck.c:7430
+ #, gcc-internal-format
+ msgid ""
+ "%<default%> label in scope of identifier with variably modified type not "
+ "containing enclosing switch statement"
+ msgstr ""
+ 
+-#: c-typeck.c:7430
++#: c-typeck.c:7434
+ #, gcc-internal-format
+ msgid "case label not within a switch statement"
+ msgstr ""
+ 
+-#: c-typeck.c:7432
++#: c-typeck.c:7436
+ #, gcc-internal-format
+ msgid "%<default%> label not within a switch statement"
+ msgstr ""
+ 
+-#: c-typeck.c:7509
++#: c-typeck.c:7513
+ #, gcc-internal-format
+ msgid "%Hsuggest explicit braces to avoid ambiguous %<else%>"
+ msgstr ""
+ 
+-#: c-typeck.c:7618 cp/cp-gimplify.c:92
++#: c-typeck.c:7622 cp/cp-gimplify.c:92
+ #, gcc-internal-format
+ msgid "break statement not within loop or switch"
+ msgstr ""
+ 
+-#: c-typeck.c:7620
++#: c-typeck.c:7624
+ #, gcc-internal-format
+ msgid "continue statement not within a loop"
+ msgstr ""
+ 
+-#: c-typeck.c:7625
++#: c-typeck.c:7629
+ #, gcc-internal-format
+ msgid "break statement used with OpenMP for loop"
+ msgstr ""
+ 
+-#: c-typeck.c:7651
++#: c-typeck.c:7655
+ #, gcc-internal-format
+ msgid "%Hstatement with no effect"
+ msgstr ""
+ 
+-#: c-typeck.c:7673
++#: c-typeck.c:7677
+ #, gcc-internal-format
+ msgid "expression statement has incomplete type"
+ msgstr ""
+ 
+-#: c-typeck.c:8245 cp/typeck.c:3506
++#: c-typeck.c:8249 cp/typeck.c:3506
+ #, gcc-internal-format
+ msgid "right shift count is negative"
+ msgstr ""
+ 
+-#: c-typeck.c:8252 cp/typeck.c:3512
++#: c-typeck.c:8256 cp/typeck.c:3512
+ #, gcc-internal-format
+ msgid "right shift count >= width of type"
+ msgstr ""
+ 
+-#: c-typeck.c:8274 cp/typeck.c:3533
++#: c-typeck.c:8278 cp/typeck.c:3533
+ #, gcc-internal-format
+ msgid "left shift count is negative"
+ msgstr ""
+ 
+-#: c-typeck.c:8277 cp/typeck.c:3538
++#: c-typeck.c:8281 cp/typeck.c:3538
+ #, gcc-internal-format
+ msgid "left shift count >= width of type"
+ msgstr ""
+ 
+-#: c-typeck.c:8296 cp/typeck.c:3584
++#: c-typeck.c:8300 cp/typeck.c:3584
+ #, gcc-internal-format
+ msgid "comparing floating point with == or != is unsafe"
+ msgstr ""
+ 
+-#: c-typeck.c:8320 c-typeck.c:8327
++#: c-typeck.c:8324 c-typeck.c:8331
+ #, gcc-internal-format
+ msgid "ISO C forbids comparison of %<void *%> with function pointer"
+ msgstr ""
+ 
+-#: c-typeck.c:8334 c-typeck.c:8396
++#: c-typeck.c:8338 c-typeck.c:8400
+ #, gcc-internal-format
+ msgid "comparison of distinct pointer types lacks a cast"
+ msgstr ""
+ 
+-#: c-typeck.c:8344 c-typeck.c:8353 cp/typeck.c:3607 cp/typeck.c:3619
++#: c-typeck.c:8348 c-typeck.c:8357 cp/typeck.c:3607 cp/typeck.c:3619
+ #, gcc-internal-format
+ msgid "the address of %qD will never be NULL"
+ msgstr ""
+ 
+-#: c-typeck.c:8360 c-typeck.c:8365 c-typeck.c:8418 c-typeck.c:8423
++#: c-typeck.c:8364 c-typeck.c:8369 c-typeck.c:8422 c-typeck.c:8427
+ #, gcc-internal-format
+ msgid "comparison between pointer and integer"
+ msgstr ""
+ 
+-#: c-typeck.c:8387
++#: c-typeck.c:8391
+ #, gcc-internal-format
+ msgid "comparison of complete and incomplete pointers"
+ msgstr ""
+ 
+-#: c-typeck.c:8389
++#: c-typeck.c:8393
+ #, gcc-internal-format
+ msgid "ISO C forbids ordered comparisons of pointers to functions"
+ msgstr ""
+ 
+-#: c-typeck.c:8404 c-typeck.c:8407 c-typeck.c:8413
++#: c-typeck.c:8408 c-typeck.c:8411 c-typeck.c:8417
+ #, gcc-internal-format
+ msgid "ordered comparison of pointer with integer zero"
+ msgstr ""
+ 
+-#: c-typeck.c:8591
++#: c-typeck.c:8595
+ #, gcc-internal-format
+ msgid "used array that cannot be converted to pointer where scalar is required"
+ msgstr ""
+ 
+-#: c-typeck.c:8595
++#: c-typeck.c:8599
+ #, gcc-internal-format
+ msgid "used struct type value where scalar is required"
+ msgstr ""
+ 
+-#: c-typeck.c:8599
++#: c-typeck.c:8603
+ #, gcc-internal-format
+ msgid "used union type value where scalar is required"
+ msgstr ""
+ 
+-#: c-typeck.c:8735 cp/semantics.c:3685
++#: c-typeck.c:8739 cp/semantics.c:3687
+ #, gcc-internal-format
+ msgid "%qE has invalid type for %<reduction%>"
+ msgstr ""
+ 
+-#: c-typeck.c:8769 cp/semantics.c:3698
++#: c-typeck.c:8773 cp/semantics.c:3700
+ #, gcc-internal-format
+ msgid "%qE has invalid type for %<reduction(%s)%>"
+ msgstr ""
+ 
+-#: c-typeck.c:8785 cp/semantics.c:3708
++#: c-typeck.c:8789 cp/semantics.c:3710
+ #, gcc-internal-format
+ msgid "%qE must be %<threadprivate%> for %<copyin%>"
+ msgstr ""
+ 
+-#: c-typeck.c:8794 cp/semantics.c:3505
++#: c-typeck.c:8798 cp/semantics.c:3507
+ #, gcc-internal-format
+ msgid "%qE is not a variable in clause %qs"
+ msgstr ""
+ 
+-#: c-typeck.c:8801 c-typeck.c:8821 c-typeck.c:8841
++#: c-typeck.c:8805 c-typeck.c:8825 c-typeck.c:8845
+ #, gcc-internal-format
+ msgid "%qE appears more than once in data clauses"
+ msgstr ""
+ 
+-#: c-typeck.c:8815 cp/semantics.c:3528
++#: c-typeck.c:8819 cp/semantics.c:3530
+ #, gcc-internal-format
+ msgid "%qE is not a variable in clause %<firstprivate%>"
+ msgstr ""
+ 
+-#: c-typeck.c:8835 cp/semantics.c:3550
++#: c-typeck.c:8839 cp/semantics.c:3552
+ #, gcc-internal-format
+ msgid "%qE is not a variable in clause %<lastprivate%>"
+ msgstr ""
+ 
+-#: c-typeck.c:8895 cp/semantics.c:3749
++#: c-typeck.c:8899 cp/semantics.c:3751
+ #, gcc-internal-format
+ msgid "%qE is predetermined %qs for %qs"
+ msgstr ""
+@@ -23629,18 +23631,18 @@
+ "critical region may not be nested inside a critical region with the same name"
+ msgstr ""
+ 
+-#: omp-low.c:6629 cp/decl.c:2680
++#: omp-low.c:6682 cp/decl.c:2680
+ #, gcc-internal-format
+ msgid "invalid exit from OpenMP structured block"
+ msgstr ""
+ 
+-#: omp-low.c:6631 omp-low.c:6636
++#: omp-low.c:6684 omp-low.c:6689
+ #, gcc-internal-format
+ msgid "invalid entry to OpenMP structured block"
+ msgstr ""
+ 
+ #. Otherwise, be vague and lazy, but efficient.
+-#: omp-low.c:6639
++#: omp-low.c:6692
+ #, gcc-internal-format
+ msgid "invalid branch to/from an OpenMP structured block"
+ msgstr ""
+@@ -23663,142 +23665,137 @@
+ msgstr ""
+ 
+ #. Eventually this should become a hard error IMO.
+-#: opts.c:448
++#: opts.c:442
+ #, gcc-internal-format
+ msgid "command line option \"%s\" is valid for %s but not for %s"
+ msgstr ""
+ 
+-#: opts.c:479 opts.c:807
++#: opts.c:473 opts.c:769
+ #, gcc-internal-format
+ msgid "unrecognized command line option \"%s\""
+ msgstr ""
+ 
+-#: opts.c:540
++#: opts.c:534
+ #, gcc-internal-format
+ msgid "command line option %qs is not supported by this configuration"
+ msgstr ""
+ 
+-#: opts.c:593
++#: opts.c:587
+ #, gcc-internal-format
+ msgid "missing argument to \"%s\""
+ msgstr ""
+ 
+-#: opts.c:603
++#: opts.c:597
+ #, gcc-internal-format
+ msgid "argument to \"%s\" should be a non-negative integer"
+ msgstr ""
+ 
+-#: opts.c:769
+-#, gcc-internal-format
+-msgid "disallowed call to %qs"
+-msgstr ""
+-
+-#: opts.c:1031
++#: opts.c:993
+ #, gcc-internal-format
+ msgid "Section anchors must be disabled when unit-at-a-time is disabled."
+ msgstr ""
+ 
+-#: opts.c:1035
++#: opts.c:997
+ #, gcc-internal-format
+ msgid "Toplevel reorder must be disabled when unit-at-a-time is disabled."
+ msgstr ""
+ 
+-#: opts.c:1050
++#: opts.c:1012
+ #, gcc-internal-format
+ msgid "section anchors must be disabled when toplevel reorder is disabled"
+ msgstr ""
+ 
+-#: opts.c:1080
++#: opts.c:1042
+ #, gcc-internal-format
+ msgid "-freorder-blocks-and-partition does not work with exceptions"
+ msgstr ""
+ 
+-#: opts.c:1091
++#: opts.c:1053
+ #, gcc-internal-format
+ msgid "-freorder-blocks-and-partition does not support unwind info"
+ msgstr ""
+ 
+-#: opts.c:1105
++#: opts.c:1067
+ #, gcc-internal-format
+ msgid "-freorder-blocks-and-partition does not work on this architecture"
+ msgstr ""
+ 
+-#: opts.c:1119
++#: opts.c:1081
+ #, gcc-internal-format
+ msgid "-fira-algorithm=CB does not work on this architecture"
+ msgstr ""
+ 
+-#: opts.c:1428
++#: opts.c:1390
+ #, gcc-internal-format
+ msgid "unrecognized include_flags 0x%x passed to print_specific_help"
+ msgstr ""
+ 
+-#: opts.c:1809
++#: opts.c:1765
+ #, gcc-internal-format
+ msgid "structure alignment must be a small power of two, not %d"
+ msgstr ""
+ 
+-#: opts.c:1896
++#: opts.c:1852
+ #, gcc-internal-format
+ msgid "unrecognized visibility value \"%s\""
+ msgstr ""
+ 
+-#: opts.c:1954
++#: opts.c:1910
+ #, gcc-internal-format
+ msgid "unknown stack check parameter \"%s\""
+ msgstr ""
+ 
+-#: opts.c:1980
++#: opts.c:1936
+ #, gcc-internal-format
+ msgid "unrecognized register name \"%s\""
+ msgstr ""
+ 
+-#: opts.c:2004
++#: opts.c:1960
+ #, gcc-internal-format
+ msgid "unknown tls-model \"%s\""
+ msgstr ""
+ 
+-#: opts.c:2013
++#: opts.c:1969
+ #, gcc-internal-format
+ msgid "unknown ira algorithm \"%s\""
+ msgstr ""
+ 
+-#: opts.c:2024
++#: opts.c:1980
+ #, gcc-internal-format
+ msgid "unknown ira region \"%s\""
+ msgstr ""
+ 
+-#: opts.c:2127
++#: opts.c:2083
+ #, gcc-internal-format
+ msgid "%s: --param arguments should be of the form NAME=VALUE"
+ msgstr ""
+ 
+-#: opts.c:2132
++#: opts.c:2088
+ #, gcc-internal-format
+ msgid "invalid --param value %qs"
+ msgstr ""
+ 
+-#: opts.c:2250
++#: opts.c:2206
+ #, gcc-internal-format
+ msgid "target system does not support debug output"
+ msgstr ""
+ 
+-#: opts.c:2257
++#: opts.c:2213
+ #, gcc-internal-format
+ msgid "debug format \"%s\" conflicts with prior selection"
+ msgstr ""
+ 
+-#: opts.c:2273
++#: opts.c:2229
+ #, gcc-internal-format
+ msgid "unrecognised debug output level \"%s\""
+ msgstr ""
+ 
+-#: opts.c:2275
++#: opts.c:2231
+ #, gcc-internal-format
+ msgid "debug output level %s is too high"
+ msgstr ""
+ 
+-#: opts.c:2357
++#: opts.c:2313
+ #, gcc-internal-format
+ msgid "-Werror=%s: No option -%s"
+ msgstr ""
+@@ -25319,9 +25316,9 @@
+ msgstr ""
+ 
+ #: tree.c:4076 tree.c:4088 tree.c:4098 config/darwin.c:1437
+-#: config/arm/arm.c:3294 config/arm/arm.c:3322 config/avr/avr.c:4791
++#: config/arm/arm.c:3294 config/arm/arm.c:3322 config/avr/avr.c:4804
+ #: config/h8300/h8300.c:5283 config/h8300/h8300.c:5307 config/i386/i386.c:4179
+-#: config/i386/i386.c:26410 config/ia64/ia64.c:621
++#: config/i386/i386.c:26447 config/ia64/ia64.c:621
+ #: config/m68hc11/m68hc11.c:1118 config/rs6000/rs6000.c:20739
+ #: config/sh/symbian.c:408 config/sh/symbian.c:415
+ #, gcc-internal-format
+@@ -25768,7 +25765,7 @@
+ #. coalesced sections.  Weak aliases (or any other kind of aliases) are
+ #. not supported.  Weak symbols that aren't visible outside the .s file
+ #. are not supported.
+-#: config/darwin.h:452
++#: config/darwin.h:456
+ #, gcc-internal-format
+ msgid "alias definitions not supported in Mach-O; ignored"
+ msgstr ""
+@@ -26020,9 +26017,9 @@
+ msgid "unable to use '%s' for PIC register"
+ msgstr ""
+ 
+-#: config/arm/arm.c:3262 config/arm/arm.c:3280 config/avr/avr.c:4811
+-#: config/avr/avr.c:4827 config/bfin/bfin.c:5228 config/h8300/h8300.c:5259
+-#: config/i386/i386.c:4141 config/i386/i386.c:26355
++#: config/arm/arm.c:3262 config/arm/arm.c:3280 config/avr/avr.c:4824
++#: config/avr/avr.c:4840 config/bfin/bfin.c:5228 config/h8300/h8300.c:5259
++#: config/i386/i386.c:4141 config/i386/i386.c:26392
+ #: config/m68hc11/m68hc11.c:1155 config/m68k/m68k.c:783
+ #: config/mcore/mcore.c:3034 config/mips/mips.c:1223 config/mips/mips.c:1225
+ #: config/rs6000/rs6000.c:20665 config/sh/sh.c:8129 config/sh/sh.c:8147
+@@ -26079,27 +26076,42 @@
+ msgid "static variable %q+D is marked dllimport"
+ msgstr ""
+ 
+-#: config/avr/avr.c:4613
++#: config/avr/avr.c:399
++#, gcc-internal-format
++msgid "the -mno-tablejump switch is deprecated"
++msgstr ""
++
++#: config/avr/avr.c:400
++#, gcc-internal-format
++msgid "GCC 4.4 is the last release with this switch"
++msgstr ""
++
++#: config/avr/avr.c:401
++#, gcc-internal-format
++msgid "use the -fno-jump-tables switch instead"
++msgstr ""
++
++#: config/avr/avr.c:4626
+ #, gcc-internal-format
+ msgid "%qs appears to be a misspelled interrupt handler"
+ msgstr ""
+ 
+-#: config/avr/avr.c:4622
++#: config/avr/avr.c:4635
+ #, gcc-internal-format
+ msgid "%qs appears to be a misspelled signal handler"
+ msgstr ""
+ 
+-#: config/avr/avr.c:4784
++#: config/avr/avr.c:4797
+ #, gcc-internal-format
+ msgid "only initialized variables can be placed into program memory area"
+ msgstr ""
+ 
+-#: config/avr/avr.c:4918
++#: config/avr/avr.c:4931
+ #, gcc-internal-format
+ msgid "only uninitialized variables can be placed in the .noinit section"
+ msgstr ""
+ 
+-#: config/avr/avr.c:4932
++#: config/avr/avr.c:4945
+ #, gcc-internal-format
+ msgid "MCU %qs supported for assembler only"
+ msgstr ""
+@@ -26649,127 +26661,139 @@
+ msgid "AVX vector argument without AVX enabled changes the ABI"
+ msgstr ""
+ 
+-#: config/i386/i386.c:5039
++#: config/i386/i386.c:4942
++#, gcc-internal-format
++msgid ""
++"The ABI of passing struct with a flexible array member has changed in GCC 4.4"
++msgstr ""
++
++#: config/i386/i386.c:5061
+ #, gcc-internal-format
+ msgid "The ABI of passing union with long double has changed in GCC 4.4"
+ msgstr ""
+ 
+-#: config/i386/i386.c:5284
++#: config/i386/i386.c:5176
++#, gcc-internal-format
++msgid ""
++"The ABI of passing structure with complex float member has changed in GCC 4.4"
++msgstr ""
++
++#: config/i386/i386.c:5321
+ #, gcc-internal-format
+ msgid "SSE register return with SSE disabled"
+ msgstr ""
+ 
+-#: config/i386/i386.c:5290
++#: config/i386/i386.c:5327
+ #, gcc-internal-format
+ msgid "SSE register argument with SSE disabled"
+ msgstr ""
+ 
+-#: config/i386/i386.c:5306
++#: config/i386/i386.c:5343
+ #, gcc-internal-format
+ msgid "x87 register return with x87 disabled"
+ msgstr ""
+ 
+-#: config/i386/i386.c:5672
++#: config/i386/i386.c:5709
+ #, gcc-internal-format
+ msgid "SSE vector argument without SSE enabled changes the ABI"
+ msgstr ""
+ 
+-#: config/i386/i386.c:5709
++#: config/i386/i386.c:5746
+ #, gcc-internal-format
+ msgid "MMX vector argument without MMX enabled changes the ABI"
+ msgstr ""
+ 
+-#: config/i386/i386.c:6310
++#: config/i386/i386.c:6347
+ #, gcc-internal-format
+ msgid "SSE vector return without SSE enabled changes the ABI"
+ msgstr ""
+ 
+-#: config/i386/i386.c:6320
++#: config/i386/i386.c:6357
+ #, gcc-internal-format
+ msgid "MMX vector return without MMX enabled changes the ABI"
+ msgstr ""
+ 
+-#: config/i386/i386.c:10587
++#: config/i386/i386.c:10624
+ #, gcc-internal-format
+ msgid "extended registers have no high halves"
+ msgstr ""
+ 
+-#: config/i386/i386.c:10602
++#: config/i386/i386.c:10639
+ #, gcc-internal-format
+ msgid "unsupported operand size for extended register"
+ msgstr ""
+ 
+-#: config/i386/i386.c:23572
++#: config/i386/i386.c:23609
+ #, gcc-internal-format
+ msgid "last argument must be an immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:23865
++#: config/i386/i386.c:23902
+ #, gcc-internal-format
+ msgid "the fifth argument must be a 8-bit immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:23960
++#: config/i386/i386.c:23997
+ #, gcc-internal-format
+ msgid "the third argument must be a 8-bit immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24300
++#: config/i386/i386.c:24337
+ #, gcc-internal-format
+ msgid "the last argument must be a 4-bit immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24305
++#: config/i386/i386.c:24342
+ #, gcc-internal-format
+ msgid "the last argument must be a 2-bit immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24314
++#: config/i386/i386.c:24351
+ #, gcc-internal-format
+ msgid "the last argument must be a 1-bit immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24323
++#: config/i386/i386.c:24360
+ #, gcc-internal-format
+ msgid "the last argument must be a 5-bit immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24332
++#: config/i386/i386.c:24369
+ #, gcc-internal-format
+ msgid "the next to last argument must be an 8-bit immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24336 config/i386/i386.c:24514
++#: config/i386/i386.c:24373 config/i386/i386.c:24551
+ #, gcc-internal-format
+ msgid "the last argument must be an 8-bit immediate"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24572 config/rs6000/rs6000.c:8540
++#: config/i386/i386.c:24609 config/rs6000/rs6000.c:8540
+ #, gcc-internal-format
+ msgid "selector must be an integer constant in the range 0..%wi"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24715
++#: config/i386/i386.c:24752
+ #, gcc-internal-format
+ msgid "%qE needs unknown isa option"
+ msgstr ""
+ 
+-#: config/i386/i386.c:24719
++#: config/i386/i386.c:24756
+ #, gcc-internal-format
+ msgid "%qE needs isa option %s"
+ msgstr ""
+ 
+-#: config/i386/i386.c:26362
++#: config/i386/i386.c:26399
+ #, gcc-internal-format
+ msgid "%qs attribute only available for 64-bit"
+ msgstr ""
+ 
+-#: config/i386/i386.c:26373 config/i386/i386.c:26382
++#: config/i386/i386.c:26410 config/i386/i386.c:26419
+ #, gcc-internal-format
+ msgid "ms_abi and sysv_abi attributes are not compatible"
+ msgstr ""
+ 
+-#: config/i386/i386.c:26420 config/rs6000/rs6000.c:20748
++#: config/i386/i386.c:26457 config/rs6000/rs6000.c:20748
+ #, gcc-internal-format
+ msgid "%qs incompatible attribute ignored"
+ msgstr ""
+@@ -26857,22 +26881,32 @@
+ msgid "%s-%s is an empty range"
+ msgstr ""
+ 
+-#: config/ia64/ia64.c:5223
++#: config/ia64/ia64.c:5225
+ #, gcc-internal-format
+ msgid "bad value %<%s%> for -mtls-size= switch"
+ msgstr ""
+ 
+-#: config/ia64/ia64.c:5251
++#: config/ia64/ia64.c:5254
++#, gcc-internal-format
++msgid "value %<%s%> for -mtune= switch is deprecated"
++msgstr ""
++
++#: config/ia64/ia64.c:5256
++#, gcc-internal-format
++msgid "GCC 4.4 is the last release with Itanium1 tuning support"
++msgstr ""
++
++#: config/ia64/ia64.c:5263
+ #, gcc-internal-format
+ msgid "bad value %<%s%> for -mtune= switch"
+ msgstr ""
+ 
+-#: config/ia64/ia64.c:5270
++#: config/ia64/ia64.c:5282
+ #, gcc-internal-format
+ msgid "not yet implemented: latency-optimized inline square root"
+ msgstr ""
+ 
+-#: config/ia64/ia64.c:10535
++#: config/ia64/ia64.c:10547
+ #, gcc-internal-format
+ msgid "version attribute is not a string"
+ msgstr ""
+@@ -27373,37 +27407,37 @@
+ msgid "junk at end of #pragma longcall"
+ msgstr ""
+ 
+-#: config/rs6000/rs6000-c.c:2989
++#: config/rs6000/rs6000-c.c:3001
+ #, gcc-internal-format
+ msgid "%s only accepts %d arguments"
+ msgstr ""
+ 
+-#: config/rs6000/rs6000-c.c:2994
++#: config/rs6000/rs6000-c.c:3006
+ #, gcc-internal-format
+ msgid "%s only accepts 1 argument"
+ msgstr ""
+ 
+-#: config/rs6000/rs6000-c.c:2999 config/rs6000/rs6000-c.c:3006
++#: config/rs6000/rs6000-c.c:3011 config/rs6000/rs6000-c.c:3018
+ #, gcc-internal-format
+ msgid "%s only accepts 2 arguments"
+ msgstr ""
+ 
+-#: config/rs6000/rs6000-c.c:3067
++#: config/rs6000/rs6000-c.c:3079
+ #, gcc-internal-format
+ msgid "vec_extract only accepts 2 arguments"
+ msgstr ""
+ 
+-#: config/rs6000/rs6000-c.c:3124
++#: config/rs6000/rs6000-c.c:3136
+ #, gcc-internal-format
+ msgid "vec_insert only accepts 3 arguments"
+ msgstr ""
+ 
+-#: config/rs6000/rs6000-c.c:3206
++#: config/rs6000/rs6000-c.c:3218
+ #, gcc-internal-format
+ msgid "passing arg %d of %qE discards qualifiers frompointer target type"
+ msgstr ""
+ 
+-#: config/rs6000/rs6000-c.c:3249
++#: config/rs6000/rs6000-c.c:3261
+ #, gcc-internal-format
+ msgid "invalid parameter combination for AltiVec intrinsic"
+ msgstr ""
+@@ -27714,7 +27748,7 @@
+ msgid "-m64 not supported in this configuration"
+ msgstr ""
+ 
+-#: config/rs6000/linux64.h:108
++#: config/rs6000/linux64.h:113
+ #, gcc-internal-format
+ msgid "-m64 requires a PowerPC64 cpu"
+ msgstr ""
+@@ -27731,7 +27765,7 @@
+ #. Number of bytes into the frame return addresses can be found.  See
+ #. rs6000_stack_info in rs6000.c for more information on how the different
+ #. abi's store the return address.
+-#: config/rs6000/rs6000.h:1643
++#: config/rs6000/rs6000.h:1648
+ #, gcc-internal-format
+ msgid "RETURN_ADDRESS_OFFSET not supported"
+ msgstr ""
+@@ -27744,57 +27778,57 @@
+ #.
+ #. The macro SUBTARGET_OVERRIDE_OPTIONS is provided for subtargets, to
+ #. get control.
+-#: config/rs6000/sysv4.h:129
++#: config/rs6000/sysv4.h:134
+ #, gcc-internal-format
+ msgid "bad value for -mcall-%s"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:145
++#: config/rs6000/sysv4.h:150
+ #, gcc-internal-format
+ msgid "bad value for -msdata=%s"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:162
++#: config/rs6000/sysv4.h:167
+ #, gcc-internal-format
+ msgid "-mrelocatable and -msdata=%s are incompatible"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:171
++#: config/rs6000/sysv4.h:176
+ #, gcc-internal-format
+ msgid "-f%s and -msdata=%s are incompatible"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:180
++#: config/rs6000/sysv4.h:185
+ #, gcc-internal-format
+ msgid "-msdata=%s and -mcall-%s are incompatible"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:189
++#: config/rs6000/sysv4.h:194
+ #, gcc-internal-format
+ msgid "-mrelocatable and -mno-minimal-toc are incompatible"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:195
++#: config/rs6000/sysv4.h:200
+ #, gcc-internal-format
+ msgid "-mrelocatable and -mcall-%s are incompatible"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:202
++#: config/rs6000/sysv4.h:207
+ #, gcc-internal-format
+ msgid "-fPIC and -mcall-%s are incompatible"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:209
++#: config/rs6000/sysv4.h:214
+ #, gcc-internal-format
+ msgid "-mcall-aixdesc must be big endian"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:214
++#: config/rs6000/sysv4.h:219
+ #, gcc-internal-format
+ msgid "-msecure-plt not supported by your assembler"
+ msgstr ""
+ 
+-#: config/rs6000/sysv4.h:232
++#: config/rs6000/sysv4.h:237
+ #, gcc-internal-format
+ msgid "-m%s not supported in this configuration"
+ msgstr ""
+@@ -27966,7 +28000,7 @@
+ msgid "%s %q+D %s after being referenced with dllimport linkage"
+ msgstr ""
+ 
+-#: config/sh/symbian.c:891 cp/tree.c:2843
++#: config/sh/symbian.c:891 cp/tree.c:2842
+ #, gcc-internal-format
+ msgid "lang_* check: failed in %s, at %s:%d"
+ msgstr ""
+@@ -28493,76 +28527,91 @@
+ msgid "%qT is not an accessible base of %qT"
+ msgstr ""
+ 
+-#: cp/call.c:5522
++#: cp/call.c:5538
+ #, gcc-internal-format
+ msgid "could not find class$ field in java interface type %qT"
+ msgstr ""
+ 
+-#: cp/call.c:5765
++#: cp/call.c:5781
+ #, gcc-internal-format
+ msgid "call to non-function %qD"
+ msgstr ""
+ 
+-#: cp/call.c:5904
++#: cp/call.c:5920
+ #, gcc-internal-format
+ msgid "no matching function for call to %<%T::%s(%A)%#V%>"
+ msgstr ""
+ 
+-#: cp/call.c:5925
++#: cp/call.c:5941
+ #, gcc-internal-format
+ msgid "call of overloaded %<%s(%A)%> is ambiguous"
+ msgstr ""
+ 
+-#: cp/call.c:5954
++#: cp/call.c:5970
+ #, gcc-internal-format
+ msgid "cannot call member function %qD without object"
+ msgstr ""
+ 
+-#: cp/call.c:6642
++#: cp/call.c:6658
+ #, gcc-internal-format
+ msgid "passing %qT chooses %qT over %qT"
+ msgstr ""
+ 
+-#: cp/call.c:6644 cp/name-lookup.c:4468 cp/name-lookup.c:4913
++#: cp/call.c:6660 cp/name-lookup.c:4469 cp/name-lookup.c:4914
+ #, gcc-internal-format
+ msgid "  in call to %qD"
+ msgstr ""
+ 
+-#: cp/call.c:6701
++#: cp/call.c:6717
+ #, gcc-internal-format
+ msgid "choosing %qD over %qD"
+ msgstr ""
+ 
+-#: cp/call.c:6702
++#: cp/call.c:6718
+ #, gcc-internal-format
+ msgid "  for conversion from %qT to %qT"
+ msgstr ""
+ 
+-#: cp/call.c:6705
++#: cp/call.c:6721
+ #, gcc-internal-format
+ msgid "  because conversion sequence for the argument is better"
+ msgstr ""
+ 
+-#: cp/call.c:6821
++#: cp/call.c:6839
++#, gcc-internal-format
++msgid "default argument mismatch in overload resolution"
++msgstr ""
++
++#: cp/call.c:6842
++#, gcc-internal-format
++msgid " candidate 1: %q+#F"
++msgstr ""
++
++#: cp/call.c:6844
++#, gcc-internal-format
++msgid " candidate 2: %q+#F"
++msgstr ""
++
++#: cp/call.c:6882
+ #, gcc-internal-format
+ msgid ""
+ "ISO C++ says that these are ambiguous, even though the worst conversion for "
+ "the first is better than the worst conversion for the second:"
+ msgstr ""
+ 
+-#: cp/call.c:6965
++#: cp/call.c:7026
+ #, gcc-internal-format
+ msgid "could not convert %qE to %qT"
+ msgstr ""
+ 
+-#: cp/call.c:7171
++#: cp/call.c:7232
+ #, gcc-internal-format
+ msgid ""
+ "invalid initialization of non-const reference of type %qT from a temporary "
+ "of type %qT"
+ msgstr ""
+ 
+-#: cp/call.c:7175
++#: cp/call.c:7236
+ #, gcc-internal-format
+ msgid ""
+ "invalid initialization of reference of type %qT from expression of type %qT"
+@@ -28903,27 +28952,27 @@
+ msgid "no matches converting function %qD to type %q#T"
+ msgstr ""
+ 
+-#: cp/class.c:6161
++#: cp/class.c:6168
+ #, gcc-internal-format
+ msgid "converting overloaded function %qD to type %q#T is ambiguous"
+ msgstr ""
+ 
+-#: cp/class.c:6187
++#: cp/class.c:6195
+ #, gcc-internal-format
+ msgid "assuming pointer to member %qD"
+ msgstr ""
+ 
+-#: cp/class.c:6190
++#: cp/class.c:6198
+ #, gcc-internal-format
+ msgid "(a pointer to member can only be formed with %<&%E%>)"
+ msgstr ""
+ 
+-#: cp/class.c:6252 cp/class.c:6286
++#: cp/class.c:6260 cp/class.c:6294
+ #, gcc-internal-format
+ msgid "not enough type information"
+ msgstr ""
+ 
+-#: cp/class.c:6269
++#: cp/class.c:6277
+ #, gcc-internal-format
+ msgid "argument of type %qT does not match %qT"
+ msgstr ""
+@@ -28933,12 +28982,12 @@
+ #. A name N used in a class S shall refer to the same declaration
+ #. in its context and when re-evaluated in the completed scope of
+ #. S.
+-#: cp/class.c:6587 cp/decl.c:1193 cp/name-lookup.c:526
++#: cp/class.c:6595 cp/decl.c:1193 cp/name-lookup.c:526
+ #, gcc-internal-format
+ msgid "declaration of %q#D"
+ msgstr ""
+ 
+-#: cp/class.c:6588
++#: cp/class.c:6596
+ #, gcc-internal-format
+ msgid "changes meaning of %qD from %q+#D"
+ msgstr ""
+@@ -29473,117 +29522,117 @@
+ msgid "attribute for %q+#T must follow the %qs keyword"
+ msgstr ""
+ 
+-#: cp/decl.c:3980
++#: cp/decl.c:3983
+ #, gcc-internal-format
+ msgid "ignoring attributes applied to class type %qT outside of definition"
+ msgstr ""
+ 
+ #. A template type parameter or other dependent type.
+-#: cp/decl.c:3984
++#: cp/decl.c:3987
+ #, gcc-internal-format
+ msgid ""
+ "ignoring attributes applied to dependent type %qT without an associated "
+ "declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:4060
++#: cp/decl.c:4063
+ #, gcc-internal-format
+ msgid "typedef %qD is initialized (use decltype instead)"
+ msgstr ""
+ 
+-#: cp/decl.c:4078
++#: cp/decl.c:4081
+ #, gcc-internal-format
+ msgid "declaration of %q#D has %<extern%> and is initialized"
+ msgstr ""
+ 
+-#: cp/decl.c:4103
++#: cp/decl.c:4106
+ #, gcc-internal-format
+ msgid "definition of %q#D is marked %<dllimport%>"
+ msgstr ""
+ 
+-#: cp/decl.c:4122
++#: cp/decl.c:4125
+ #, gcc-internal-format
+ msgid "%q#D is not a static member of %q#T"
+ msgstr ""
+ 
+-#: cp/decl.c:4128
++#: cp/decl.c:4131
+ #, gcc-internal-format
+ msgid "ISO C++ does not permit %<%T::%D%> to be defined as %<%T::%D%>"
+ msgstr ""
+ 
+-#: cp/decl.c:4137
++#: cp/decl.c:4140
+ #, gcc-internal-format
+ msgid ""
+ "template header not allowed in member definition of explicitly specialized "
+ "class"
+ msgstr ""
+ 
+-#: cp/decl.c:4145
++#: cp/decl.c:4148
+ #, gcc-internal-format
+ msgid "duplicate initialization of %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:4184
++#: cp/decl.c:4187
+ #, gcc-internal-format
+ msgid "declaration of %q#D outside of class is not definition"
+ msgstr ""
+ 
+-#: cp/decl.c:4279
++#: cp/decl.c:4282
+ #, gcc-internal-format
+ msgid "variable %q#D has initializer but incomplete type"
+ msgstr ""
+ 
+-#: cp/decl.c:4285 cp/decl.c:5033
++#: cp/decl.c:4288 cp/decl.c:5036
+ #, gcc-internal-format
+ msgid "elements of array %q#D have incomplete type"
+ msgstr ""
+ 
+-#: cp/decl.c:4292 cp/decl.c:5529
++#: cp/decl.c:4295 cp/decl.c:5532
+ #, gcc-internal-format
+ msgid "declaration of %q#D has no initializer"
+ msgstr ""
+ 
+-#: cp/decl.c:4294
++#: cp/decl.c:4297
+ #, gcc-internal-format
+ msgid "aggregate %q#D has incomplete type and cannot be defined"
+ msgstr ""
+ 
+-#: cp/decl.c:4330
++#: cp/decl.c:4333
+ #, gcc-internal-format
+ msgid "%qD declared as reference but not initialized"
+ msgstr ""
+ 
+-#: cp/decl.c:4336
++#: cp/decl.c:4339
+ #, gcc-internal-format
+ msgid "ISO C++ forbids use of initializer list to initialize reference %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:4362
++#: cp/decl.c:4365
+ #, gcc-internal-format
+ msgid "cannot initialize %qT from %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:4423
++#: cp/decl.c:4426
+ #, gcc-internal-format
+ msgid "name used in a GNU-style designated initializer for an array"
+ msgstr ""
+ 
+-#: cp/decl.c:4428
++#: cp/decl.c:4431
+ #, gcc-internal-format
+ msgid "name %qD used in a GNU-style designated initializer for an array"
+ msgstr ""
+ 
+-#: cp/decl.c:4478
++#: cp/decl.c:4481
+ #, gcc-internal-format
+ msgid "initializer fails to determine size of %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:4485
++#: cp/decl.c:4488
+ #, gcc-internal-format
+ msgid "array size missing in %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:4497
++#: cp/decl.c:4500
+ #, gcc-internal-format
+ msgid "zero-size array %qD"
+ msgstr ""
+@@ -29591,273 +29640,273 @@
+ #. An automatic variable with an incomplete type: that is an error.
+ #. Don't talk about array types here, since we took care of that
+ #. message in grokdeclarator.
+-#: cp/decl.c:4540
++#: cp/decl.c:4543
+ #, gcc-internal-format
+ msgid "storage size of %qD isn't known"
+ msgstr ""
+ 
+-#: cp/decl.c:4563
++#: cp/decl.c:4566
+ #, gcc-internal-format
+ msgid "storage size of %qD isn't constant"
+ msgstr ""
+ 
+-#: cp/decl.c:4614
++#: cp/decl.c:4617
+ #, gcc-internal-format
+ msgid ""
+ "sorry: semantics of inline function static data %q+#D are wrong (you'll wind "
+ "up with multiple copies)"
+ msgstr ""
+ 
+-#: cp/decl.c:4617
++#: cp/decl.c:4620
+ #, gcc-internal-format
+ msgid "%J  you can work around this by removing the initializer"
+ msgstr ""
+ 
+-#: cp/decl.c:4644
++#: cp/decl.c:4647
+ #, gcc-internal-format
+ msgid "uninitialized const %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:4756
++#: cp/decl.c:4759
+ #, gcc-internal-format
+ msgid "invalid type %qT as initializer for a vector of type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:4798
++#: cp/decl.c:4801
+ #, gcc-internal-format
+ msgid "initializer for %qT must be brace-enclosed"
+ msgstr ""
+ 
+-#: cp/decl.c:4816
++#: cp/decl.c:4819
+ #, gcc-internal-format
+ msgid "%qT has no non-static data member named %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:4872
++#: cp/decl.c:4875
+ #, gcc-internal-format
+ msgid "braces around scalar initializer for type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:4958
++#: cp/decl.c:4961
+ #, gcc-internal-format
+ msgid "missing braces around initializer for %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:5015 cp/typeck2.c:1087 cp/typeck2.c:1110 cp/typeck2.c:1153
++#: cp/decl.c:5018 cp/typeck2.c:1087 cp/typeck2.c:1110 cp/typeck2.c:1153
+ #, gcc-internal-format
+ msgid "too many initializers for %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:5035
++#: cp/decl.c:5038
+ #, gcc-internal-format
+ msgid "elements of array %q#T have incomplete type"
+ msgstr ""
+ 
+-#: cp/decl.c:5044
++#: cp/decl.c:5047
+ #, gcc-internal-format
+ msgid "variable-sized object %qD may not be initialized"
+ msgstr ""
+ 
+-#: cp/decl.c:5046
++#: cp/decl.c:5049
+ #, gcc-internal-format
+ msgid "variable-sized compound literal"
+ msgstr ""
+ 
+-#: cp/decl.c:5100
++#: cp/decl.c:5103
+ #, gcc-internal-format
+ msgid "%qD has incomplete type"
+ msgstr ""
+ 
+-#: cp/decl.c:5120
++#: cp/decl.c:5123
+ #, gcc-internal-format
+ msgid "scalar object %qD requires one element in initializer"
+ msgstr ""
+ 
+-#: cp/decl.c:5151
++#: cp/decl.c:5154
+ #, gcc-internal-format
+ msgid "in C++98 %qD must be initialized by constructor, not by %<{...}%>"
+ msgstr ""
+ 
+-#: cp/decl.c:5183
++#: cp/decl.c:5186
+ #, gcc-internal-format
+ msgid "array %qD initialized by parenthesized string literal %qE"
+ msgstr ""
+ 
+-#: cp/decl.c:5197
++#: cp/decl.c:5200
+ #, gcc-internal-format
+ msgid "structure %qD with uninitialized const members"
+ msgstr ""
+ 
+-#: cp/decl.c:5199
++#: cp/decl.c:5202
+ #, gcc-internal-format
+ msgid "structure %qD with uninitialized reference members"
+ msgstr ""
+ 
+-#: cp/decl.c:5496
++#: cp/decl.c:5499
+ #, gcc-internal-format
+ msgid "assignment (not initialization) in declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:5555 cp/decl2.c:850
++#: cp/decl.c:5558 cp/decl2.c:850
+ #, gcc-internal-format
+ msgid "%qD cannot be defaulted"
+ msgstr ""
+ 
+-#: cp/decl.c:5631
++#: cp/decl.c:5634
+ #, gcc-internal-format
+ msgid "shadowing previous type declaration of %q#D"
+ msgstr ""
+ 
+-#: cp/decl.c:5661
++#: cp/decl.c:5664
+ #, gcc-internal-format
+ msgid "%qD cannot be thread-local because it has non-POD type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:5693
++#: cp/decl.c:5696
+ #, gcc-internal-format
+ msgid "Java object %qD not allocated with %<new%>"
+ msgstr ""
+ 
+-#: cp/decl.c:5710
++#: cp/decl.c:5713
+ #, gcc-internal-format
+ msgid "%qD is thread-local and so cannot be dynamically initialized"
+ msgstr ""
+ 
+-#: cp/decl.c:5728
++#: cp/decl.c:5731
+ #, gcc-internal-format
+ msgid ""
+ "%qD cannot be initialized by a non-constant expression when being declared"
+ msgstr ""
+ 
+-#: cp/decl.c:5768
++#: cp/decl.c:5771
+ #, gcc-internal-format
+ msgid "non-static data member %qD has Java class type"
+ msgstr ""
+ 
+-#: cp/decl.c:5832
++#: cp/decl.c:5835
+ #, gcc-internal-format
+ msgid "function %q#D is initialized like a variable"
+ msgstr ""
+ 
+-#: cp/decl.c:6420
++#: cp/decl.c:6423
+ #, gcc-internal-format
+ msgid "destructor for alien class %qT cannot be a member"
+ msgstr ""
+ 
+-#: cp/decl.c:6422
++#: cp/decl.c:6425
+ #, gcc-internal-format
+ msgid "constructor for alien class %qT cannot be a member"
+ msgstr ""
+ 
+-#: cp/decl.c:6443
++#: cp/decl.c:6446
+ #, gcc-internal-format
+ msgid "%qD declared as a %<virtual%> %s"
+ msgstr ""
+ 
+-#: cp/decl.c:6445
++#: cp/decl.c:6448
+ #, gcc-internal-format
+ msgid "%qD declared as an %<inline%> %s"
+ msgstr ""
+ 
+-#: cp/decl.c:6447
++#: cp/decl.c:6450
+ #, gcc-internal-format
+ msgid ""
+ "%<const%> and %<volatile%> function specifiers on %qD invalid in %s "
+ "declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:6451
++#: cp/decl.c:6454
+ #, gcc-internal-format
+ msgid "%q+D declared as a friend"
+ msgstr ""
+ 
+-#: cp/decl.c:6457
++#: cp/decl.c:6460
+ #, gcc-internal-format
+ msgid "%q+D declared with an exception specification"
+ msgstr ""
+ 
+-#: cp/decl.c:6491
++#: cp/decl.c:6494
+ #, gcc-internal-format
+ msgid "definition of %qD is not in namespace enclosing %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:6611
++#: cp/decl.c:6614
+ #, gcc-internal-format
+ msgid "defining explicit specialization %qD in friend declaration"
+ msgstr ""
+ 
+ #. Something like `template <class T> friend void f<T>()'.
+-#: cp/decl.c:6621
++#: cp/decl.c:6624
+ #, gcc-internal-format
+ msgid "invalid use of template-id %qD in declaration of primary template"
+ msgstr ""
+ 
+-#: cp/decl.c:6651
++#: cp/decl.c:6654
+ #, gcc-internal-format
+ msgid ""
+ "default arguments are not allowed in declaration of friend template "
+ "specialization %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:6659
++#: cp/decl.c:6662
+ #, gcc-internal-format
+ msgid ""
+ "%<inline%> is not allowed in declaration of friend template specialization %"
+ "qD"
+ msgstr ""
+ 
+-#: cp/decl.c:6702
++#: cp/decl.c:6705
+ #, gcc-internal-format
+ msgid "cannot declare %<::main%> to be a template"
+ msgstr ""
+ 
+-#: cp/decl.c:6704
++#: cp/decl.c:6707
+ #, gcc-internal-format
+ msgid "cannot declare %<::main%> to be inline"
+ msgstr ""
+ 
+-#: cp/decl.c:6706
++#: cp/decl.c:6709
+ #, gcc-internal-format
+ msgid "cannot declare %<::main%> to be static"
+ msgstr ""
+ 
+-#: cp/decl.c:6734
++#: cp/decl.c:6737
+ #, gcc-internal-format
+ msgid "non-local function %q#D uses anonymous type"
+ msgstr ""
+ 
+-#: cp/decl.c:6737 cp/decl.c:7013
++#: cp/decl.c:6740 cp/decl.c:7016
+ #, gcc-internal-format
+ msgid ""
+ "%q+#D does not refer to the unqualified type, so it is not used for linkage"
+ msgstr ""
+ 
+-#: cp/decl.c:6743
++#: cp/decl.c:6746
+ #, gcc-internal-format
+ msgid "non-local function %q#D uses local type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:6762
++#: cp/decl.c:6765
+ #, gcc-internal-format
+ msgid "static member function %qD cannot have cv-qualifier"
+ msgstr ""
+ 
+-#: cp/decl.c:6763
++#: cp/decl.c:6766
+ #, gcc-internal-format
+ msgid "non-member function %qD cannot have cv-qualifier"
+ msgstr ""
+ 
+-#: cp/decl.c:6811
++#: cp/decl.c:6814
+ #, gcc-internal-format
+ msgid "%<::main%> must return %<int%>"
+ msgstr ""
+ 
+-#: cp/decl.c:6851
++#: cp/decl.c:6854
+ #, gcc-internal-format
+ msgid "definition of implicitly-declared %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:6868 cp/decl2.c:685
++#: cp/decl.c:6871 cp/decl2.c:685
+ #, gcc-internal-format
+ msgid "no %q#D member function declared in class %qT"
+ msgstr ""
+@@ -29866,589 +29915,594 @@
+ #. no linkage can only be used to declare extern "C"
+ #. entities.  Since it's not always an error in the
+ #. ISO C++ 90 Standard, we only issue a warning.
+-#: cp/decl.c:7010
++#: cp/decl.c:7013
+ #, gcc-internal-format
+ msgid "non-local variable %q#D uses anonymous type"
+ msgstr ""
+ 
+-#: cp/decl.c:7019
++#: cp/decl.c:7022
+ #, gcc-internal-format
+ msgid "non-local variable %q#D uses local type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:7142
++#: cp/decl.c:7145
+ #, gcc-internal-format
+ msgid ""
+ "invalid in-class initialization of static data member of non-integral type %"
+ "qT"
+ msgstr ""
+ 
+-#: cp/decl.c:7152
++#: cp/decl.c:7155
+ #, gcc-internal-format
+ msgid "ISO C++ forbids in-class initialization of non-const static member %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:7156
++#: cp/decl.c:7159
+ #, gcc-internal-format
+ msgid ""
+ "ISO C++ forbids initialization of member constant %qD of non-integral type %"
+ "qT"
+ msgstr ""
+ 
+-#: cp/decl.c:7181
++#: cp/decl.c:7184
+ #, gcc-internal-format
+ msgid "size of array %qD has non-integral type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:7183
++#: cp/decl.c:7186
+ #, gcc-internal-format
+ msgid "size of array has non-integral type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:7235
++#: cp/decl.c:7238
+ #, gcc-internal-format
+ msgid "size of array %qD is negative"
+ msgstr ""
+ 
+-#: cp/decl.c:7237
++#: cp/decl.c:7240
+ #, gcc-internal-format
+ msgid "size of array is negative"
+ msgstr ""
+ 
+-#: cp/decl.c:7245
++#: cp/decl.c:7248
+ #, gcc-internal-format
+ msgid "ISO C++ forbids zero-size array %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:7247
++#: cp/decl.c:7250
+ #, gcc-internal-format
+ msgid "ISO C++ forbids zero-size array"
+ msgstr ""
+ 
+-#: cp/decl.c:7254
++#: cp/decl.c:7257
+ #, gcc-internal-format
+ msgid "size of array %qD is not an integral constant-expression"
+ msgstr ""
+ 
+-#: cp/decl.c:7257
++#: cp/decl.c:7260
+ #, gcc-internal-format
+ msgid "size of array is not an integral constant-expression"
+ msgstr ""
+ 
+-#: cp/decl.c:7263
++#: cp/decl.c:7266
+ #, gcc-internal-format
+ msgid "ISO C++ forbids variable length array %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:7265
++#: cp/decl.c:7268
+ #, gcc-internal-format
+ msgid "ISO C++ forbids variable length array"
+ msgstr ""
+ 
+-#: cp/decl.c:7271
++#: cp/decl.c:7274
+ #, gcc-internal-format
+ msgid "variable length array %qD is used"
+ msgstr ""
+ 
+-#: cp/decl.c:7307
++#: cp/decl.c:7310
+ #, gcc-internal-format
+ msgid "overflow in array dimension"
+ msgstr ""
+ 
+-#: cp/decl.c:7388
++#: cp/decl.c:7391
+ #, gcc-internal-format
+ msgid "declaration of %qD as %s"
+ msgstr ""
+ 
+-#: cp/decl.c:7390
++#: cp/decl.c:7393
+ #, gcc-internal-format
+ msgid "creating %s"
+ msgstr ""
+ 
+-#: cp/decl.c:7402
++#: cp/decl.c:7405
+ #, gcc-internal-format
+ msgid ""
+ "declaration of %qD as multidimensional array must have bounds for all "
+ "dimensions except the first"
+ msgstr ""
+ 
+-#: cp/decl.c:7406
++#: cp/decl.c:7409
+ #, gcc-internal-format
+ msgid ""
+ "multidimensional array must have bounds for all dimensions except the first"
+ msgstr ""
+ 
+-#: cp/decl.c:7441
++#: cp/decl.c:7444
+ #, gcc-internal-format
+ msgid "return type specification for constructor invalid"
+ msgstr ""
+ 
+-#: cp/decl.c:7451
++#: cp/decl.c:7454
+ #, gcc-internal-format
+ msgid "return type specification for destructor invalid"
+ msgstr ""
+ 
+-#: cp/decl.c:7464
++#: cp/decl.c:7467
+ #, gcc-internal-format
+ msgid "return type specified for %<operator %T%>"
+ msgstr ""
+ 
+-#: cp/decl.c:7486
++#: cp/decl.c:7489
+ #, gcc-internal-format
+ msgid "unnamed variable or field declared void"
+ msgstr ""
+ 
+-#: cp/decl.c:7490
++#: cp/decl.c:7493
+ #, gcc-internal-format
+ msgid "variable or field %qE declared void"
+ msgstr ""
+ 
+-#: cp/decl.c:7493
++#: cp/decl.c:7496
+ #, gcc-internal-format
+ msgid "variable or field declared void"
+ msgstr ""
+ 
+-#: cp/decl.c:7663
++#: cp/decl.c:7669
+ #, gcc-internal-format
+ msgid "invalid use of qualified-name %<::%D%>"
+ msgstr ""
+ 
+-#: cp/decl.c:7666
++#: cp/decl.c:7672
+ #, gcc-internal-format
+ msgid "invalid use of qualified-name %<%T::%D%>"
+ msgstr ""
+ 
+-#: cp/decl.c:7669
++#: cp/decl.c:7675
+ #, gcc-internal-format
+ msgid "invalid use of qualified-name %<%D::%D%>"
+ msgstr ""
+ 
+-#: cp/decl.c:7681
++#: cp/decl.c:7687
+ #, gcc-internal-format
+ msgid "type %qT is not derived from type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:7697 cp/decl.c:7789 cp/decl.c:8979
++#: cp/decl.c:7703 cp/decl.c:7795 cp/decl.c:8993
+ #, gcc-internal-format
+ msgid "declaration of %qD as non-function"
+ msgstr ""
+ 
+-#: cp/decl.c:7703
++#: cp/decl.c:7709
+ #, gcc-internal-format
+ msgid "declaration of %qD as non-member"
+ msgstr ""
+ 
+-#: cp/decl.c:7734
++#: cp/decl.c:7740
+ #, gcc-internal-format
+ msgid "declarator-id missing; using reserved word %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:7781
++#: cp/decl.c:7787
+ #, gcc-internal-format
+ msgid "function definition does not declare parameters"
+ msgstr ""
+ 
+-#: cp/decl.c:7823
++#: cp/decl.c:7829
+ #, gcc-internal-format
+ msgid "two or more data types in declaration of %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7829
++#: cp/decl.c:7835
+ #, gcc-internal-format
+ msgid "conflicting specifiers in declaration of %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7900 cp/decl.c:7903 cp/decl.c:7906
++#: cp/decl.c:7906 cp/decl.c:7909 cp/decl.c:7912
+ #, gcc-internal-format
+ msgid "ISO C++ forbids declaration of %qs with no type"
+ msgstr ""
+ 
+-#: cp/decl.c:7931 cp/decl.c:7949
++#: cp/decl.c:7937 cp/decl.c:7955
+ #, gcc-internal-format
+ msgid "%<signed%> or %<unsigned%> invalid for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7933
++#: cp/decl.c:7939
+ #, gcc-internal-format
+ msgid "%<signed%> and %<unsigned%> specified together for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7935
++#: cp/decl.c:7941
+ #, gcc-internal-format
+ msgid "%<long long%> invalid for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7937
++#: cp/decl.c:7943
+ #, gcc-internal-format
+ msgid "%<long%> invalid for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7939
++#: cp/decl.c:7945
+ #, gcc-internal-format
+ msgid "%<short%> invalid for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7941
++#: cp/decl.c:7947
+ #, gcc-internal-format
+ msgid "%<long%> or %<short%> invalid for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7943
++#: cp/decl.c:7949
+ #, gcc-internal-format
+ msgid "%<long%> or %<short%> specified with char for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7945
++#: cp/decl.c:7951
+ #, gcc-internal-format
+ msgid "%<long%> and %<short%> specified together for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7951
++#: cp/decl.c:7957
+ #, gcc-internal-format
+ msgid "%<short%> or %<long%> invalid for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:7959
++#: cp/decl.c:7965
+ #, gcc-internal-format
+ msgid "long, short, signed or unsigned used invalidly for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:8023
++#: cp/decl.c:8029
+ #, gcc-internal-format
+ msgid "complex invalid for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:8052
++#: cp/decl.c:8058
+ #, gcc-internal-format
+ msgid "qualifiers are not allowed on declaration of %<operator %T%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8065 cp/typeck.c:7252
++#: cp/decl.c:8071 cp/typeck.c:7255
+ #, gcc-internal-format
+ msgid "ignoring %qV qualifiers added to function type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:8088
++#: cp/decl.c:8094
+ #, gcc-internal-format
+ msgid "member %qD cannot be declared both virtual and static"
+ msgstr ""
+ 
+-#: cp/decl.c:8096
++#: cp/decl.c:8102
+ #, gcc-internal-format
+ msgid "%<%T::%D%> is not a valid declarator"
+ msgstr ""
+ 
+-#: cp/decl.c:8105
++#: cp/decl.c:8111
+ #, gcc-internal-format
+ msgid "typedef declaration invalid in parameter declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:8111
++#: cp/decl.c:8117
+ #, gcc-internal-format
+ msgid "storage class specifiers invalid in parameter declarations"
+ msgstr ""
+ 
+-#: cp/decl.c:8115
++#: cp/decl.c:8121
+ #, gcc-internal-format
+ msgid "parameter declared %<auto%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8124
++#: cp/decl.c:8130
+ #, gcc-internal-format
+ msgid "%<virtual%> outside class declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:8142
++#: cp/decl.c:8148
+ #, gcc-internal-format
+ msgid "multiple storage classes in declaration of %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:8165
++#: cp/decl.c:8171
+ #, gcc-internal-format
+ msgid "storage class specified for %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:8186
++#: cp/decl.c:8192
+ #, gcc-internal-format
+ msgid "top-level declaration of %qs specifies %<auto%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8199
++#: cp/decl.c:8205
+ #, gcc-internal-format
+ msgid "storage class specifiers invalid in friend function declarations"
+ msgstr ""
+ 
+-#: cp/decl.c:8314
++#: cp/decl.c:8320
+ #, gcc-internal-format
+ msgid "%qs function uses %<auto%> type specifier without late return type"
+ msgstr ""
+ 
+-#: cp/decl.c:8320
++#: cp/decl.c:8326
+ #, gcc-internal-format
+ msgid ""
+ "%qs function with late return type has %qT as its type rather than plain %"
+ "<auto%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8328
++#: cp/decl.c:8334
+ #, gcc-internal-format
+ msgid ""
+ "%qs function with late return type not declared with %<auto%> type specifier"
+ msgstr ""
+ 
+-#: cp/decl.c:8361
++#: cp/decl.c:8367
+ #, gcc-internal-format
+ msgid "destructor cannot be static member function"
+ msgstr ""
+ 
+-#: cp/decl.c:8366
++#: cp/decl.c:8372
+ #, gcc-internal-format
+ msgid "destructors may not be cv-qualified"
+ msgstr ""
+ 
+-#: cp/decl.c:8384
++#: cp/decl.c:8390
+ #, gcc-internal-format
+ msgid "constructors cannot be declared virtual"
+ msgstr ""
+ 
+-#: cp/decl.c:8397
++#: cp/decl.c:8403
+ #, gcc-internal-format
+ msgid "can't initialize friend function %qs"
+ msgstr ""
+ 
+ #. Cannot be both friend and virtual.
+-#: cp/decl.c:8401
++#: cp/decl.c:8407
+ #, gcc-internal-format
+ msgid "virtual functions cannot be friends"
+ msgstr ""
+ 
+-#: cp/decl.c:8405
++#: cp/decl.c:8411
+ #, gcc-internal-format
+ msgid "friend declaration not in class definition"
+ msgstr ""
+ 
+-#: cp/decl.c:8407
++#: cp/decl.c:8413
+ #, gcc-internal-format
+ msgid "can't define friend function %qs in a local class definition"
+ msgstr ""
+ 
+-#: cp/decl.c:8420
++#: cp/decl.c:8426
+ #, gcc-internal-format
+ msgid "destructors may not have parameters"
+ msgstr ""
+ 
+-#: cp/decl.c:8439
++#: cp/decl.c:8445
+ #, gcc-internal-format
+ msgid "cannot declare pointer to %q#T"
+ msgstr ""
+ 
+-#: cp/decl.c:8452 cp/decl.c:8459
++#: cp/decl.c:8458 cp/decl.c:8465
+ #, gcc-internal-format
+ msgid "cannot declare reference to %q#T"
+ msgstr ""
+ 
+-#: cp/decl.c:8461
++#: cp/decl.c:8467
+ #, gcc-internal-format
+ msgid "cannot declare pointer to %q#T member"
+ msgstr ""
+ 
+-#: cp/decl.c:8512
++#: cp/decl.c:8487
++#, gcc-internal-format
++msgid "cannot declare %s to qualified function type %qT"
++msgstr ""
++
++#: cp/decl.c:8524
+ #, gcc-internal-format
+ msgid ""
+ "cannot declare reference to %q#T, which is not a typedef or a template type "
+ "argument"
+ msgstr ""
+ 
+-#: cp/decl.c:8556
++#: cp/decl.c:8568
+ #, gcc-internal-format
+ msgid "template-id %qD used as a declarator"
+ msgstr ""
+ 
+-#: cp/decl.c:8607
++#: cp/decl.c:8619
+ #, gcc-internal-format
+ msgid "member functions are implicitly friends of their class"
+ msgstr ""
+ 
+-#: cp/decl.c:8612
++#: cp/decl.c:8624
+ #, gcc-internal-format
+ msgid "extra qualification %<%T::%> on member %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:8644
++#: cp/decl.c:8656
+ #, gcc-internal-format
+ msgid "cannot define member function %<%T::%s%> within %<%T%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8661
++#: cp/decl.c:8673
+ #, gcc-internal-format
+ msgid "cannot declare member %<%T::%s%> within %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:8684
++#: cp/decl.c:8696
+ #, gcc-internal-format
+ msgid "non-parameter %qs cannot be a parameter pack"
+ msgstr ""
+ 
+-#: cp/decl.c:8705
++#: cp/decl.c:8717
+ #, gcc-internal-format
+ msgid "data member may not have variably modified type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:8707
++#: cp/decl.c:8719
+ #, gcc-internal-format
+ msgid "parameter may not have variably modified type %qT"
+ msgstr ""
+ 
+ #. [dcl.fct.spec] The explicit specifier shall only be used in
+ #. declarations of constructors within a class definition.
+-#: cp/decl.c:8715
++#: cp/decl.c:8727
+ #, gcc-internal-format
+ msgid "only declarations of constructors can be %<explicit%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8723
++#: cp/decl.c:8735
+ #, gcc-internal-format
+ msgid "non-member %qs cannot be declared %<mutable%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8728
++#: cp/decl.c:8740
+ #, gcc-internal-format
+ msgid "non-object member %qs cannot be declared %<mutable%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8734
++#: cp/decl.c:8746
+ #, gcc-internal-format
+ msgid "function %qs cannot be declared %<mutable%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8739
++#: cp/decl.c:8751
+ #, gcc-internal-format
+ msgid "static %qs cannot be declared %<mutable%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8744
++#: cp/decl.c:8756
+ #, gcc-internal-format
+ msgid "const %qs cannot be declared %<mutable%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8781
++#: cp/decl.c:8793
+ #, gcc-internal-format
+ msgid "%Jtypedef name may not be a nested-name-specifier"
+ msgstr ""
+ 
+-#: cp/decl.c:8799
++#: cp/decl.c:8811
+ #, gcc-internal-format
+ msgid "ISO C++ forbids nested type %qD with same name as enclosing class"
+ msgstr ""
+ 
+-#: cp/decl.c:8883
++#: cp/decl.c:8895
+ #, gcc-internal-format
+ msgid ""
+ "qualified function types cannot be used to declare static member functions"
+ msgstr ""
+ 
+-#: cp/decl.c:8885
++#: cp/decl.c:8897
+ #, gcc-internal-format
+ msgid "qualified function types cannot be used to declare free functions"
+ msgstr ""
+ 
+-#: cp/decl.c:8911
++#: cp/decl.c:8923
+ #, gcc-internal-format
+ msgid "type qualifiers specified for friend class declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:8916
++#: cp/decl.c:8928
+ #, gcc-internal-format
+ msgid "%<inline%> specified for friend class declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:8924
++#: cp/decl.c:8936
+ #, gcc-internal-format
+ msgid "template parameters cannot be friends"
+ msgstr ""
+ 
+-#: cp/decl.c:8926
++#: cp/decl.c:8938
+ #, gcc-internal-format
+ msgid "friend declaration requires class-key, i.e. %<friend class %T::%D%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8930
++#: cp/decl.c:8942
+ #, gcc-internal-format
+ msgid "friend declaration requires class-key, i.e. %<friend %#T%>"
+ msgstr ""
+ 
+-#: cp/decl.c:8943
++#: cp/decl.c:8955
+ #, gcc-internal-format
+ msgid "trying to make class %qT a friend of global scope"
+ msgstr ""
+ 
+-#: cp/decl.c:8954
++#: cp/decl.c:8973
+ #, gcc-internal-format
+ msgid "invalid qualifiers on non-member function type"
+ msgstr ""
+ 
+-#: cp/decl.c:8969
++#: cp/decl.c:8983
+ #, gcc-internal-format
+ msgid "abstract declarator %qT used as declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:8998
++#: cp/decl.c:9012
+ #, gcc-internal-format
+ msgid "cannot use %<::%> in parameter declaration"
+ msgstr ""
+ 
+ #. Something like struct S { int N::j; };
+-#: cp/decl.c:9044
++#: cp/decl.c:9058
+ #, gcc-internal-format
+ msgid "invalid use of %<::%>"
+ msgstr ""
+ 
+-#: cp/decl.c:9059
++#: cp/decl.c:9073
+ #, gcc-internal-format
+ msgid "can't make %qD into a method -- not in a class"
+ msgstr ""
+ 
+-#: cp/decl.c:9068
++#: cp/decl.c:9082
+ #, gcc-internal-format
+ msgid "function %qD declared virtual inside a union"
+ msgstr ""
+ 
+-#: cp/decl.c:9077
++#: cp/decl.c:9091
+ #, gcc-internal-format
+ msgid "%qD cannot be declared virtual, since it is always static"
+ msgstr ""
+ 
+-#: cp/decl.c:9095
++#: cp/decl.c:9109
+ #, gcc-internal-format
+ msgid "expected qualified name in friend declaration for destructor %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:9102
++#: cp/decl.c:9116
+ #, gcc-internal-format
+ msgid "declaration of %qD as member of %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:9109
++#: cp/decl.c:9123
+ #, gcc-internal-format
+ msgid "expected qualified name in friend declaration for constructor %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:9172
++#: cp/decl.c:9186
+ #, gcc-internal-format
+ msgid "field %qD has incomplete type"
+ msgstr ""
+ 
+-#: cp/decl.c:9174
++#: cp/decl.c:9188
+ #, gcc-internal-format
+ msgid "name %qT has incomplete type"
+ msgstr ""
+ 
+-#: cp/decl.c:9183
++#: cp/decl.c:9197
+ #, gcc-internal-format
+ msgid "  in instantiation of template %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:9192
++#: cp/decl.c:9206
+ #, gcc-internal-format
+ msgid "%qE is neither function nor member function; cannot be declared friend"
+ msgstr ""
+@@ -30465,117 +30519,117 @@
+ #. the rest of the compiler does not correctly
+ #. handle the initialization unless the member is
+ #. static so we make it static below.
+-#: cp/decl.c:9244
++#: cp/decl.c:9258
+ #, gcc-internal-format
+ msgid "ISO C++ forbids initialization of member %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:9246
++#: cp/decl.c:9260
+ #, gcc-internal-format
+ msgid "making %qD static"
+ msgstr ""
+ 
+-#: cp/decl.c:9311
++#: cp/decl.c:9325
+ #, gcc-internal-format
+ msgid "storage class %<auto%> invalid for function %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:9313
++#: cp/decl.c:9327
+ #, gcc-internal-format
+ msgid "storage class %<register%> invalid for function %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:9315
++#: cp/decl.c:9329
+ #, gcc-internal-format
+ msgid "storage class %<__thread%> invalid for function %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:9327
++#: cp/decl.c:9341
+ #, gcc-internal-format
+ msgid ""
+ "%<static%> specified invalid for function %qs declared out of global scope"
+ msgstr ""
+ 
+-#: cp/decl.c:9331
++#: cp/decl.c:9345
+ #, gcc-internal-format
+ msgid ""
+ "%<inline%> specifier invalid for function %qs declared out of global scope"
+ msgstr ""
+ 
+-#: cp/decl.c:9338
++#: cp/decl.c:9352
+ #, gcc-internal-format
+ msgid "%q#T is not a class or a namespace"
+ msgstr ""
+ 
+-#: cp/decl.c:9346
++#: cp/decl.c:9360
+ #, gcc-internal-format
+ msgid "virtual non-class function %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:9353
++#: cp/decl.c:9367
+ #, gcc-internal-format
+ msgid "%qs defined in a non-class scope"
+ msgstr ""
+ 
+-#: cp/decl.c:9386
++#: cp/decl.c:9400
+ #, gcc-internal-format
+ msgid "cannot declare member function %qD to have static linkage"
+ msgstr ""
+ 
+ #. FIXME need arm citation
+-#: cp/decl.c:9393
++#: cp/decl.c:9407
+ #, gcc-internal-format
+ msgid "cannot declare static function inside another function"
+ msgstr ""
+ 
+-#: cp/decl.c:9423
++#: cp/decl.c:9437
+ #, gcc-internal-format
+ msgid ""
+ "%<static%> may not be used when defining (as opposed to declaring) a static "
+ "data member"
+ msgstr ""
+ 
+-#: cp/decl.c:9430
++#: cp/decl.c:9444
+ #, gcc-internal-format
+ msgid "static member %qD declared %<register%>"
+ msgstr ""
+ 
+-#: cp/decl.c:9436
++#: cp/decl.c:9450
+ #, gcc-internal-format
+ msgid "cannot explicitly declare member %q#D to have extern linkage"
+ msgstr ""
+ 
+-#: cp/decl.c:9580
++#: cp/decl.c:9594
+ #, gcc-internal-format
+ msgid "default argument for %q#D has type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:9583
++#: cp/decl.c:9597
+ #, gcc-internal-format
+ msgid "default argument for parameter of type %qT has type %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:9599
++#: cp/decl.c:9613
+ #, gcc-internal-format
+ msgid "default argument %qE uses local variable %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:9682
++#: cp/decl.c:9696
+ #, gcc-internal-format
+ msgid "parameter %qD has Java class type"
+ msgstr ""
+ 
+-#: cp/decl.c:9702
++#: cp/decl.c:9716
+ #, gcc-internal-format
+ msgid "parameter %qD invalidly declared method type"
+ msgstr ""
+ 
+-#: cp/decl.c:9726
++#: cp/decl.c:9740
+ #, gcc-internal-format
+ msgid "parameter %qD includes %s to array of unknown bound %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:9741
++#: cp/decl.c:9755
+ #, gcc-internal-format
+ msgid "parameter packs must be at the end of the parameter list"
+ msgstr ""
+@@ -30595,139 +30649,139 @@
+ #. or implicitly defined), there's no need to worry about their
+ #. existence.  Theoretically, they should never even be
+ #. instantiated, but that's hard to forestall.
+-#: cp/decl.c:9964
++#: cp/decl.c:9978
+ #, gcc-internal-format
+ msgid "invalid constructor; you probably meant %<%T (const %T&)%>"
+ msgstr ""
+ 
+-#: cp/decl.c:10086
++#: cp/decl.c:10100
+ #, gcc-internal-format
+ msgid "%qD may not be declared within a namespace"
+ msgstr ""
+ 
+-#: cp/decl.c:10091
++#: cp/decl.c:10105
+ #, gcc-internal-format
+ msgid "%qD may not be declared as static"
+ msgstr ""
+ 
+-#: cp/decl.c:10117
++#: cp/decl.c:10131
+ #, gcc-internal-format
+ msgid "%qD must be a nonstatic member function"
+ msgstr ""
+ 
+-#: cp/decl.c:10126
++#: cp/decl.c:10140
+ #, gcc-internal-format
+ msgid ""
+ "%qD must be either a non-static member function or a non-member function"
+ msgstr ""
+ 
+-#: cp/decl.c:10148
++#: cp/decl.c:10162
+ #, gcc-internal-format
+ msgid "%qD must have an argument of class or enumerated type"
+ msgstr ""
+ 
+-#: cp/decl.c:10189
++#: cp/decl.c:10203
+ #, gcc-internal-format
+ msgid "conversion to %s%s will never use a type conversion operator"
+ msgstr ""
+ 
+ #. 13.4.0.3
+-#: cp/decl.c:10197
++#: cp/decl.c:10211
+ #, gcc-internal-format
+ msgid "ISO C++ prohibits overloading operator ?:"
+ msgstr ""
+ 
+-#: cp/decl.c:10202
++#: cp/decl.c:10216
+ #, gcc-internal-format
+ msgid "%qD must not have variable number of arguments"
+ msgstr ""
+ 
+-#: cp/decl.c:10253
++#: cp/decl.c:10267
+ #, gcc-internal-format
+ msgid "postfix %qD must take %<int%> as its argument"
+ msgstr ""
+ 
+-#: cp/decl.c:10256
++#: cp/decl.c:10270
+ #, gcc-internal-format
+ msgid "postfix %qD must take %<int%> as its second argument"
+ msgstr ""
+ 
+-#: cp/decl.c:10264
++#: cp/decl.c:10278
+ #, gcc-internal-format
+ msgid "%qD must take either zero or one argument"
+ msgstr ""
+ 
+-#: cp/decl.c:10266
++#: cp/decl.c:10280
+ #, gcc-internal-format
+ msgid "%qD must take either one or two arguments"
+ msgstr ""
+ 
+-#: cp/decl.c:10288
++#: cp/decl.c:10302
+ #, gcc-internal-format
+ msgid "prefix %qD should return %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:10294
++#: cp/decl.c:10308
+ #, gcc-internal-format
+ msgid "postfix %qD should return %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:10303
++#: cp/decl.c:10317
+ #, gcc-internal-format
+ msgid "%qD must take %<void%>"
+ msgstr ""
+ 
+-#: cp/decl.c:10305 cp/decl.c:10314
++#: cp/decl.c:10319 cp/decl.c:10328
+ #, gcc-internal-format
+ msgid "%qD must take exactly one argument"
+ msgstr ""
+ 
+-#: cp/decl.c:10316
++#: cp/decl.c:10330
+ #, gcc-internal-format
+ msgid "%qD must take exactly two arguments"
+ msgstr ""
+ 
+-#: cp/decl.c:10325
++#: cp/decl.c:10339
+ #, gcc-internal-format
+ msgid "user-defined %qD always evaluates both arguments"
+ msgstr ""
+ 
+-#: cp/decl.c:10339
++#: cp/decl.c:10353
+ #, gcc-internal-format
+ msgid "%qD should return by value"
+ msgstr ""
+ 
+-#: cp/decl.c:10350 cp/decl.c:10355
++#: cp/decl.c:10364 cp/decl.c:10369
+ #, gcc-internal-format
+ msgid "%qD cannot have default arguments"
+ msgstr ""
+ 
+-#: cp/decl.c:10413
++#: cp/decl.c:10427
+ #, gcc-internal-format
+ msgid "using template type parameter %qT after %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:10428
++#: cp/decl.c:10442
+ #, gcc-internal-format
+ msgid "using typedef-name %qD after %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:10429
++#: cp/decl.c:10443
+ #, gcc-internal-format
+ msgid "%q+D has a previous declaration here"
+ msgstr ""
+ 
+-#: cp/decl.c:10437
++#: cp/decl.c:10451
+ #, gcc-internal-format
+ msgid "%qT referred to as %qs"
+ msgstr ""
+ 
+-#: cp/decl.c:10438 cp/decl.c:10445
++#: cp/decl.c:10452 cp/decl.c:10459
+ #, gcc-internal-format
+ msgid "%q+T has a previous declaration here"
+ msgstr ""
+ 
+-#: cp/decl.c:10444
++#: cp/decl.c:10458
+ #, gcc-internal-format
+ msgid "%qT referred to as enum"
+ msgstr ""
+@@ -30739,77 +30793,77 @@
+ #. void f(class C);		// No template header here
+ #.
+ #. then the required template argument is missing.
+-#: cp/decl.c:10459
++#: cp/decl.c:10473
+ #, gcc-internal-format
+ msgid "template argument required for %<%s %T%>"
+ msgstr ""
+ 
+-#: cp/decl.c:10507 cp/name-lookup.c:2800
++#: cp/decl.c:10521 cp/name-lookup.c:2802
+ #, gcc-internal-format
+ msgid "%qD has the same name as the class in which it is declared"
+ msgstr ""
+ 
+-#: cp/decl.c:10537 cp/name-lookup.c:2308
++#: cp/decl.c:10551 cp/name-lookup.c:2310
+ #, gcc-internal-format
+ msgid "reference to %qD is ambiguous"
+ msgstr ""
+ 
+-#: cp/decl.c:10651
++#: cp/decl.c:10665
+ #, gcc-internal-format
+ msgid "use of enum %q#D without previous declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:10672
++#: cp/decl.c:10686
+ #, gcc-internal-format
+ msgid "redeclaration of %qT as a non-template"
+ msgstr ""
+ 
+-#: cp/decl.c:10673
++#: cp/decl.c:10687
+ #, gcc-internal-format
+ msgid "previous declaration %q+D"
+ msgstr ""
+ 
+-#: cp/decl.c:10784
++#: cp/decl.c:10798
+ #, gcc-internal-format
+ msgid "derived union %qT invalid"
+ msgstr ""
+ 
+-#: cp/decl.c:10793
++#: cp/decl.c:10807
+ #, gcc-internal-format
+ msgid "Java class %qT cannot have multiple bases"
+ msgstr ""
+ 
+-#: cp/decl.c:10804
++#: cp/decl.c:10818
+ #, gcc-internal-format
+ msgid "Java class %qT cannot have virtual bases"
+ msgstr ""
+ 
+-#: cp/decl.c:10824
++#: cp/decl.c:10838
+ #, gcc-internal-format
+ msgid "base type %qT fails to be a struct or class type"
+ msgstr ""
+ 
+-#: cp/decl.c:10857
++#: cp/decl.c:10871
+ #, gcc-internal-format
+ msgid "recursive type %qT undefined"
+ msgstr ""
+ 
+-#: cp/decl.c:10859
++#: cp/decl.c:10873
+ #, gcc-internal-format
+ msgid "duplicate base type %qT invalid"
+ msgstr ""
+ 
+-#: cp/decl.c:10943
++#: cp/decl.c:10957
+ #, gcc-internal-format
+ msgid "multiple definition of %q#T"
+ msgstr ""
+ 
+-#: cp/decl.c:10944
++#: cp/decl.c:10958
+ #, gcc-internal-format
+ msgid "%Jprevious definition here"
+ msgstr ""
+ 
+-#: cp/decl.c:10991
++#: cp/decl.c:11005
+ #, gcc-internal-format
+ msgid "underlying type %<%T%> of %<%T%> must be an integral type"
+ msgstr ""
+@@ -30818,62 +30872,62 @@
+ #.
+ #. IF no integral type can represent all the enumerator values, the
+ #. enumeration is ill-formed.
+-#: cp/decl.c:11123
++#: cp/decl.c:11137
+ #, gcc-internal-format
+ msgid "no integral type can represent all of the enumerator values for %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:11254
++#: cp/decl.c:11268
+ #, gcc-internal-format
+ msgid "enumerator value for %qD is not an integer constant"
+ msgstr ""
+ 
+-#: cp/decl.c:11286
++#: cp/decl.c:11300
+ #, gcc-internal-format
+ msgid "overflow in enumeration values at %qD"
+ msgstr ""
+ 
+-#: cp/decl.c:11306
++#: cp/decl.c:11320
+ #, gcc-internal-format
+ msgid "enumerator value %E is too large for underlying type %<%T%>"
+ msgstr ""
+ 
+-#: cp/decl.c:11403
++#: cp/decl.c:11417
+ #, gcc-internal-format
+ msgid "return type %q#T is incomplete"
+ msgstr ""
+ 
+-#: cp/decl.c:11405
++#: cp/decl.c:11419
+ #, gcc-internal-format
+ msgid "return type has Java class type %q#T"
+ msgstr ""
+ 
+-#: cp/decl.c:11530 cp/typeck.c:6939
++#: cp/decl.c:11544 cp/typeck.c:6939
+ #, gcc-internal-format
+ msgid "%<operator=%> should return a reference to %<*this%>"
+ msgstr ""
+ 
+-#: cp/decl.c:11845
++#: cp/decl.c:11859
+ #, gcc-internal-format
+ msgid "invalid function declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:11929
++#: cp/decl.c:11943
+ #, gcc-internal-format
+ msgid "parameter %qD declared void"
+ msgstr ""
+ 
+-#: cp/decl.c:12430
++#: cp/decl.c:12444
+ #, gcc-internal-format
+ msgid "invalid member function declaration"
+ msgstr ""
+ 
+-#: cp/decl.c:12445
++#: cp/decl.c:12459
+ #, gcc-internal-format
+ msgid "%qD is already defined in class %qT"
+ msgstr ""
+ 
+-#: cp/decl.c:12692
++#: cp/decl.c:12706
+ #, gcc-internal-format
+ msgid "static member function %q#D declared with type qualifiers"
+ msgstr ""
+@@ -31093,7 +31147,7 @@
+ #. We really want to suppress this warning in system headers,
+ #. because libstdc++ uses variadic templates even when we aren't
+ #. in C++0x mode.
+-#: cp/error.c:2710
++#: cp/error.c:2711
+ #, gcc-internal-format
+ msgid "%s only available with -std=c++0x or -std=gnu++0x"
+ msgstr ""
+@@ -31361,7 +31415,7 @@
+ msgid "bad array initializer"
+ msgstr ""
+ 
+-#: cp/init.c:1441 cp/semantics.c:2496
++#: cp/init.c:1441 cp/semantics.c:2503
+ #, gcc-internal-format
+ msgid "%qT is not a class type"
+ msgstr ""
+@@ -31547,22 +31601,22 @@
+ msgid "mangling unknown fixed point type"
+ msgstr ""
+ 
+-#: cp/mangle.c:2338
++#: cp/mangle.c:2332
+ #, gcc-internal-format
+ msgid "mangling %C"
+ msgstr ""
+ 
+-#: cp/mangle.c:2375
++#: cp/mangle.c:2387
+ #, gcc-internal-format
+ msgid "mangling new-expression"
+ msgstr ""
+ 
+-#: cp/mangle.c:2395
++#: cp/mangle.c:2407
+ #, gcc-internal-format
+ msgid "omitted middle operand to %<?:%> operand cannot be mangled"
+ msgstr ""
+ 
+-#: cp/mangle.c:2710
++#: cp/mangle.c:2722
+ #, gcc-internal-format
+ msgid "the mangled name of %qD will change in a future version of GCC"
+ msgstr ""
+@@ -31645,220 +31699,220 @@
+ msgid "global declaration %q+#D"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1030 cp/name-lookup.c:1040
++#: cp/name-lookup.c:1035 cp/name-lookup.c:1042
+ #, gcc-internal-format
+ msgid "declaration of %q#D shadows a parameter"
+ msgstr ""
+ 
+ #. Location of previous decl is not useful in this case.
+-#: cp/name-lookup.c:1065
++#: cp/name-lookup.c:1067
+ #, gcc-internal-format
+ msgid "declaration of %qD shadows a member of 'this'"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1071
++#: cp/name-lookup.c:1073
+ #, gcc-internal-format
+ msgid "declaration of %qD shadows a previous local"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1078
++#: cp/name-lookup.c:1080
+ #, gcc-internal-format
+ msgid "declaration of %qD shadows a global declaration"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1201
++#: cp/name-lookup.c:1203
+ #, gcc-internal-format
+ msgid "name lookup of %qD changed"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1202
++#: cp/name-lookup.c:1204
+ #, gcc-internal-format
+ msgid "  matches this %q+D under ISO standard rules"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1204
++#: cp/name-lookup.c:1206
+ #, gcc-internal-format
+ msgid "  matches this %q+D under old rules"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1222 cp/name-lookup.c:1230
++#: cp/name-lookup.c:1224 cp/name-lookup.c:1232
+ #, gcc-internal-format
+ msgid "name lookup of %qD changed for ISO %<for%> scoping"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1224
++#: cp/name-lookup.c:1226
+ #, gcc-internal-format
+ msgid "  cannot use obsolete binding at %q+D because it has a destructor"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1233
++#: cp/name-lookup.c:1235
+ #, gcc-internal-format
+ msgid "  using obsolete binding at %q+D"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1239 cp/parser.c:10154
++#: cp/name-lookup.c:1241 cp/parser.c:10159
+ #, gcc-internal-format
+ msgid "(if you use %<-fpermissive%> G++ will accept your code)"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1295
++#: cp/name-lookup.c:1297
+ #, gcc-internal-format
+ msgid "%s %s(%E) %p %d\n"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1298
++#: cp/name-lookup.c:1300
+ #, gcc-internal-format
+ msgid "%s %s %p %d\n"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:1426
++#: cp/name-lookup.c:1428
+ #, gcc-internal-format
+ msgid "XXX is_class_level != (current_scope == class_scope)\n"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2021
++#: cp/name-lookup.c:2023
+ #, gcc-internal-format
+ msgid "%q#D hides constructor for %q#T"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2038
++#: cp/name-lookup.c:2040
+ #, gcc-internal-format
+ msgid "%q#D conflicts with previous using declaration %q#D"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2061
++#: cp/name-lookup.c:2063
+ #, gcc-internal-format
+ msgid "previous non-function declaration %q+#D"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2062
++#: cp/name-lookup.c:2064
+ #, gcc-internal-format
+ msgid "conflicts with function declaration %q#D"
+ msgstr ""
+ 
+ #. It's a nested name with template parameter dependent scope.
+ #. This can only be using-declaration for class member.
+-#: cp/name-lookup.c:2140 cp/name-lookup.c:2165
++#: cp/name-lookup.c:2142 cp/name-lookup.c:2167
+ #, gcc-internal-format
+ msgid "%qT is not a namespace"
+ msgstr ""
+ 
+ #. 7.3.3/5
+ #. A using-declaration shall not name a template-id.
+-#: cp/name-lookup.c:2150
++#: cp/name-lookup.c:2152
+ #, gcc-internal-format
+ msgid "a using-declaration cannot specify a template-id.  Try %<using %D%>"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2157
++#: cp/name-lookup.c:2159
+ #, gcc-internal-format
+ msgid "namespace %qD not allowed in using-declaration"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2193
++#: cp/name-lookup.c:2195
+ #, gcc-internal-format
+ msgid "%qD not declared"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2229 cp/name-lookup.c:2266 cp/name-lookup.c:2300
+-#: cp/name-lookup.c:2315
++#: cp/name-lookup.c:2231 cp/name-lookup.c:2268 cp/name-lookup.c:2302
++#: cp/name-lookup.c:2317
+ #, gcc-internal-format
+ msgid "%qD is already declared in this scope"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2919
++#: cp/name-lookup.c:2921
+ #, gcc-internal-format
+ msgid "using-declaration for non-member at class scope"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2926
++#: cp/name-lookup.c:2928
+ #, gcc-internal-format
+ msgid "%<%T::%D%> names destructor"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2931
++#: cp/name-lookup.c:2933
+ #, gcc-internal-format
+ msgid "%<%T::%D%> names constructor"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2936
++#: cp/name-lookup.c:2938
+ #, gcc-internal-format
+ msgid "%<%T::%D%> names constructor in %qT"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:2986
++#: cp/name-lookup.c:2988
+ #, gcc-internal-format
+ msgid "no members matching %<%T::%D%> in %q#T"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3054
++#: cp/name-lookup.c:3056
+ #, gcc-internal-format
+ msgid "declaration of %qD not in a namespace surrounding %qD"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3062
++#: cp/name-lookup.c:3064
+ #, gcc-internal-format
+ msgid "explicit qualification in declaration of %qD"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3105
++#: cp/name-lookup.c:3107
+ #, gcc-internal-format
+ msgid "%qD should have been declared inside %qD"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3150
++#: cp/name-lookup.c:3152
+ #, gcc-internal-format
+ msgid "%qD attribute requires a single NTBS argument"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3157
++#: cp/name-lookup.c:3159
+ #, gcc-internal-format
+ msgid ""
+ "%qD attribute is meaningless since members of the anonymous namespace get "
+ "local symbols"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3166 cp/name-lookup.c:3536
++#: cp/name-lookup.c:3168 cp/name-lookup.c:3538
+ #, gcc-internal-format
+ msgid "%qD attribute directive ignored"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3211
++#: cp/name-lookup.c:3213
+ #, gcc-internal-format
+ msgid "namespace alias %qD not allowed here, assuming %qD"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3524
++#: cp/name-lookup.c:3526
+ #, gcc-internal-format
+ msgid "strong using only meaningful at namespace scope"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:3528
++#: cp/name-lookup.c:3530
+ #, gcc-internal-format
+ msgid "current namespace %qD does not enclose strongly used namespace %qD"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:4466
++#: cp/name-lookup.c:4467
+ #, gcc-internal-format
+ msgid "%q+D is not a function,"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:4467
++#: cp/name-lookup.c:4468
+ #, gcc-internal-format
+ msgid "  conflict with %q+D"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:4912
++#: cp/name-lookup.c:4913
+ #, gcc-internal-format
+ msgid "argument dependent lookup finds %q+D"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:5353
++#: cp/name-lookup.c:5354
+ #, gcc-internal-format
+ msgid "XXX entering pop_everything ()\n"
+ msgstr ""
+ 
+-#: cp/name-lookup.c:5362
++#: cp/name-lookup.c:5363
+ #, gcc-internal-format
+ msgid "XXX leaving pop_everything ()\n"
+ msgstr ""
+@@ -31868,334 +31922,334 @@
+ msgid "identifier %<%s%> will become a keyword in C++0x"
+ msgstr ""
+ 
+-#: cp/parser.c:2080
++#: cp/parser.c:2084
+ #, gcc-internal-format
+ msgid "%H%<#pragma%> is not allowed here"
+ msgstr ""
+ 
+-#: cp/parser.c:2111
++#: cp/parser.c:2115
+ #, gcc-internal-format
+ msgid "%H%<%E::%E%> has not been declared"
+ msgstr ""
+ 
+-#: cp/parser.c:2114
++#: cp/parser.c:2118
+ #, gcc-internal-format
+ msgid "%H%<::%E%> has not been declared"
+ msgstr ""
+ 
+-#: cp/parser.c:2117
++#: cp/parser.c:2121
+ #, gcc-internal-format
+ msgid "%Hrequest for member %qE in non-class type %qT"
+ msgstr ""
+ 
+-#: cp/parser.c:2120
++#: cp/parser.c:2124
+ #, gcc-internal-format
+ msgid "%H%<%T::%E%> has not been declared"
+ msgstr ""
+ 
+-#: cp/parser.c:2123
++#: cp/parser.c:2127
+ #, gcc-internal-format
+ msgid "%H%qE has not been declared"
+ msgstr ""
+ 
+-#: cp/parser.c:2126
++#: cp/parser.c:2130
+ #, gcc-internal-format
+ msgid "%H%<%E::%E%> %s"
+ msgstr ""
+ 
+-#: cp/parser.c:2128
++#: cp/parser.c:2132
+ #, gcc-internal-format
+ msgid "%H%<::%E%> %s"
+ msgstr ""
+ 
+-#: cp/parser.c:2130
++#: cp/parser.c:2134
+ #, gcc-internal-format
+ msgid "%H%qE %s"
+ msgstr ""
+ 
+-#: cp/parser.c:2165
++#: cp/parser.c:2169
+ #, gcc-internal-format
+ msgid "%H%<long long long%> is too long for GCC"
+ msgstr ""
+ 
+-#: cp/parser.c:2169
++#: cp/parser.c:2173
+ #, gcc-internal-format
+ msgid "ISO C++ 1998 does not support %<long long%>"
+ msgstr ""
+ 
+-#: cp/parser.c:2189
++#: cp/parser.c:2193
+ #, gcc-internal-format
+ msgid "%Hduplicate %qs"
+ msgstr ""
+ 
+-#: cp/parser.c:2233
++#: cp/parser.c:2237
+ #, gcc-internal-format
+ msgid "%Hnew types may not be defined in a return type"
+ msgstr ""
+ 
+-#: cp/parser.c:2235
++#: cp/parser.c:2239
+ #, gcc-internal-format
+ msgid "(perhaps a semicolon is missing after the definition of %qT)"
+ msgstr ""
+ 
+-#: cp/parser.c:2255
++#: cp/parser.c:2259
+ #, gcc-internal-format
+ msgid "%H%qT is not a template"
+ msgstr ""
+ 
+-#: cp/parser.c:2257
++#: cp/parser.c:2261
+ #, gcc-internal-format
+ msgid "%H%qE is not a template"
+ msgstr ""
+ 
+-#: cp/parser.c:2259
++#: cp/parser.c:2263
+ #, gcc-internal-format
+ msgid "%Hinvalid template-id"
+ msgstr ""
+ 
+-#: cp/parser.c:2321
++#: cp/parser.c:2325
+ #, gcc-internal-format
+ msgid "%Hinvalid use of template-name %qE without an argument list"
+ msgstr ""
+ 
+-#: cp/parser.c:2324
++#: cp/parser.c:2328
+ #, gcc-internal-format
+ msgid "%Hinvalid use of destructor %qD as a type"
+ msgstr ""
+ 
+ #. Something like 'unsigned A a;'
+-#: cp/parser.c:2327
++#: cp/parser.c:2331
+ #, gcc-internal-format
+ msgid "%Hinvalid combination of multiple type-specifiers"
+ msgstr ""
+ 
+ #. Issue an error message.
+-#: cp/parser.c:2332
++#: cp/parser.c:2336
+ #, gcc-internal-format
+ msgid "%H%qE does not name a type"
+ msgstr ""
+ 
+-#: cp/parser.c:2365
++#: cp/parser.c:2369
+ #, gcc-internal-format
+ msgid "(perhaps %<typename %T::%E%> was intended)"
+ msgstr ""
+ 
+-#: cp/parser.c:2380
++#: cp/parser.c:2384
+ #, gcc-internal-format
+ msgid "%H%qE in namespace %qE does not name a type"
+ msgstr ""
+ 
+-#: cp/parser.c:2383
++#: cp/parser.c:2387
+ #, gcc-internal-format
+ msgid "%H%qE in class %qT does not name a type"
+ msgstr ""
+ 
+-#: cp/parser.c:2945
++#: cp/parser.c:2951
+ #, gcc-internal-format
+ msgid "%Hunsupported non-standard concatenation of string literals"
+ msgstr ""
+ 
+-#: cp/parser.c:3148
++#: cp/parser.c:3154
+ #, gcc-internal-format
+ msgid "%Hfixed-point types not supported in C++"
+ msgstr ""
+ 
+-#: cp/parser.c:3229
++#: cp/parser.c:3235
+ #, gcc-internal-format
+ msgid "ISO C++ forbids braced-groups within expressions"
+ msgstr ""
+ 
+-#: cp/parser.c:3240
++#: cp/parser.c:3246
+ #, gcc-internal-format
+ msgid ""
+ "%Hstatement-expressions are not allowed outside functions nor in template-"
+ "argument lists"
+ msgstr ""
+ 
+-#: cp/parser.c:3299
++#: cp/parser.c:3305
+ #, gcc-internal-format
+ msgid "%H%<this%> may not be used in this context"
+ msgstr ""
+ 
+-#: cp/parser.c:3508
++#: cp/parser.c:3514
+ #, gcc-internal-format
+ msgid "%Hlocal variable %qD may not appear in this context"
+ msgstr ""
+ 
+-#: cp/parser.c:3808
++#: cp/parser.c:3814
+ #, gcc-internal-format
+ msgid "%Hscope %qT before %<~%> is not a class-name"
+ msgstr ""
+ 
+-#: cp/parser.c:3922
++#: cp/parser.c:3928
+ #, gcc-internal-format
+ msgid "%Hdeclaration of %<~%T%> as member of %qT"
+ msgstr ""
+ 
+-#: cp/parser.c:3936
++#: cp/parser.c:3942
+ #, gcc-internal-format
+ msgid "%Htypedef-name %qD used as destructor declarator"
+ msgstr ""
+ 
+-#: cp/parser.c:4150
++#: cp/parser.c:4156
+ #, gcc-internal-format
+ msgid "%H%qD used without template parameters"
+ msgstr ""
+ 
+-#: cp/parser.c:4154 cp/parser.c:14857 cp/parser.c:17154
++#: cp/parser.c:4160 cp/parser.c:14878 cp/parser.c:17175
+ #, gcc-internal-format
+ msgid "%Hreference to %qD is ambiguous"
+ msgstr ""
+ 
+-#: cp/parser.c:4200 cp/pt.c:5659
++#: cp/parser.c:4206 cp/pt.c:5659
+ #, gcc-internal-format
+ msgid "%qT is not a template"
+ msgstr ""
+ 
+ #. Warn the user that a compound literal is not
+ #. allowed in standard C++.
+-#: cp/parser.c:4624
++#: cp/parser.c:4630
+ #, gcc-internal-format
+ msgid "ISO C++ forbids compound-literals"
+ msgstr ""
+ 
+-#: cp/parser.c:4998
++#: cp/parser.c:5003
+ #, gcc-internal-format
+ msgid "%H%qE does not have class type"
+ msgstr ""
+ 
+-#: cp/parser.c:5082
++#: cp/parser.c:5087
+ #, gcc-internal-format
+ msgid "%Hinvalid use of %qD"
+ msgstr ""
+ 
+-#: cp/parser.c:5661
++#: cp/parser.c:5666
+ #, gcc-internal-format
+ msgid "%Harray bound forbidden after parenthesized type-id"
+ msgstr ""
+ 
+-#: cp/parser.c:5664
++#: cp/parser.c:5669
+ #, gcc-internal-format
+ msgid "try removing the parentheses around the type-id"
+ msgstr ""
+ 
+-#: cp/parser.c:5857
++#: cp/parser.c:5862
+ #, gcc-internal-format
+ msgid "%Hexpression in new-declarator must have integral or enumeration type"
+ msgstr ""
+ 
+-#: cp/parser.c:6113
++#: cp/parser.c:6118
+ #, gcc-internal-format
+ msgid "use of old-style cast"
+ msgstr ""
+ 
+-#: cp/parser.c:6244
++#: cp/parser.c:6249
+ #, gcc-internal-format
+ msgid "%H%<>>%> operator will be treated as two right angle brackets in C++0x"
+ msgstr ""
+ 
+-#: cp/parser.c:6247
++#: cp/parser.c:6252
+ #, gcc-internal-format
+ msgid "suggest parentheses around %<>>%> expression"
+ msgstr ""
+ 
+-#: cp/parser.c:7084
++#: cp/parser.c:7089
+ #, gcc-internal-format
+ msgid "%Hcase label %qE not within a switch statement"
+ msgstr ""
+ 
+-#: cp/parser.c:7096
++#: cp/parser.c:7101
+ #, gcc-internal-format
+ msgid "%Hcase label not within a switch statement"
+ msgstr ""
+ 
+-#: cp/parser.c:7214
++#: cp/parser.c:7219
+ #, gcc-internal-format
+ msgid "%H%<else%> without a previous %<if%>"
+ msgstr ""
+ 
+-#: cp/parser.c:7693
++#: cp/parser.c:7698
+ #, gcc-internal-format
+ msgid "%Hbreak statement not within loop or switch"
+ msgstr ""
+ 
+-#: cp/parser.c:7701 cp/parser.c:7721
++#: cp/parser.c:7706 cp/parser.c:7726
+ #, gcc-internal-format
+ msgid "%Hinvalid exit from OpenMP structured block"
+ msgstr ""
+ 
+-#: cp/parser.c:7704
++#: cp/parser.c:7709
+ #, gcc-internal-format
+ msgid "%Hbreak statement used with OpenMP for loop"
+ msgstr ""
+ 
+-#: cp/parser.c:7714
++#: cp/parser.c:7719
+ #, gcc-internal-format
+ msgid "%Hcontinue statement not within a loop"
+ msgstr ""
+ 
+ #. Issue a warning about this use of a GNU extension.
+-#: cp/parser.c:7757
++#: cp/parser.c:7762
+ #, gcc-internal-format
+ msgid "ISO C++ forbids computed gotos"
+ msgstr ""
+ 
+-#: cp/parser.c:7901 cp/parser.c:15736
++#: cp/parser.c:7906 cp/parser.c:15757
+ #, gcc-internal-format
+ msgid "extra %<;%>"
+ msgstr ""
+ 
+-#: cp/parser.c:8122
++#: cp/parser.c:8127
+ #, gcc-internal-format
+ msgid "%H%<__label__%> not at the beginning of a block"
+ msgstr ""
+ 
+-#: cp/parser.c:8259
++#: cp/parser.c:8264
+ #, gcc-internal-format
+ msgid "%Hmixing declarations and function-definitions is forbidden"
+ msgstr ""
+ 
+-#: cp/parser.c:8399
++#: cp/parser.c:8404
+ #, gcc-internal-format
+ msgid "%H%<friend%> used outside of class"
+ msgstr ""
+ 
+-#: cp/parser.c:8455
++#: cp/parser.c:8460
+ #, gcc-internal-format
+ msgid "%H%<auto%> will change meaning in C++0x; please remove it"
+ msgstr ""
+ 
+-#: cp/parser.c:8574
++#: cp/parser.c:8579
+ #, gcc-internal-format
+ msgid "%Hclass definition may not be declared a friend"
+ msgstr ""
+ 
+-#: cp/parser.c:8644 cp/parser.c:16058
++#: cp/parser.c:8649 cp/parser.c:16079
+ #, gcc-internal-format
+ msgid "%Htemplates may not be %<virtual%>"
+ msgstr ""
+ 
+-#: cp/parser.c:9047
++#: cp/parser.c:9052
+ #, gcc-internal-format
+ msgid "invalid use of %<auto%> in conversion operator"
+ msgstr ""
+ 
+-#: cp/parser.c:9131
++#: cp/parser.c:9136
+ #, gcc-internal-format
+ msgid "%Honly constructors take base initializers"
+ msgstr ""
+ 
+-#: cp/parser.c:9153
++#: cp/parser.c:9158
+ #, gcc-internal-format
+ msgid "%Hcannot expand initializer for member %<%D%>"
+ msgstr ""
+ 
+-#: cp/parser.c:9208
++#: cp/parser.c:9213
+ #, gcc-internal-format
+ msgid "anachronistic old-style base class initializer"
+ msgstr ""
+ 
+-#: cp/parser.c:9268
++#: cp/parser.c:9273
+ #, gcc-internal-format
+ msgid ""
+ "%Hkeyword %<typename%> not allowed in this context (a qualified member "
+@@ -32203,92 +32257,92 @@
+ msgstr ""
+ 
+ #. Warn that we do not support `export'.
+-#: cp/parser.c:9614
++#: cp/parser.c:9619
+ #, gcc-internal-format
+ msgid "keyword %<export%> not implemented, and will be ignored"
+ msgstr ""
+ 
+-#: cp/parser.c:9796 cp/parser.c:9894 cp/parser.c:10000
++#: cp/parser.c:9801 cp/parser.c:9899 cp/parser.c:10005
+ #, gcc-internal-format
+ msgid "%Htemplate parameter pack %qD cannot have a default argument"
+ msgstr ""
+ 
+-#: cp/parser.c:9799
++#: cp/parser.c:9804
+ #, gcc-internal-format
+ msgid "%Htemplate parameter pack cannot have a default argument"
+ msgstr ""
+ 
+-#: cp/parser.c:9897 cp/parser.c:10004
++#: cp/parser.c:9902 cp/parser.c:10009
+ #, gcc-internal-format
+ msgid "%Htemplate parameter packs cannot have default arguments"
+ msgstr ""
+ 
+-#: cp/parser.c:10146
++#: cp/parser.c:10151
+ #, gcc-internal-format
+ msgid "%<<::%> cannot begin a template-argument list"
+ msgstr ""
+ 
+-#: cp/parser.c:10150
++#: cp/parser.c:10155
+ #, gcc-internal-format
+ msgid ""
+ "%<<:%> is an alternate spelling for %<[%>. Insert whitespace between %<<%> "
+ "and %<::%>"
+ msgstr ""
+ 
+-#: cp/parser.c:10228
++#: cp/parser.c:10233
+ #, gcc-internal-format
+ msgid "%Hparse error in template argument list"
+ msgstr ""
+ 
+ #. Explain what went wrong.
+-#: cp/parser.c:10343
++#: cp/parser.c:10348
+ #, gcc-internal-format
+ msgid "%Hnon-template %qD used as template"
+ msgstr ""
+ 
+-#: cp/parser.c:10345
++#: cp/parser.c:10350
+ #, gcc-internal-format
+ msgid "use %<%T::template %D%> to indicate that it is a template"
+ msgstr ""
+ 
+-#: cp/parser.c:10882
++#: cp/parser.c:10887
+ #, gcc-internal-format
+ msgid "%Htemplate specialization with C linkage"
+ msgstr ""
+ 
+-#: cp/parser.c:11527
++#: cp/parser.c:11532
+ #, gcc-internal-format
+ msgid "using %<typename%> outside of template"
+ msgstr ""
+ 
+-#: cp/parser.c:11695
++#: cp/parser.c:11700
+ #, gcc-internal-format
+ msgid "declaration %qD does not declare anything"
+ msgstr ""
+ 
+-#: cp/parser.c:11780
++#: cp/parser.c:11785
+ #, gcc-internal-format
+ msgid "attributes ignored on uninstantiated type"
+ msgstr ""
+ 
+-#: cp/parser.c:11784
++#: cp/parser.c:11789
+ #, gcc-internal-format
+ msgid "attributes ignored on template instantiation"
+ msgstr ""
+ 
+-#: cp/parser.c:11789
++#: cp/parser.c:11794
+ #, gcc-internal-format
+ msgid ""
+ "attributes ignored on elaborated-type-specifier that is not a forward "
+ "declaration"
+ msgstr ""
+ 
+-#: cp/parser.c:12067
++#: cp/parser.c:12077
+ #, gcc-internal-format
+ msgid "%H%qD is not a namespace-name"
+ msgstr ""
+ 
+-#: cp/parser.c:12194
++#: cp/parser.c:12204
+ #, gcc-internal-format
+ msgid "%H%<namespace%> definition is not allowed here"
+ msgstr ""
+@@ -32296,166 +32350,166 @@
+ #. [namespace.udecl]
+ #.
+ #. A using declaration shall not name a template-id.
+-#: cp/parser.c:12334
++#: cp/parser.c:12344
+ #, gcc-internal-format
+ msgid "%Ha template-id may not appear in a using-declaration"
+ msgstr ""
+ 
+-#: cp/parser.c:12711
++#: cp/parser.c:12721
+ #, gcc-internal-format
+ msgid "%Han asm-specification is not allowed on a function-definition"
+ msgstr ""
+ 
+-#: cp/parser.c:12715
++#: cp/parser.c:12725
+ #, gcc-internal-format
+ msgid "%Hattributes are not allowed on a function-definition"
+ msgstr ""
+ 
+-#: cp/parser.c:12868
++#: cp/parser.c:12878
+ #, gcc-internal-format
+ msgid "%Hinitializer provided for function"
+ msgstr ""
+ 
+-#: cp/parser.c:12890
++#: cp/parser.c:12900
+ #, gcc-internal-format
+ msgid "attributes after parenthesized initializer ignored"
+ msgstr ""
+ 
+-#: cp/parser.c:13295
++#: cp/parser.c:13305
+ #, gcc-internal-format
+ msgid "%Harray bound is not an integer constant"
+ msgstr ""
+ 
+-#: cp/parser.c:13407
++#: cp/parser.c:13417
+ #, gcc-internal-format
+ msgid "%H%<%T::%E%> is not a type"
+ msgstr ""
+ 
+-#: cp/parser.c:13434
++#: cp/parser.c:13444
+ #, gcc-internal-format
+ msgid "%Hinvalid use of constructor as a template"
+ msgstr ""
+ 
+-#: cp/parser.c:13436
++#: cp/parser.c:13446
+ #, gcc-internal-format
+ msgid ""
+ "use %<%T::%D%> instead of %<%T::%D%> to name the constructor in a qualified "
+ "name"
+ msgstr ""
+ 
+-#: cp/parser.c:13609
++#: cp/parser.c:13619
+ #, gcc-internal-format
+ msgid "%H%qD is a namespace"
+ msgstr ""
+ 
+-#: cp/parser.c:13684
++#: cp/parser.c:13694
+ #, gcc-internal-format
+ msgid "%Hduplicate cv-qualifier"
+ msgstr ""
+ 
+-#: cp/parser.c:13796
++#: cp/parser.c:13806
+ #, gcc-internal-format
+ msgid "invalid use of %<auto%>"
+ msgstr ""
+ 
+-#: cp/parser.c:14370
++#: cp/parser.c:14391
+ #, gcc-internal-format
+ msgid "%Hfile ends in default argument"
+ msgstr ""
+ 
+-#: cp/parser.c:14416
++#: cp/parser.c:14437
+ #, gcc-internal-format
+ msgid "deprecated use of default argument for parameter of non-function"
+ msgstr ""
+ 
+-#: cp/parser.c:14419
++#: cp/parser.c:14440
+ #, gcc-internal-format
+ msgid "%Hdefault arguments are only permitted for function parameters"
+ msgstr ""
+ 
+-#: cp/parser.c:14437
++#: cp/parser.c:14458
+ #, gcc-internal-format
+ msgid "%H%sparameter pack %qD cannot have a default argument"
+ msgstr ""
+ 
+-#: cp/parser.c:14441
++#: cp/parser.c:14462
+ #, gcc-internal-format
+ msgid "%H%sparameter pack cannot have a default argument"
+ msgstr ""
+ 
+-#: cp/parser.c:14704
++#: cp/parser.c:14725
+ #, gcc-internal-format
+ msgid "ISO C++ does not allow designated initializers"
+ msgstr ""
+ 
+-#: cp/parser.c:15329
++#: cp/parser.c:15350
+ #, gcc-internal-format
+ msgid "%Hinvalid class name in declaration of %qD"
+ msgstr ""
+ 
+-#: cp/parser.c:15342
++#: cp/parser.c:15363
+ #, gcc-internal-format
+ msgid "%Hdeclaration of %qD in namespace %qD which does not enclose %qD"
+ msgstr ""
+ 
+-#: cp/parser.c:15347
++#: cp/parser.c:15368
+ #, gcc-internal-format
+ msgid "%Hdeclaration of %qD in %qD which does not enclose %qD"
+ msgstr ""
+ 
+-#: cp/parser.c:15361
++#: cp/parser.c:15382
+ #, gcc-internal-format
+ msgid "%Hextra qualification not allowed"
+ msgstr ""
+ 
+-#: cp/parser.c:15373
++#: cp/parser.c:15394
+ #, gcc-internal-format
+ msgid "%Han explicit specialization must be preceded by %<template <>%>"
+ msgstr ""
+ 
+-#: cp/parser.c:15402
++#: cp/parser.c:15423
+ #, gcc-internal-format
+ msgid "%Hfunction template %qD redeclared as a class template"
+ msgstr ""
+ 
+-#: cp/parser.c:15484
++#: cp/parser.c:15505
+ #, gcc-internal-format
+ msgid "%Hredefinition of %q#T"
+ msgstr ""
+ 
+-#: cp/parser.c:15486
++#: cp/parser.c:15507
+ #, gcc-internal-format
+ msgid "%Hprevious definition of %q+#T"
+ msgstr ""
+ 
+-#: cp/parser.c:15754
++#: cp/parser.c:15775
+ #, gcc-internal-format
+ msgid "%Ha class-key must be used when declaring a friend"
+ msgstr ""
+ 
+-#: cp/parser.c:15769
++#: cp/parser.c:15790
+ #, gcc-internal-format
+ msgid "%Hfriend declaration does not name a class or function"
+ msgstr ""
+ 
+-#: cp/parser.c:15949
++#: cp/parser.c:15970
+ #, gcc-internal-format
+ msgid "%Hpure-specifier on function-definition"
+ msgstr ""
+ 
+-#: cp/parser.c:16262
++#: cp/parser.c:16283
+ #, gcc-internal-format
+ msgid "%Hkeyword %<typename%> not allowed outside of templates"
+ msgstr ""
+ 
+-#: cp/parser.c:16265
++#: cp/parser.c:16286
+ #, gcc-internal-format
+ msgid ""
+ "%Hkeyword %<typename%> not allowed in this context (the base class is "
+ "implicitly a type)"
+ msgstr ""
+ 
+-#: cp/parser.c:17332
++#: cp/parser.c:17353
+ #, gcc-internal-format
+ msgid "%Htoo few template-parameter-lists"
+ msgstr ""
+@@ -32464,13 +32518,13 @@
+ #. something like:
+ #.
+ #. template <class T> template <class U> void S::f();
+-#: cp/parser.c:17347
++#: cp/parser.c:17368
+ #, gcc-internal-format
+ msgid "%Htoo many template-parameter-lists"
+ msgstr ""
+ 
+ #. Issue an error message.
+-#: cp/parser.c:17621
++#: cp/parser.c:17642
+ #, gcc-internal-format
+ msgid "%Hnamed return values are no longer supported"
+ msgstr ""
+@@ -32478,169 +32532,169 @@
+ #. 14.5.2.2 [temp.mem]
+ #.
+ #. A local class shall not have member templates.
+-#: cp/parser.c:17696
++#: cp/parser.c:17717
+ #, gcc-internal-format
+ msgid "%Hinvalid declaration of member template in local class"
+ msgstr ""
+ 
+-#: cp/parser.c:17706
++#: cp/parser.c:17727
+ #, gcc-internal-format
+ msgid "%Htemplate with C linkage"
+ msgstr ""
+ 
+-#: cp/parser.c:17853
++#: cp/parser.c:17874
+ #, gcc-internal-format
+ msgid "%Htemplate declaration of %qs"
+ msgstr ""
+ 
+-#: cp/parser.c:17917
++#: cp/parser.c:17938
+ #, gcc-internal-format
+ msgid "%Hexplicit template specialization cannot have a storage class"
+ msgstr ""
+ 
+-#: cp/parser.c:18135
++#: cp/parser.c:18156
+ #, gcc-internal-format
+ msgid "%H%<>>%> should be %<> >%> within a nested template argument list"
+ msgstr ""
+ 
+-#: cp/parser.c:18148
++#: cp/parser.c:18169
+ #, gcc-internal-format
+ msgid "%Hspurious %<>>%>, use %<>%> to terminate a template argument list"
+ msgstr ""
+ 
+-#: cp/parser.c:18482
++#: cp/parser.c:18503
+ #, gcc-internal-format
+ msgid "%Hinvalid use of %qD in linkage specification"
+ msgstr ""
+ 
+-#: cp/parser.c:18495
++#: cp/parser.c:18516
+ #, gcc-internal-format
+ msgid "%H%<__thread%> before %qD"
+ msgstr ""
+ 
+-#: cp/parser.c:18816
++#: cp/parser.c:18837
+ #, gcc-internal-format
+ msgid "%qs tag used in naming %q#T"
+ msgstr ""
+ 
+-#: cp/parser.c:18837
++#: cp/parser.c:18858
+ #, gcc-internal-format
+ msgid "%H%qD redeclared with different access"
+ msgstr ""
+ 
+-#: cp/parser.c:18855
++#: cp/parser.c:18876
+ #, gcc-internal-format
+ msgid "%H%<template%> (as a disambiguator) is only allowed within templates"
+ msgstr ""
+ 
+-#: cp/parser.c:19121 cp/parser.c:20048 cp/parser.c:20180
++#: cp/parser.c:19142 cp/parser.c:20069 cp/parser.c:20201
+ #, gcc-internal-format
+ msgid "%Hmisplaced %<@%D%> Objective-C++ construct"
+ msgstr ""
+ 
+-#: cp/parser.c:19265
++#: cp/parser.c:19286
+ #, gcc-internal-format
+ msgid "%H%<@encode%> must specify a type as an argument"
+ msgstr ""
+ 
+-#: cp/parser.c:19581
++#: cp/parser.c:19602
+ #, gcc-internal-format
+ msgid "%Hinvalid Objective-C++ selector name"
+ msgstr ""
+ 
+-#: cp/parser.c:19912
++#: cp/parser.c:19933
+ #, gcc-internal-format
+ msgid "%Hidentifier expected after %<@protocol%>"
+ msgstr ""
+ 
+-#: cp/parser.c:20273
++#: cp/parser.c:20294
+ #, gcc-internal-format
+ msgid "%Htoo many %qs clauses"
+ msgstr ""
+ 
+-#: cp/parser.c:20387
++#: cp/parser.c:20408
+ #, gcc-internal-format
+ msgid "%Hcollapse argument needs positive constant integer expression"
+ msgstr ""
+ 
+-#: cp/parser.c:20676
++#: cp/parser.c:20697
+ #, gcc-internal-format
+ msgid "%Hschedule %<runtime%> does not take a %<chunk_size%> parameter"
+ msgstr ""
+ 
+-#: cp/parser.c:20679
++#: cp/parser.c:20700
+ #, gcc-internal-format
+ msgid "%Hschedule %<auto%> does not take a %<chunk_size%> parameter"
+ msgstr ""
+ 
+-#: cp/parser.c:20827
++#: cp/parser.c:20848
+ #, gcc-internal-format
+ msgid "%H%qs is not valid for %qs"
+ msgstr ""
+ 
+-#: cp/parser.c:21250
++#: cp/parser.c:21271
+ #, gcc-internal-format
+ msgid "parenthesized initialization is not allowed in OpenMP %<for%> loop"
+ msgstr ""
+ 
+-#: cp/parser.c:21375 cp/parser.c:21413
++#: cp/parser.c:21396 cp/parser.c:21434
+ #, gcc-internal-format
+ msgid "%Hiteration variable %qD should not be firstprivate"
+ msgstr ""
+ 
+-#: cp/parser.c:21417
++#: cp/parser.c:21438
+ #, gcc-internal-format
+ msgid "%Hiteration variable %qD should not be reduction"
+ msgstr ""
+ 
+-#: cp/parser.c:21484
++#: cp/parser.c:21505
+ #, gcc-internal-format
+ msgid "%Hnot enough collapsed for loops"
+ msgstr ""
+ 
+-#: cp/parser.c:21530
++#: cp/parser.c:21551
+ #, gcc-internal-format
+ msgid "%Hcollapsed loops not perfectly nested"
+ msgstr ""
+ 
+-#: cp/parser.c:21941
++#: cp/parser.c:21962
+ #, gcc-internal-format
+ msgid "%Hjunk at end of %<#pragma GCC pch_preprocess%>"
+ msgstr ""
+ 
+-#: cp/parser.c:21945
++#: cp/parser.c:21966
+ #, gcc-internal-format
+ msgid "%Hexpected string literal"
+ msgstr ""
+ 
+-#: cp/parser.c:21978
++#: cp/parser.c:21999
+ #, gcc-internal-format
+ msgid "%H%<#pragma GCC pch_preprocess%> must be first"
+ msgstr ""
+ 
+-#: cp/parser.c:21989
++#: cp/parser.c:22010
+ #, gcc-internal-format
+ msgid "%H%<#pragma omp barrier%> may only be used in compound statements"
+ msgstr ""
+ 
+-#: cp/parser.c:22004
++#: cp/parser.c:22025
+ #, gcc-internal-format
+ msgid "%H%<#pragma omp flush%> may only be used in compound statements"
+ msgstr ""
+ 
+-#: cp/parser.c:22019
++#: cp/parser.c:22040
+ #, gcc-internal-format
+ msgid "%H%<#pragma omp taskwait%> may only be used in compound statements"
+ msgstr ""
+ 
+-#: cp/parser.c:22047
++#: cp/parser.c:22068
+ #, gcc-internal-format
+ msgid ""
+ "%H%<#pragma omp section%> may only be used in %<#pragma omp sections%> "
+ "construct"
+ msgstr ""
+ 
+-#: cp/parser.c:22105
++#: cp/parser.c:22126
+ #, gcc-internal-format
+ msgid "inter-module optimizations not implemented for C++"
+ msgstr ""
+@@ -33172,24 +33226,24 @@
+ msgid "for template declaration %q+D"
+ msgstr ""
+ 
+-#: cp/pt.c:6375
++#: cp/pt.c:6376
+ #, gcc-internal-format
+ msgid ""
+ "template instantiation depth exceeds maximum of %d (use -ftemplate-depth-NN "
+ "to increase the maximum) instantiating %qD"
+ msgstr ""
+ 
+-#: cp/pt.c:7572
++#: cp/pt.c:7573
+ #, gcc-internal-format
+ msgid "mismatched argument pack lengths while expanding %<%T%>"
+ msgstr ""
+ 
+-#: cp/pt.c:7576
++#: cp/pt.c:7577
+ #, gcc-internal-format
+ msgid "mismatched argument pack lengths while expanding %<%E%>"
+ msgstr ""
+ 
+-#: cp/pt.c:8548
++#: cp/pt.c:8549
+ #, gcc-internal-format
+ msgid "instantiation of %q+D as type %qT"
+ msgstr ""
+@@ -33207,241 +33261,241 @@
+ #.
+ #. is an attempt to declare a variable with function
+ #. type.
+-#: cp/pt.c:8688
++#: cp/pt.c:8689
+ #, gcc-internal-format
+ msgid "variable %qD has function type"
+ msgstr ""
+ 
+-#: cp/pt.c:8835
++#: cp/pt.c:8836
+ #, gcc-internal-format
+ msgid "invalid parameter type %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:8837
++#: cp/pt.c:8838
+ #, gcc-internal-format
+ msgid "in declaration %q+D"
+ msgstr ""
+ 
+-#: cp/pt.c:8914
++#: cp/pt.c:8915
+ #, gcc-internal-format
+ msgid "function returning an array"
+ msgstr ""
+ 
+-#: cp/pt.c:8916
++#: cp/pt.c:8917
+ #, gcc-internal-format
+ msgid "function returning a function"
+ msgstr ""
+ 
+-#: cp/pt.c:8943
++#: cp/pt.c:8944
+ #, gcc-internal-format
+ msgid "creating pointer to member function of non-class type %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:9164
++#: cp/pt.c:9165
+ #, gcc-internal-format
+ msgid "array bound is not an integer constant"
+ msgstr ""
+ 
+-#: cp/pt.c:9184
++#: cp/pt.c:9185
+ #, gcc-internal-format
+ msgid "creating array with negative size (%qE)"
+ msgstr ""
+ 
+-#: cp/pt.c:9433
++#: cp/pt.c:9434
+ #, gcc-internal-format
+ msgid "forming reference to void"
+ msgstr ""
+ 
+-#: cp/pt.c:9435
++#: cp/pt.c:9436
+ #, gcc-internal-format
+ msgid "forming %s to reference type %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:9486
++#: cp/pt.c:9487
+ #, gcc-internal-format
+ msgid "creating pointer to member of non-class type %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:9492
++#: cp/pt.c:9493
+ #, gcc-internal-format
+ msgid "creating pointer to member reference type %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:9498
++#: cp/pt.c:9499
+ #, gcc-internal-format
+ msgid "creating pointer to member of type void"
+ msgstr ""
+ 
+-#: cp/pt.c:9565
++#: cp/pt.c:9566
+ #, gcc-internal-format
+ msgid "creating array of %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:9571
++#: cp/pt.c:9572
+ #, gcc-internal-format
+ msgid "creating array of %qT, which is an abstract class type"
+ msgstr ""
+ 
+-#: cp/pt.c:9622
++#: cp/pt.c:9623
+ #, gcc-internal-format
+ msgid "%qT is not a class, struct, or union type"
+ msgstr ""
+ 
+-#: cp/pt.c:9657
++#: cp/pt.c:9658
+ #, gcc-internal-format
+ msgid "%qT resolves to %qT, which is not an enumeration type"
+ msgstr ""
+ 
+-#: cp/pt.c:9660
++#: cp/pt.c:9661
+ #, gcc-internal-format
+ msgid "%qT resolves to %qT, which is is not a class type"
+ msgstr ""
+ 
+-#: cp/pt.c:9766
++#: cp/pt.c:9767
+ #, gcc-internal-format
+ msgid "use of %qs in template"
+ msgstr ""
+ 
+-#: cp/pt.c:9903
++#: cp/pt.c:9904
+ #, gcc-internal-format
+ msgid ""
+ "dependent-name %qE is parsed as a non-type, but instantiation yields a type"
+ msgstr ""
+ 
+-#: cp/pt.c:9905
++#: cp/pt.c:9906
+ #, gcc-internal-format
+ msgid "say %<typename %E%> if a type is meant"
+ msgstr ""
+ 
+-#: cp/pt.c:10047
++#: cp/pt.c:10048
+ #, gcc-internal-format
+ msgid "using invalid field %qD"
+ msgstr ""
+ 
+-#: cp/pt.c:10377 cp/pt.c:11040
++#: cp/pt.c:10378 cp/pt.c:11041
+ #, gcc-internal-format
+ msgid "invalid use of pack expansion expression"
+ msgstr ""
+ 
+-#: cp/pt.c:10381 cp/pt.c:11044
++#: cp/pt.c:10382 cp/pt.c:11045
+ #, gcc-internal-format
+ msgid "use %<...%> to expand argument pack"
+ msgstr ""
+ 
+-#: cp/pt.c:10536
++#: cp/pt.c:10537
+ #, gcc-internal-format
+ msgid "iteration variable %qD should not be reduction"
+ msgstr ""
+ 
+-#: cp/pt.c:11204
++#: cp/pt.c:11205
+ #, gcc-internal-format
+ msgid ""
+ "a cast to a type other than an integral or enumeration type cannot appear in "
+ "a constant-expression"
+ msgstr ""
+ 
+-#: cp/pt.c:11671
++#: cp/pt.c:11673
+ #, gcc-internal-format
+ msgid "%qT is not a class or namespace"
+ msgstr ""
+ 
+-#: cp/pt.c:11674
++#: cp/pt.c:11676
+ #, gcc-internal-format
+ msgid "%qD is not a class or namespace"
+ msgstr ""
+ 
+-#: cp/pt.c:11894
++#: cp/pt.c:11896
+ #, gcc-internal-format
+ msgid "%qT is/uses anonymous type"
+ msgstr ""
+ 
+-#: cp/pt.c:11896
++#: cp/pt.c:11898
+ #, gcc-internal-format
+ msgid "template argument for %qD uses local type %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:11906
++#: cp/pt.c:11908
+ #, gcc-internal-format
+ msgid "%qT is a variably modified type"
+ msgstr ""
+ 
+-#: cp/pt.c:11917
++#: cp/pt.c:11919
+ #, gcc-internal-format
+ msgid "integral expression %qE is not constant"
+ msgstr ""
+ 
+-#: cp/pt.c:11935
++#: cp/pt.c:11937
+ #, gcc-internal-format
+ msgid "  trying to instantiate %qD"
+ msgstr ""
+ 
+-#: cp/pt.c:14723
++#: cp/pt.c:14754
+ #, gcc-internal-format
+ msgid "ambiguous class template instantiation for %q#T"
+ msgstr ""
+ 
+-#: cp/pt.c:14726
++#: cp/pt.c:14757
+ #, gcc-internal-format
+ msgid "%s %+#T"
+ msgstr ""
+ 
+-#: cp/pt.c:14749 cp/pt.c:14832
++#: cp/pt.c:14780 cp/pt.c:14863
+ #, gcc-internal-format
+ msgid "explicit instantiation of non-template %q#D"
+ msgstr ""
+ 
+-#: cp/pt.c:14764
++#: cp/pt.c:14795
+ #, gcc-internal-format
+ msgid "%qD is not a static data member of a class template"
+ msgstr ""
+ 
+-#: cp/pt.c:14770 cp/pt.c:14827
++#: cp/pt.c:14801 cp/pt.c:14858
+ #, gcc-internal-format
+ msgid "no matching template for %qD found"
+ msgstr ""
+ 
+-#: cp/pt.c:14775
++#: cp/pt.c:14806
+ #, gcc-internal-format
+ msgid ""
+ "type %qT for explicit instantiation %qD does not match declared type %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:14783
++#: cp/pt.c:14814
+ #, gcc-internal-format
+ msgid "explicit instantiation of %q#D"
+ msgstr ""
+ 
+-#: cp/pt.c:14819
++#: cp/pt.c:14850
+ #, gcc-internal-format
+ msgid "duplicate explicit instantiation of %q#D"
+ msgstr ""
+ 
+-#: cp/pt.c:14842 cp/pt.c:14934
++#: cp/pt.c:14873 cp/pt.c:14965
+ #, gcc-internal-format
+ msgid "ISO C++ 1998 forbids the use of %<extern%> on explicit instantiations"
+ msgstr ""
+ 
+-#: cp/pt.c:14847 cp/pt.c:14951
++#: cp/pt.c:14878 cp/pt.c:14982
+ #, gcc-internal-format
+ msgid "storage class %qD applied to template instantiation"
+ msgstr ""
+ 
+-#: cp/pt.c:14912
++#: cp/pt.c:14943
+ #, gcc-internal-format
+ msgid "explicit instantiation of non-template type %qT"
+ msgstr ""
+ 
+-#: cp/pt.c:14921
++#: cp/pt.c:14952
+ #, gcc-internal-format
+ msgid "explicit instantiation of %q#T before definition of template"
+ msgstr ""
+ 
+-#: cp/pt.c:14939
++#: cp/pt.c:14970
+ #, gcc-internal-format
+ msgid "ISO C++ forbids the use of %qE on explicit instantiations"
+ msgstr ""
+ 
+-#: cp/pt.c:14985
++#: cp/pt.c:15016
+ #, gcc-internal-format
+ msgid "duplicate explicit instantiation of %q#T"
+ msgstr ""
+@@ -33453,12 +33507,12 @@
+ #. member function or static data member of a class template
+ #. shall be present in every translation unit in which it is
+ #. explicitly instantiated.
+-#: cp/pt.c:15435
++#: cp/pt.c:15466
+ #, gcc-internal-format
+ msgid "explicit instantiation of %qD but no definition available"
+ msgstr ""
+ 
+-#: cp/pt.c:15601
++#: cp/pt.c:15632
+ #, gcc-internal-format
+ msgid ""
+ "template instantiation depth exceeds maximum of %d instantiating %q+D, "
+@@ -33466,19 +33520,19 @@
+ "the maximum)"
+ msgstr ""
+ 
+-#: cp/pt.c:15956
++#: cp/pt.c:15987
+ #, gcc-internal-format
+ msgid "%q#T is not a valid type for a template constant parameter"
+ msgstr ""
+ 
+-#: cp/pt.c:16932
++#: cp/pt.c:16977
+ #, gcc-internal-format
+ msgid ""
+ "deducing auto from brace-enclosed initializer list requires #include "
+ "<initializer_list>"
+ msgstr ""
+ 
+-#: cp/pt.c:16973
++#: cp/pt.c:17018
+ #, gcc-internal-format
+ msgid "unable to deduce %qT from %qE"
+ msgstr ""
+@@ -33617,338 +33671,338 @@
+ msgid "__label__ declarations are only allowed in function scopes"
+ msgstr ""
+ 
+-#: cp/semantics.c:1429
++#: cp/semantics.c:1439
+ #, gcc-internal-format
+ msgid "invalid use of member %q+D in static member function"
+ msgstr ""
+ 
+-#: cp/semantics.c:1431
++#: cp/semantics.c:1441
+ #, gcc-internal-format
+ msgid "invalid use of non-static data member %q+D"
+ msgstr ""
+ 
+-#: cp/semantics.c:1432 cp/semantics.c:1471
++#: cp/semantics.c:1442 cp/semantics.c:1484
+ #, gcc-internal-format
+ msgid "from this location"
+ msgstr ""
+ 
+-#: cp/semantics.c:1470
++#: cp/semantics.c:1483
+ #, gcc-internal-format
+ msgid "object missing in reference to %q+D"
+ msgstr ""
+ 
+-#: cp/semantics.c:1964
++#: cp/semantics.c:1973
+ #, gcc-internal-format
+ msgid "arguments to destructor are not allowed"
+ msgstr ""
+ 
+-#: cp/semantics.c:2016
++#: cp/semantics.c:2023
+ #, gcc-internal-format
+ msgid "%<this%> is unavailable for static member functions"
+ msgstr ""
+ 
+-#: cp/semantics.c:2022
++#: cp/semantics.c:2029
+ #, gcc-internal-format
+ msgid "invalid use of %<this%> in non-member function"
+ msgstr ""
+ 
+-#: cp/semantics.c:2024
++#: cp/semantics.c:2031
+ #, gcc-internal-format
+ msgid "invalid use of %<this%> at top level"
+ msgstr ""
+ 
+-#: cp/semantics.c:2048
++#: cp/semantics.c:2055
+ #, gcc-internal-format
+ msgid "invalid qualifying scope in pseudo-destructor name"
+ msgstr ""
+ 
+-#: cp/semantics.c:2053 cp/typeck.c:2130
++#: cp/semantics.c:2060 cp/typeck.c:2130
+ #, gcc-internal-format
+ msgid "qualified type %qT does not match destructor name ~%qT"
+ msgstr ""
+ 
+-#: cp/semantics.c:2075
++#: cp/semantics.c:2082
+ #, gcc-internal-format
+ msgid "%qE is not of type %qT"
+ msgstr ""
+ 
+-#: cp/semantics.c:2119
++#: cp/semantics.c:2126
+ #, gcc-internal-format
+ msgid "compound literal of non-object type %qT"
+ msgstr ""
+ 
+-#: cp/semantics.c:2203
++#: cp/semantics.c:2210
+ #, gcc-internal-format
+ msgid "template type parameters must use the keyword %<class%> or %<typename%>"
+ msgstr ""
+ 
+-#: cp/semantics.c:2244
++#: cp/semantics.c:2251
+ #, gcc-internal-format
+ msgid ""
+ "invalid use of type %qT as a default value for a template template-parameter"
+ msgstr ""
+ 
+-#: cp/semantics.c:2247
++#: cp/semantics.c:2254
+ #, gcc-internal-format
+ msgid "invalid default argument for a template template parameter"
+ msgstr ""
+ 
+-#: cp/semantics.c:2264
++#: cp/semantics.c:2271
+ #, gcc-internal-format
+ msgid "definition of %q#T inside template parameter list"
+ msgstr ""
+ 
+-#: cp/semantics.c:2275
++#: cp/semantics.c:2282
+ #, gcc-internal-format
+ msgid "invalid definition of qualified type %qT"
+ msgstr ""
+ 
+-#: cp/semantics.c:2491
++#: cp/semantics.c:2498
+ #, gcc-internal-format
+ msgid "invalid base-class specification"
+ msgstr ""
+ 
+-#: cp/semantics.c:2503
++#: cp/semantics.c:2510
+ #, gcc-internal-format
+ msgid "base class %qT has cv qualifiers"
+ msgstr ""
+ 
+-#: cp/semantics.c:2528
++#: cp/semantics.c:2535
+ #, gcc-internal-format
+ msgid "%Hincomplete type %qT used in nested name specifier"
+ msgstr ""
+ 
+-#: cp/semantics.c:2532
++#: cp/semantics.c:2539
+ #, gcc-internal-format
+ msgid "%Hreference to %<%T::%D%> is ambiguous"
+ msgstr ""
+ 
+-#: cp/semantics.c:2536
++#: cp/semantics.c:2543
+ #, gcc-internal-format
+ msgid "%H%qD is not a member of %qT"
+ msgstr ""
+ 
+-#: cp/semantics.c:2539
++#: cp/semantics.c:2546
+ #, gcc-internal-format
+ msgid "%H%qD is not a member of %qD"
+ msgstr ""
+ 
+-#: cp/semantics.c:2541
++#: cp/semantics.c:2548
+ #, gcc-internal-format
+ msgid "%H%<::%D%> has not been declared"
+ msgstr ""
+ 
+-#: cp/semantics.c:2682
++#: cp/semantics.c:2689
+ #, gcc-internal-format
+ msgid "use of %<auto%> variable from containing function"
+ msgstr ""
+ 
+-#: cp/semantics.c:2684
++#: cp/semantics.c:2691
+ #, gcc-internal-format
+ msgid "  %q+#D declared here"
+ msgstr ""
+ 
+-#: cp/semantics.c:2722
++#: cp/semantics.c:2729
+ #, gcc-internal-format
+ msgid ""
+ "template parameter %qD of type %qT is not allowed in an integral constant "
+ "expression because it is not of integral or enumeration type"
+ msgstr ""
+ 
+-#: cp/semantics.c:2891
++#: cp/semantics.c:2893
+ #, gcc-internal-format
+ msgid "%qD cannot appear in a constant-expression"
+ msgstr ""
+ 
+-#: cp/semantics.c:2899
++#: cp/semantics.c:2901
+ #, gcc-internal-format
+ msgid "use of namespace %qD as expression"
+ msgstr ""
+ 
+-#: cp/semantics.c:2904
++#: cp/semantics.c:2906
+ #, gcc-internal-format
+ msgid "use of class template %qT as expression"
+ msgstr ""
+ 
+ #. Ambiguous reference to base members.
+-#: cp/semantics.c:2910
++#: cp/semantics.c:2912
+ #, gcc-internal-format
+ msgid "request for member %qD is ambiguous in multiple inheritance lattice"
+ msgstr ""
+ 
+-#: cp/semantics.c:3032 cp/semantics.c:4762
++#: cp/semantics.c:3034 cp/semantics.c:4764
+ #, gcc-internal-format
+ msgid "type of %qE is unknown"
+ msgstr ""
+ 
+-#: cp/semantics.c:3047
++#: cp/semantics.c:3049
+ #, gcc-internal-format
+ msgid "cannot apply %<offsetof%> to destructor %<~%T%>"
+ msgstr ""
+ 
+-#: cp/semantics.c:3058
++#: cp/semantics.c:3060
+ #, gcc-internal-format
+ msgid "cannot apply %<offsetof%> to member function %qD"
+ msgstr ""
+ 
+-#: cp/semantics.c:3503
++#: cp/semantics.c:3505
+ #, gcc-internal-format
+ msgid "%qD is not a variable in clause %qs"
+ msgstr ""
+ 
+-#: cp/semantics.c:3512 cp/semantics.c:3534 cp/semantics.c:3556
++#: cp/semantics.c:3514 cp/semantics.c:3536 cp/semantics.c:3558
+ #, gcc-internal-format
+ msgid "%qD appears more than once in data clauses"
+ msgstr ""
+ 
+-#: cp/semantics.c:3526
++#: cp/semantics.c:3528
+ #, gcc-internal-format
+ msgid "%qD is not a variable in clause %<firstprivate%>"
+ msgstr ""
+ 
+-#: cp/semantics.c:3548
++#: cp/semantics.c:3550
+ #, gcc-internal-format
+ msgid "%qD is not a variable in clause %<lastprivate%>"
+ msgstr ""
+ 
+-#: cp/semantics.c:3578
++#: cp/semantics.c:3580
+ #, gcc-internal-format
+ msgid "num_threads expression must be integral"
+ msgstr ""
+ 
+-#: cp/semantics.c:3592
++#: cp/semantics.c:3594
+ #, gcc-internal-format
+ msgid "schedule chunk size expression must be integral"
+ msgstr ""
+ 
+-#: cp/semantics.c:3724
++#: cp/semantics.c:3726
+ #, gcc-internal-format
+ msgid "%qE has reference type for %qs"
+ msgstr ""
+ 
+-#: cp/semantics.c:3795
++#: cp/semantics.c:3797
+ #, gcc-internal-format
+ msgid "%<threadprivate%> %qD is not file, namespace or block scope variable"
+ msgstr ""
+ 
+-#: cp/semantics.c:3809
++#: cp/semantics.c:3811
+ #, gcc-internal-format
+ msgid "%<threadprivate%> %qE directive not in %qT definition"
+ msgstr ""
+ 
+-#: cp/semantics.c:3944
++#: cp/semantics.c:3946
+ #, gcc-internal-format
+ msgid "%Hinvalid controlling predicate"
+ msgstr ""
+ 
+-#: cp/semantics.c:3954
++#: cp/semantics.c:3956
+ #, gcc-internal-format
+ msgid "%Hdifference between %qE and %qD does not have integer type"
+ msgstr ""
+ 
+-#: cp/semantics.c:4049
++#: cp/semantics.c:4051
+ #, gcc-internal-format
+ msgid "%Hinvalid increment expression"
+ msgstr ""
+ 
+-#: cp/semantics.c:4175 cp/semantics.c:4246
++#: cp/semantics.c:4177 cp/semantics.c:4248
+ #, gcc-internal-format
+ msgid "%Hexpected iteration declaration or initialization"
+ msgstr ""
+ 
+-#: cp/semantics.c:4186
++#: cp/semantics.c:4188
+ #, gcc-internal-format
+ msgid "%Hmissing controlling predicate"
+ msgstr ""
+ 
+-#: cp/semantics.c:4192
++#: cp/semantics.c:4194
+ #, gcc-internal-format
+ msgid "%Hmissing increment expression"
+ msgstr ""
+ 
+-#: cp/semantics.c:4272
++#: cp/semantics.c:4274
+ #, gcc-internal-format
+ msgid "%Hinvalid type for iteration variable %qE"
+ msgstr ""
+ 
+ #. Report the error.
+-#: cp/semantics.c:4474
++#: cp/semantics.c:4476
+ #, gcc-internal-format
+ msgid "static assertion failed: %E"
+ msgstr ""
+ 
+-#: cp/semantics.c:4476
++#: cp/semantics.c:4478
+ #, gcc-internal-format
+ msgid "non-constant condition for static assertion"
+ msgstr ""
+ 
+-#: cp/semantics.c:4568 cp/semantics.c:4685
++#: cp/semantics.c:4570 cp/semantics.c:4687
+ #, gcc-internal-format
+ msgid "argument to decltype must be an expression"
+ msgstr ""
+ 
+-#: cp/semantics.c:4635
++#: cp/semantics.c:4637
+ #, gcc-internal-format
+ msgid "%qE refers to a set of overloaded functions"
+ msgstr ""
+ 
+-#: cp/semantics.c:4718
++#: cp/semantics.c:4720
+ #, gcc-internal-format
+ msgid "unable to determine the declared type of expression %<%E%>"
+ msgstr ""
+ 
+-#: cp/semantics.c:4949
++#: cp/semantics.c:4951
+ #, gcc-internal-format
+ msgid "__is_convertible_to"
+ msgstr ""
+ 
+-#: cp/semantics.c:4988 cp/semantics.c:4998
++#: cp/semantics.c:4990 cp/semantics.c:5000
+ #, gcc-internal-format
+ msgid "incomplete type %qT not allowed"
+ msgstr ""
+ 
+-#: cp/tree.c:881
++#: cp/tree.c:880
+ #, gcc-internal-format
+ msgid "%qV qualifiers cannot be applied to %qT"
+ msgstr ""
+ 
+-#: cp/tree.c:2215
++#: cp/tree.c:2214
+ #, gcc-internal-format
+ msgid "%qE attribute can only be applied to Java class definitions"
+ msgstr ""
+ 
+-#: cp/tree.c:2244
++#: cp/tree.c:2243
+ #, gcc-internal-format
+ msgid "%qE attribute can only be applied to class definitions"
+ msgstr ""
+ 
+-#: cp/tree.c:2250
++#: cp/tree.c:2249
+ #, gcc-internal-format
+ msgid "%qE is obsolete; g++ vtables are now COM-compatible by default"
+ msgstr ""
+ 
+-#: cp/tree.c:2274
++#: cp/tree.c:2273
+ #, gcc-internal-format
+ msgid "requested init_priority is not an integer constant"
+ msgstr ""
+ 
+-#: cp/tree.c:2295
++#: cp/tree.c:2294
+ #, gcc-internal-format
+ msgid ""
+ "can only use %qE attribute on file-scope definitions of objects of class type"
+ msgstr ""
+ 
+-#: cp/tree.c:2303
++#: cp/tree.c:2302
+ #, gcc-internal-format
+ msgid "requested init_priority is out of range"
+ msgstr ""
+ 
+-#: cp/tree.c:2313
++#: cp/tree.c:2312
+ #, gcc-internal-format
+ msgid "requested init_priority is reserved for internal use"
+ msgstr ""
+ 
+-#: cp/tree.c:2324
++#: cp/tree.c:2323
+ #, gcc-internal-format
+ msgid "%qE attribute is not supported on this platform"
+ msgstr ""
+@@ -34814,12 +34868,12 @@
+ msgid "gfc_conv_constant_to_tree(): invalid type: %s"
+ msgstr ""
+ 
+-#: fortran/trans-decl.c:1026
++#: fortran/trans-decl.c:1028
+ #, gcc-internal-format
+ msgid "intrinsic variable which isn't a procedure"
+ msgstr ""
+ 
+-#: fortran/trans-decl.c:3165
++#: fortran/trans-decl.c:3167
+ #, gcc-internal-format
+ msgid "backend decl for module variable %s already exists"
+ msgstr ""
+@@ -35540,3 +35594,13 @@
+ #, gcc-internal-format
+ msgid "local declaration of %qs hides instance variable"
+ msgstr ""
++
++#: ada/gcc-interface/misc.c:221
++#, gcc-internal-format
++msgid "missing argument to \"-%s\""
++msgstr ""
++
++#: ada/gcc-interface/misc.c:279
++#, gcc-internal-format
++msgid "%<-gnat%> misspelled as %<-gant%>"
++msgstr ""
+diff -Naur gcc-4.4.0.orig/gcc/rtl.h gcc-4.4.0/gcc/rtl.h
+--- gcc-4.4.0.orig/gcc/rtl.h	2009-03-18 10:04:26.000000000 -0700
++++ gcc-4.4.0/gcc/rtl.h	2009-04-27 04:55:13.000000000 -0700
+@@ -2282,7 +2282,7 @@
+ extern int true_dependence (const_rtx, enum machine_mode, const_rtx, bool (*)(const_rtx, bool));
+ extern rtx get_addr (rtx);
+ extern int canon_true_dependence (const_rtx, enum machine_mode, rtx, const_rtx,
+-				  bool (*)(const_rtx, bool));
++				  rtx, bool (*)(const_rtx, bool));
+ extern int read_dependence (const_rtx, const_rtx);
+ extern int anti_dependence (const_rtx, const_rtx);
+ extern int output_dependence (const_rtx, const_rtx);
+diff -Naur gcc-4.4.0.orig/gcc/stmt.c gcc-4.4.0/gcc/stmt.c
+--- gcc-4.4.0.orig/gcc/stmt.c	2009-02-27 11:49:42.000000000 -0800
++++ gcc-4.4.0/gcc/stmt.c	2009-04-26 11:53:41.000000000 -0700
+@@ -1418,6 +1418,7 @@
+       goto restart;
+ 
+     case SAVE_EXPR:
++    case NON_LVALUE_EXPR:
+       exp = TREE_OPERAND (exp, 0);
+       goto restart;
+ 
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/ChangeLog gcc-4.4.0/gcc/testsuite/ChangeLog
+--- gcc-4.4.0.orig/gcc/testsuite/ChangeLog	2009-04-21 01:44:06.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/ChangeLog	2009-04-29 08:54:18.000000000 -0700
+@@ -1,3 +1,183 @@
++2009-04-29  H.J. Lu  <hongjiu.lu@intel.com>
++
++	Backport from mainline:
++	2009-04-29  Richard Guenther  <rguenther@suse.de>
++
++	PR middle-end/39937
++	* gcc.c-torture/compile/pr39937.c: New testcase.
++
++2009-04-29  H.J. Lu  <hongjiu.lu@intel.com>
++
++	Backport from mainline:
++	2009-04-29  Richard Guenther  <rguenther@suse.de>
++
++	PR tree-optimization/39941
++	* gcc.c-torture/compile/pr39941.c: New testcase.
++
++	2009-04-29  Anmol P. Paralkar  <anmol@freescale.com>
++
++	PR target/39565
++	* gcc.dg/pr39565.c: New testcase.
++
++	2009-04-28  Richard Guenther  <rguenther@suse.de>
++
++	PR middle-end/39937
++	* gfortran.fortran-torture/compile/pr39937.f: New testcase.
++
++2009-04-28  Jing Yu  <jingyu@google.com>
++
++	Backport from mainline:
++	2009-04-28  Jing Yu  <jingyu@google.com>
++
++	PR testsuite/39790
++	* lib/target-supports.exp (check_effective_target_tls): Remove
++	comment of caching.
++	(check_effective_target_tls_native): Likewise.
++	(check_effective_target_tls_runtime): Likewise.
++	* gcc.dg/tls/alias-1.c (dg-require-effective-target): Change target
++	tls to tls_runtime.
++	* gcc.dg/tls/opt-2.c: Add dg-require-effective-target tls_runtime.
++
++2009-04-28  Michael Meissner  <meissner@linux.vnet.ibm.com>
++
++	Backport from mainline:
++	PR testsuite/39769
++	* gcc.dg/vmx/3a-04.c (test): Don't rely on floating point equality
++	for testing the results of estimate instructions.
++	* gcc.dg/vmx/3a-04m.c (test): Ditto.
++	* gcc.dg/vmx/3a-05.c (test): Ditto.
++
++2009-04-28  H.J. Lu  <hongjiu.lu@intel.com>
++
++	Backport from mainline:
++	2009-04-27  H.J. Lu  <hongjiu.lu@intel.com>
++
++	PR target/39903
++	* gcc.dg/torture/pr39903-1.c: New.
++	* gcc.dg/torture/pr39903-2.c: Likewise.
++
++2009-04-27  Jakub Jelinek  <jakub@redhat.com>
++
++	PR rtl-optimization/39794
++	* gcc.dg/pr39794.c: New test.
++
++2009-04-26  Jakub Jelinek  <jakub@redhat.com>
++
++	PR inline-asm/39543
++	* gcc.target/i386/pr39543-1.c: New test.
++	* gcc.target/i386/pr39543-2.c: New test.
++	* gcc.target/i386/pr39543-3.c: New test.
++
++	PR c/39889
++	* gcc.dg/Wunused-value-3.c: New test.
++
++2009-04-24  Paolo Bonzini  <bonzini@gnu.org>
++
++	PR middle-end/39867
++	* gcc.dg/pr39867.c: New.
++
++2009-04-23  Dodji Seketeli  <dodji@redhat.com>
++
++	PR c++/38228
++	* g++.dg/expr/bound-mem-fun.C: New test.
++
++2009-04-22  Eric Botcazou  <ebotcazou@adacore.com>
++
++	* gnat.dg/enum2.adb: New test.
++	* gnat.dg/enum2_pkg.ads: New helper.
++
++2009-04-22  Jakub Jelinek  <jakub@redhat.com>
++
++	PR c/39855
++	* gcc.dg/torture/pr39855.c: New test.
++
++2009-04-22  Richard Guenther  <rguenther@suse.de>
++
++	PR tree-optimization/39824
++	* gcc.c-torture/compile/pr39824.c: New testcase.
++
++2009-04-22  Dodji Seketeli  <dodji@redhat.com>
++
++	PR c++/39639
++	* g++.dg/cpp0x/pr39639.C: New test.
++
++2009-04-22  H.J. Lu  <hongjiu.lu@intel.com>
++
++	Backport from mainline:
++	2009-04-22  Richard Guenther  <rguenther@suse.de>
++
++	PR tree-optimization/39845
++	* gcc.c-torture/compile/pr39845.c: New testcase.
++
++	2009-04-21  Richard Guenther  <rguenther@suse.de>
++
++	PR middle-end/39829
++	* gcc.dg/torture/pr39829.c: New testcase.
++
++2009-04-12  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	Backport from mainline:
++
++	2009-04-17  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	* gfortran.fortran-torture/execute/getarg_1.x: New file.
++
++	2009-04-17  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	* gfortran.dg/vect/pr39318.f90: Guard with "target fopenmp".
++
++	2009-04-17  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	* gfortran.dg/chmod_1.f90: Disable on spu-*-* targets.
++	* gfortran.dg/chmod_2.f90: Likewise.
++	* gfortran.dg/chmod_3.f90: Likewise.
++	* gfortran.dg/open_errors.f90: Likewise.
++	* gfortran.dg/stat_1.f90: Likewise.
++	* gfortran.dg/stat_2.f90: Likewise.
++
++	2009-04-17  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	* gfortran.fortran-torture/execute/nan_inf_fmt.x: Skip on spu-*-*.
++	* gfortran.fortran-torture/execute/intrinsic_nearest.x: Likewise.
++	* gfortran.fortran-torture/execute/intrinsic_set_exponent.x: Likewise.
++	* gfortran.dg/nearest_1.f90: Likewise.
++	* gfortran.dg/nearest_3.f90: Likewise.
++	* gfortran.dg/isnan_1.f90: Likewise.
++	* gfortran.dg/isnan_2.f90: Likewise.
++	* gfortran.dg/nan_1.f90: Likewise.
++	* gfortran.dg/nan_2.f90: Likewise.
++	* gfortran.dg/nan_3.f90: Likewise.
++	* gfortran.dg/nan_4.f90: Likewise.
++	* gfortran.dg/module_nan.f90: Likewise.
++	* gfortran.dg/int_conv_2.f90: Likewise.
++	* gfortran.dg/init_flag_3.f90: Likewise.
++	* gfortran.dg/namelist_42.f90: Likewise.
++	* gfortran.dg/namelist_43.f90: Likewise.
++	* gfortran.dg/real_const_3.f90: Likewise.
++	* gfortran.dg/transfer_simplify_1.f90: Likewise.
++
++	* gfortran.dg/default_format_1.f90: XFAIL on spu-*-*.
++	* gfortran.dg/default_format_denormal_1.f90: XFAIL on spu-*-*.
++	* gfortran.dg/scalar_mask_2.f90: XFAIL on spu-*-*.
++	* gfortran.dg/integer_exponentiation_3.F90: XFAIL on spu-*-*.
++	* gfortran.dg/integer_exponentiation_5.F90: XFAIL on spu-*-*.
++
++	* gfortran.dg/elemental_subroutine_1.f90: Relax "epsilon" check.
++	* gfortran.dg/gamma_5.f90: Likewise.
++
++	2009-04-17  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
++
++	* lib/gcc-dg.exp (gcc-dg-prune): Make linker message check
++	less strict so it also works with auto-overlay support.
++	* lib/gcc-defs.exp (${tool}_check_unsupported_p): Add check
++	for "exceeds local store" linker errors on the SPU.
++
++	* lib/gfortran.exp: Include target-supports.exp.
++	(gfortran_init): On SPU targets where automatic overlay support
++	is available, use it to build all Fortran test cases.
++
++	* gfortran.dg/pr20257.f90: Skip on spu-*-* targets.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.c-torture/compile/pr39824.c gcc-4.4.0/gcc/testsuite/gcc.c-torture/compile/pr39824.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.c-torture/compile/pr39824.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.c-torture/compile/pr39824.c	2009-04-22 12:55:24.000000000 -0700
+@@ -0,0 +1,26 @@
++static const double internalEndianMagic = 7.949928895127363e-275;
++static const unsigned char ieee_754_mantissa_mask[] = { 0x00, 0x0F, 0xFF, 0xFF,
++    0xFF, 0xFF, 0xFF, 0xFF };
++static inline int 
++trio_isnan (double number)
++{
++  int has_mantissa = 0;
++  unsigned int i;
++  unsigned char current;
++  for (i = 0; i < (unsigned int)sizeof(double); i++)
++    {
++      current = ((unsigned char *)&number)[(((unsigned char
++					      *)&internalEndianMagic)[7-(i)])];
++      has_mantissa |= (current & ieee_754_mantissa_mask[i]);
++    }
++  return has_mantissa;
++}
++void
++xmlXPathEqualNodeSetFloat(int nodeNr, double v)
++{
++  int i;
++  for (i=0; i<nodeNr; i++)
++    if (!trio_isnan(v))
++      break;
++}
++
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.c-torture/compile/pr39845.c gcc-4.4.0/gcc/testsuite/gcc.c-torture/compile/pr39845.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.c-torture/compile/pr39845.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.c-torture/compile/pr39845.c	2009-04-22 07:14:08.000000000 -0700
+@@ -0,0 +1,43 @@
++typedef union tree_node *tree;
++enum tree_code { EXCESS_PRECISION_EXPR };
++enum built_in_function { BUILT_IN_ACOS, BUILT_IN_FPCLASSIFY, BUILT_IN_ISFINITE };
++struct tree_base {
++    __extension__ enum tree_code code : 16;
++    unsigned side_effects_flag : 1;
++};
++struct tree_exp {
++    tree     operands[1];
++};
++struct tree_function_decl {
++    __extension__ enum built_in_function function_code : 11;
++    unsigned static_ctor_flag : 1;
++};
++union tree_node {
++    struct tree_base base;
++    struct tree_function_decl function_decl;
++    struct tree_exp exp;
++};
++static tree
++convert_arguments (tree fundecl)
++{
++  tree val = (void *)0;
++  unsigned int parmnum;
++  unsigned char type_generic_remove_excess_precision = 0;
++  switch (((fundecl)->function_decl.function_code))
++    {
++      case BUILT_IN_ISFINITE:
++      case BUILT_IN_FPCLASSIFY:
++	  type_generic_remove_excess_precision = 1;
++    }
++  for (parmnum = 0;; ++parmnum)
++    if (((enum tree_code) (val)->base.code) == EXCESS_PRECISION_EXPR
++	&& !type_generic_remove_excess_precision)
++      val = ((val)->exp.operands[0]);
++  return val;
++}
++tree
++build_function_call_vec (tree function)
++{
++  return convert_arguments (function);
++}
++
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.c-torture/compile/pr39937.c gcc-4.4.0/gcc/testsuite/gcc.c-torture/compile/pr39937.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.c-torture/compile/pr39937.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.c-torture/compile/pr39937.c	2009-04-29 08:54:18.000000000 -0700
+@@ -0,0 +1,12 @@
++int foo (__const char *__restrict __s);
++static void 
++read_anisou(char line[])
++{
++  foo (line+1);
++}
++void
++read_pdbfile(void)
++{
++  char line[4096];
++  read_anisou (line);
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.c-torture/compile/pr39941.c gcc-4.4.0/gcc/testsuite/gcc.c-torture/compile/pr39941.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.c-torture/compile/pr39941.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.c-torture/compile/pr39941.c	2009-04-29 07:54:54.000000000 -0700
+@@ -0,0 +1,12 @@
++typedef void (*entry_func) (void) __attribute__ ((noreturn));
++extern entry_func entry_addr;
++static void bsd_boot_entry (void)
++{
++  stop ();
++}   
++void bsd_boot (void)
++{
++  entry_addr = (entry_func) bsd_boot_entry;
++  (*entry_addr) ();
++}
++
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/pr39565.c gcc-4.4.0/gcc/testsuite/gcc.dg/pr39565.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/pr39565.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/pr39565.c	2009-04-29 07:54:54.000000000 -0700
+@@ -0,0 +1,48 @@
++/* PR39565: Static variable leaves undefined symbol in object file.
++   Variables codestrs_4 and codestrs_8 should not be undefined,
++   when this program is compiled at -O2. As a basic sanity test,
++   verify that this program compiles into an executable and runs. */
++
++/* { dg-do run } */
++/* { dg-options "-O2" } */
++
++extern void abort (void);
++extern void exit (int);
++extern int strcmp (const char *, const char *);
++
++static const union codestrs_t_4 {
++  struct {
++    char str_2[sizeof ("Illegal opcode")];
++  };
++  char str[0];
++} codestrs_4 = { {"Illegal opcode"} };
++
++static const union codestrs_t_8 {
++  struct {
++    char str_12[sizeof ("Integer divide by zero")];
++  };
++  char str[0];
++} codestrs_8 = { {"Integer divide by zero"} };
++
++const char *
++psiginfo (int pinfo)
++{
++  const char *base = ((void *)0);
++
++  switch (pinfo)
++    {
++    case 4: base = codestrs_4.str; break;
++    case 8: base = codestrs_8.str; break;
++    }
++  return base;
++}
++
++int
++main (void)
++{
++  if (strcmp (psiginfo (4), codestrs_4.str))
++    abort ();
++  if (strcmp (psiginfo (8), codestrs_8.str))
++    abort ();
++  exit (0);
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/pr39794.c gcc-4.4.0/gcc/testsuite/gcc.dg/pr39794.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/pr39794.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/pr39794.c	2009-04-27 04:55:13.000000000 -0700
+@@ -0,0 +1,33 @@
++/* PR rtl-optimization/39794 */
++/* { dg-do run } */
++/* { dg-options "-O2 -funroll-loops" } */
++
++extern void abort ();
++
++void
++foo (int *a, int n)
++{
++  int i;
++  for (i = 0; i < n; i++)
++    {
++      a[i] *= 2;
++      a[i + 1] = a[i - 1] + a[i - 2];
++    }
++}
++
++int a[16];
++int ref[16] = { 0, 1, 4, 2, 10, 12, 24, 44,
++		72, 136, 232, 416, 736, 1296, 2304, 2032 };
++
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 16; i++)
++    a[i] = i;
++  foo (a + 2, 16 - 3);
++  for (i = 0; i < 16; i++)
++    if (ref[i] != a[i])
++      abort ();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/pr39867.c gcc-4.4.0/gcc/testsuite/gcc.dg/pr39867.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/pr39867.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/pr39867.c	2009-04-24 04:34:59.000000000 -0700
+@@ -0,0 +1,12 @@
++/* { dg-do link } */
++/* { dg-options "-O2" } */
++
++int main (void)
++{
++  int exp = -1;
++  /* Wrong folding of the LHS to an unsigned MAX leads to 4294967295 != 2.  */
++  if ((exp < 2 ? 2U : (unsigned int) exp) != 2)
++    link_error ();
++  return 0;
++}
++
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/tls/alias-1.c gcc-4.4.0/gcc/testsuite/gcc.dg/tls/alias-1.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/tls/alias-1.c	2007-09-18 19:35:29.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/tls/alias-1.c	2009-04-28 13:57:42.000000000 -0700
+@@ -1,7 +1,7 @@
+ /* { dg-do link } */
+ /* { dg-require-alias "" } */
+ /* { dg-require-visibility "" } */
+-/* { dg-require-effective-target tls } */
++/* { dg-require-effective-target tls_runtime } */
+ /* Test that encode_section_info handles the change from externally
+    defined to locally defined (via hidden).   Extracted from glibc.  */
+ 
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/tls/opt-2.c gcc-4.4.0/gcc/testsuite/gcc.dg/tls/opt-2.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/tls/opt-2.c	2007-09-18 19:35:29.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/tls/opt-2.c	2009-04-28 13:57:42.000000000 -0700
+@@ -6,6 +6,7 @@
+ /* { dg-options "-O2 -ftls-model=initial-exec" } */
+ /* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+ /* { dg-require-effective-target tls_native } */
++/* { dg-require-effective-target tls_runtime  } */
+ 
+ __thread int thr;
+ 
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/torture/pr39829.c gcc-4.4.0/gcc/testsuite/gcc.dg/torture/pr39829.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/torture/pr39829.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/torture/pr39829.c	2009-04-22 07:14:08.000000000 -0700
+@@ -0,0 +1,27 @@
++/* { dg-do compile } */
++/* { dg-options "-w" } */
++
++void foo (void * DAG_temp117584)
++{
++  char  uA;
++  void* pA;
++  void* pB;
++  void* pC;
++  do {
++      int DAG_temp117585;
++      int DAG_temp117586;
++      void ** __indir_union1 = (void**)DAG_temp117584;
++      DAG_temp117585 = (long)*__indir_union1;
++      DAG_temp117586 = DAG_temp117585;
++      if ( DAG_temp117586 != (int)268435456 )
++	pA = (void*)&uA;
++      pB = (void*)&pA;
++      pC = pB;
++      union __block_indir0_u {  struct {  long val; }  __indir_struct; }
++      * __indir_union = (union __block_indir0_u*)pC;
++      f(__indir_union->__indir_struct.val);
++
++      DAG_temp117584 += 64;
++  } while (1);
++}
++
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/torture/pr39855.c gcc-4.4.0/gcc/testsuite/gcc.dg/torture/pr39855.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/torture/pr39855.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/torture/pr39855.c	2009-04-22 15:02:54.000000000 -0700
+@@ -0,0 +1,24 @@
++/* PR c/39855 */
++/* { dg-do run { target { int32plus } } } */
++
++extern void abort (void);
++
++int i, j, k;
++
++int
++foo (void)
++{
++  return ++i;
++}
++
++int
++main ()
++{
++  if (__CHAR_BIT__ != 8 || sizeof (int) != 4)
++    return 0;
++  j = foo () << 30 << 2;
++  k = (unsigned) foo () >> 16 >> 16;
++  if (i != 2 || j != 0 || k != 0)
++    abort ();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/torture/pr39903-1.c gcc-4.4.0/gcc/testsuite/gcc.dg/torture/pr39903-1.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/torture/pr39903-1.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/torture/pr39903-1.c	2009-04-28 07:35:12.000000000 -0700
+@@ -0,0 +1,24 @@
++/* PR target/39903 */
++/* { dg-do run } */
++/* { dg-options "-Wno-psabi" } */
++
++struct X {
++  double d;
++  double b[];
++};
++
++struct X __attribute__((noinline))
++foo (double d)
++{
++  struct X x;
++  x.d = d;
++  return x;
++}
++extern void abort (void);
++int main()
++{
++  struct X x = foo(3.0);
++  if (x.d != 3.0)
++    abort ();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/torture/pr39903-2.c gcc-4.4.0/gcc/testsuite/gcc.dg/torture/pr39903-2.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/torture/pr39903-2.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/torture/pr39903-2.c	2009-04-28 07:35:12.000000000 -0700
+@@ -0,0 +1,24 @@
++/* PR target/39903 */
++/* { dg-do run } */
++/* { dg-options "-Wno-psabi" } */
++
++struct X {
++  float d;
++  float b[];
++};
++
++struct X __attribute__((noinline))
++foo (float d)
++{
++  struct X x;
++  x.d = d;
++  return x;
++}
++extern void abort (void);
++int main()
++{
++  struct X x = foo(3.0);
++  if (x.d != 3.0)
++    abort ();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/vmx/3a-04.c gcc-4.4.0/gcc/testsuite/gcc.dg/vmx/3a-04.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/vmx/3a-04.c	2004-04-17 18:01:41.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/vmx/3a-04.c	2009-04-28 12:18:59.000000000 -0700
+@@ -10,9 +10,13 @@
+ 
+ static void test()
+ {
+-  check(vec_all_eq(f(((vector float){2,3,5,7}),
++  check(vec_all_gt(f(((vector float){2,3,5,7}),
+ 		     ((vector float){11,13,17,19}),
+ 		     ((vector float){23,29,31,37})),
+-		   ((vector float){23.1818085, 29.2307587, 32.2940826, 128.368393})),
++		   ((vector float){23.18, 29.23, 32.29, 128.36}))
++	&& vec_all_lt(f(((vector float){2,3,5,7}),
++			((vector float){11,13,17,19}),
++			((vector float){23,29,31,37})),
++		      ((vector float){23.19, 29.24, 32.30, 128.37})),
+ 	"f");
+ }
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/vmx/3a-04m.c gcc-4.4.0/gcc/testsuite/gcc.dg/vmx/3a-04m.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/vmx/3a-04m.c	2004-04-17 18:01:41.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/vmx/3a-04m.c	2009-04-28 12:18:59.000000000 -0700
+@@ -10,9 +10,13 @@
+ 
+ static void test()
+ {
+-  check(vec_all_eq(f(((vector float){2,3,5,7}),
++  check(vec_all_gt(f(((vector float){2,3,5,7}),
+ 		     ((vector float){11,13,17,19}),
+ 		     ((vector float){23,29,31,37})),
+-		   ((vector float){23.1818085, 29.2307587, 32.2940826, 128.368393})),
++		   ((vector float){23.18, 29.23, 32.29, 128.36}))
++	&& vec_all_lt(f(((vector float){2,3,5,7}),
++			((vector float){11,13,17,19}),
++			((vector float){23,29,31,37})),
++		      ((vector float){23.19, 29.24, 32.30, 128.37})),
+ 	"f");
+ }
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/vmx/3a-05.c gcc-4.4.0/gcc/testsuite/gcc.dg/vmx/3a-05.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/vmx/3a-05.c	2004-04-17 18:01:41.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/vmx/3a-05.c	2009-04-28 12:18:59.000000000 -0700
+@@ -14,9 +14,13 @@
+ 
+ static void test()
+ {
+-  check(vec_all_eq(f(((vector float){2,3,5,7}),
++  check(vec_all_gt(f(((vector float){2,3,5,7}),
+ 		     ((vector float){11,13,17,19}),
+ 		     ((vector float){23,29,31,37})),
+-		   ((vector float){16.9092026, 18.7693329, -2.8233242, -92.9472198})),
+-		   "f");
++		   ((vector float){16.90, 18.76, -2.83, -92.95}))
++	&& vec_all_lt(f(((vector float){2,3,5,7}),
++		     ((vector float){11,13,17,19}),
++		     ((vector float){23,29,31,37})),
++		   ((vector float){16.91, 18.77, -2.82, -92.94})),
++	"f");
+ }
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.dg/Wunused-value-3.c gcc-4.4.0/gcc/testsuite/gcc.dg/Wunused-value-3.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.dg/Wunused-value-3.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.dg/Wunused-value-3.c	2009-04-26 11:53:41.000000000 -0700
+@@ -0,0 +1,9 @@
++/* PR c/39889 */
++/* { dg-do compile } */
++/* { dg-options "-Wunused-value" } */
++
++int x;
++int foo (void)
++{
++  return (1 ? x = 0 : (void) 0), 0; /* { dg-bogus "value computed is not used" } */
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.target/i386/pr39543-1.c gcc-4.4.0/gcc/testsuite/gcc.target/i386/pr39543-1.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.target/i386/pr39543-1.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.target/i386/pr39543-1.c	2009-04-26 11:58:04.000000000 -0700
+@@ -0,0 +1,52 @@
++/* PR inline-asm/39543 */
++/* { dg-do compile } */
++/* { dg-options "-O3 -fomit-frame-pointer" } */
++
++float __attribute__ ((aligned (16))) s0[128];
++const float s1 = 0.707;
++float s2[8] __attribute__ ((aligned (16)));
++float s3[8] __attribute__ ((aligned (16)));
++float s4[16] __attribute__ ((aligned (16)));
++float s5[16] __attribute__ ((aligned (16)));
++
++void
++foo (int k, float *x, float *y, const float *d, const float *z)
++{
++  float *a, *b, *c, *e;
++
++  a = x + 2 * k;
++  b = a + 2 * k;
++  c = b + 2 * k;
++  e = y + 2 * k;
++  __asm__ volatile (""
++		    : "=m" (x[0]), "=m" (b[0]), "=m" (a[0]), "=m" (c[0])
++		    : "m" (y[0]), "m" (y[k * 2]), "m" (x[0]), "m" (a[0])
++		    : "memory");
++  for (;;)
++    {
++      __asm__ volatile (""
++			:
++			: "m" (y[2]), "m" (d[2]), "m" (e[2]), "m" (z[2])
++			: "memory");
++      if (!--k)
++	break;
++    }
++  __asm__ volatile (""
++		    : "=m" (x[2]), "=m" (x[10]), "=m" (x[6]), "=m" (x[14])
++		    : "m" (y[2]), "m" (y[6]), "m" (x[2]), "m" (x[6]),
++		      "m" (y[18]), "m" (s1)
++		    : "memory");
++}
++
++void
++bar (float *a)
++{
++  foo (4, a, a + 16, s2, s3);
++  foo (8, a, a + 32, s4, s5);
++}
++
++void
++baz (void)
++{
++  bar (s0);
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.target/i386/pr39543-2.c gcc-4.4.0/gcc/testsuite/gcc.target/i386/pr39543-2.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.target/i386/pr39543-2.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.target/i386/pr39543-2.c	2009-04-26 11:58:04.000000000 -0700
+@@ -0,0 +1,51 @@
++/* PR inline-asm/39543 */
++/* { dg-do compile } */
++/* { dg-options "-O3" } */
++
++float __attribute__ ((aligned (16))) s0[128];
++const float s1 = 0.707;
++float s2[8] __attribute__ ((aligned (16)));
++float s3[8] __attribute__ ((aligned (16)));
++float s4[16] __attribute__ ((aligned (16)));
++float s5[16] __attribute__ ((aligned (16)));
++
++void
++foo (int k, float *x, float *y, const float *d, const float *z)
++{
++  float *a, *b, *c, *e;
++
++  a = x + 2 * k;
++  b = a + 2 * k;
++  c = b + 2 * k;
++  e = y + 2 * k;
++  __asm__ volatile (""
++		    : "=m" (x[0]), "=m" (b[0]), "=m" (a[0]), "=m" (c[0])
++		    : "m" (y[0]), "m" (y[k * 2]), "m" (x[0]), "m" (a[0])
++		    : "memory");
++  for (;;)
++    {
++      __asm__ volatile (""
++			:
++			: "m" (y[2]), "m" (d[2]), "m" (e[2]), "m" (z[2])
++			: "memory");
++      if (!--k)
++	break;
++    }
++  __asm__ volatile (""
++		    : "=m" (x[2]), "=m" (x[10]), "=m" (x[6]), "=m" (x[14])
++		    : "m" (y[2]), "m" (y[6]), "m" (x[2]), "m" (x[6]), "m" (s1)
++		    : "memory");
++}
++
++void
++bar (float *a)
++{
++  foo (4, a, a + 16, s2, s3);
++  foo (8, a, a + 32, s4, s5);
++}
++
++void
++baz (void)
++{
++  bar (s0);
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gcc.target/i386/pr39543-3.c gcc-4.4.0/gcc/testsuite/gcc.target/i386/pr39543-3.c
+--- gcc-4.4.0.orig/gcc/testsuite/gcc.target/i386/pr39543-3.c	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gcc.target/i386/pr39543-3.c	2009-04-26 11:58:04.000000000 -0700
+@@ -0,0 +1,42 @@
++/* PR inline-asm/39543 */
++/* { dg-do compile } */
++/* { dg-options "-O2" } */
++
++int s[128];
++
++void
++f1 (void)
++{
++  int i;
++  asm volatile ("# %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 %15 %16 %17"
++		: "=r" (i)
++		: "m" (s[0]), "m" (s[2]), "m" (s[4]), "m" (s[6]), "m" (s[8]),
++		  "m" (s[10]), "m" (s[12]), "m" (s[14]), "m" (s[16]), "m" (s[18]),
++		  "m" (s[20]), "m" (s[22]), "m" (s[24]), "m" (s[26]), "m" (s[28]),
++		  "m" (s[30]), "m" (s[32]));
++  asm volatile ("# %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 %15 %16 %17"
++		: "=r" (i)
++		: "m" (s[0]), "m" (s[2]), "m" (s[4]), "m" (s[6]), "m" (s[8]),
++		  "m" (s[10]), "m" (s[12]), "m" (s[14]), "m" (s[16]), "m" (s[18]),
++		  "m" (s[20]), "m" (s[22]), "m" (s[24]), "m" (s[26]), "m" (s[28]),
++		  "m" (s[30]), "m" (s[32]));
++}
++
++void
++f2 (int *q)
++{
++  int i;
++  int *p = q + 32;
++  asm volatile ("# %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 %15 %16 %17"
++		: "=r" (i)
++		: "m" (p[0]), "m" (p[2]), "m" (p[4]), "m" (p[6]), "m" (p[8]),
++		  "m" (p[10]), "m" (p[12]), "m" (p[14]), "m" (p[16]), "m" (p[18]),
++		  "m" (p[20]), "m" (p[22]), "m" (p[24]), "m" (p[26]), "m" (p[28]),
++		  "m" (p[30]), "m" (p[32]));
++  asm volatile ("# %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 %15 %16 %17"
++		: "=r" (i)
++		: "m" (p[0]), "m" (p[2]), "m" (p[4]), "m" (p[6]), "m" (p[8]),
++		  "m" (p[10]), "m" (p[12]), "m" (p[14]), "m" (p[16]), "m" (p[18]),
++		  "m" (p[20]), "m" (p[22]), "m" (p[24]), "m" (p[26]), "m" (p[28]),
++		  "m" (p[30]), "m" (p[32]));
++}
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/g++.dg/cpp0x/pr39639.C gcc-4.4.0/gcc/testsuite/g++.dg/cpp0x/pr39639.C
+--- gcc-4.4.0.orig/gcc/testsuite/g++.dg/cpp0x/pr39639.C	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/g++.dg/cpp0x/pr39639.C	2009-04-22 12:16:13.000000000 -0700
+@@ -0,0 +1,20 @@
++// Contributed by Dodji Seketeli <dodji@redhat.com>
++// Origin: PR c++/39639
++// { dg-options "-std=c++0x" }
++// { dg-do "compile" }
++
++template <class... Types>
++struct S
++  : S<...Types>, // { dg-error "expected parameter pack before '...'" }
++    S<...Types...>, // { dg-error "expected parameter pack before '...'" }
++    S<...> // { dg-error "expected parameter pack before '...'" }
++{
++  static int f () { return 1;}
++};
++
++int
++main ()
++{
++  return S<void>::f ();
++}
++
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/g++.dg/expr/bound-mem-fun.C gcc-4.4.0/gcc/testsuite/g++.dg/expr/bound-mem-fun.C
+--- gcc-4.4.0.orig/gcc/testsuite/g++.dg/expr/bound-mem-fun.C	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/g++.dg/expr/bound-mem-fun.C	2009-04-23 04:13:57.000000000 -0700
+@@ -0,0 +1,18 @@
++// Contributed by Dodji Seketeli <dodji@redhat.com>
++// Origin PR c++/38228
++// { dg-do "compile" }
++
++struct A
++{
++  A ();
++  template<typename T> A(T);
++};
++
++struct B
++{
++  int foo();
++};
++
++A a = B().*(&B::foo); // { dg-error "invalid use of non-static member function" }
++
++
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/chmod_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/chmod_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/chmod_1.f90	2008-04-30 13:24:46.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/chmod_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,4 @@
+-! { dg-do run { target { ! *-*-mingw* } } }
++! { dg-do run { target { ! { *-*-mingw* spu-*-* } } } }
+ ! { dg-options "-std=gnu" }
+   implicit none
+   character(len=*), parameter :: n = "foobar_file"
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/chmod_2.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/chmod_2.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/chmod_2.f90	2008-04-30 13:24:46.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/chmod_2.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,4 @@
+-! { dg-do run { target { ! *-*-mingw* } } }
++! { dg-do run { target { ! { *-*-mingw* spu-*-* } } } }
+ ! { dg-options "-std=gnu" }
+   implicit none
+   character(len=*), parameter :: n = "foobar_file"
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/chmod_3.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/chmod_3.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/chmod_3.f90	2008-04-30 13:24:46.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/chmod_3.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,4 @@
+-! { dg-do run { target { ! *-*-mingw* } } }
++! { dg-do run { target { ! { *-*-mingw* spu-*-* } } } }
+ ! { dg-options "-std=gnu -fdefault-integer-8" }
+   implicit none
+   character(len=*), parameter :: n = "foobar_file"
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/default_format_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/default_format_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/default_format_1.f90	2008-05-11 02:55:34.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/default_format_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,4 @@
+-! { dg-do run }
++! { dg-do run { xfail spu-*-* } }
+ ! Test XFAILed on Darwin because the system's printf() lacks
+ ! proper support for denormals.
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,4 @@
+-! { dg-do run { xfail alpha*-*-* *-*-darwin[89]* *-*-freebsd* *-*-mingw* } }
++! { dg-do run { xfail alpha*-*-* *-*-darwin[89]* *-*-freebsd* *-*-mingw* spu-*-* } }
+ ! Test XFAILed on these platforms because the system's printf() lacks
+ ! proper support for denormals.
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/elemental_subroutine_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/elemental_subroutine_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/elemental_subroutine_1.f90	2007-09-17 23:34:30.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/elemental_subroutine_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -48,7 +48,7 @@
+ ! Test an expression in the INTENT(IN) argument
+   x = (/1.0, 2.0/)
+   call foobar (cos (x) + u, y)
+-  if (any(abs (y + cos (x) + u) .gt. 2.0e-6)) call abort ()
++  if (any(abs (y + cos (x) + u) .gt. 4.0e-6)) call abort ()
+ 
+ contains
+ 
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/gamma_5.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/gamma_5.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/gamma_5.f90	2007-11-29 20:18:05.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/gamma_5.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -21,7 +21,7 @@
+      xd = n + 0.5d0
+      td = c(n)*sqrt(pi)
+      ts = c(n)*sqrt(pi)
+-     if (abs(gamma(xs)-ts)/ts > 3e-6) call abort
++     if (abs(gamma(xs)-ts)/ts > 9e-6) call abort
+      if (abs(gamma(xd)-td)/td > 5e-14) call abort
+   end do
+   call tst_s(2.3, gamma(2.3))
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/init_flag_3.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/init_flag_3.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/init_flag_3.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/init_flag_3.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,6 +1,7 @@
+ ! { dg-do run }
+ ! { dg-options "-finit-integer=-1 -finit-logical=false -finit-real=nan" }
+ ! { dg-options "-finit-integer=-1 -finit-logical=false -finit-real=nan -mieee" { target alpha*-*-* sh*-*-* } }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ 
+ program init_flag_3
+   call real_test
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/int_conv_2.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/int_conv_2.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/int_conv_2.f90	2008-10-30 21:51:04.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/int_conv_2.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,5 @@
+ ! { dg-do compile }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ ! PR fortran/37930
+ program test
+   implicit none
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/integer_exponentiation_3.F90 gcc-4.4.0/gcc/testsuite/gfortran.dg/integer_exponentiation_3.F90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/integer_exponentiation_3.F90	2007-11-20 13:57:04.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/integer_exponentiation_3.F90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,5 @@
+-! { dg-do run }
++! { dg-do run { xfail spu-*-* } }
++! FAILs on SPU because of wrong compile-time rounding mode
+ ! { dg-options "" }
+ module mod_check
+   implicit none
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/integer_exponentiation_5.F90 gcc-4.4.0/gcc/testsuite/gfortran.dg/integer_exponentiation_5.F90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/integer_exponentiation_5.F90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/integer_exponentiation_5.F90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,5 @@
+-! { dg-do run }
++! { dg-do run { xfail spu-*-* } }
++! FAILs on SPU because of invalid result of 1.0/0.0 inline code
+ ! { dg-options "-fno-range-check" }
+ ! { dg-options "-fno-range-check -mieee" { target alpha*-*-* } } */
+ module mod_check
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/isnan_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/isnan_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/isnan_1.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/isnan_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -2,6 +2,7 @@
+ !
+ ! { dg-do run }
+ ! { dg-options "-pedantic-errors -mieee" { target alpha*-*-* sh*-*-* } }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+   implicit none
+   real :: x
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/isnan_2.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/isnan_2.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/isnan_2.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/isnan_2.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -3,6 +3,7 @@
+ ! { dg-do run }
+ ! { dg-options "-fno-range-check" }
+ ! { dg-options "-fno-range-check -pedantic-errors -mieee" { target alpha*-*-* sh*-*-* } }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+   implicit none
+   character(len=1) :: s
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/module_nan.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/module_nan.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/module_nan.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/module_nan.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,6 +1,7 @@
+ ! { dg-do run }
+ ! { dg-options "-fno-range-check" }
+ ! { dg-options "-fno-range-check -mieee" { target alpha*-*-* sh*-*-* } }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+ ! PR fortran/34318
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/namelist_42.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/namelist_42.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/namelist_42.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/namelist_42.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,5 +1,6 @@
+ ! { dg-do run { target fd_truncate } }
+ ! { dg-options "-mieee" { target alpha*-*-* sh*-*-* } }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+ ! PR fortran/34427
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/namelist_43.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/namelist_43.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/namelist_43.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/namelist_43.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,5 +1,6 @@
+ ! { dg-do run { target fd_truncate } }
+ ! { dg-options "-mieee" { target alpha*-*-* sh*-*-* } }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+ ! PR fortran/34427
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nan_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/nan_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nan_1.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/nan_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -3,6 +3,7 @@
+ !
+ ! { dg-do run }
+ ! { dg-options "-pedantic-errors -mieee" { target alpha*-*-* sh*-*-* } } 
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+ module aux2
+   interface isnan
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nan_2.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/nan_2.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nan_2.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/nan_2.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,6 +1,7 @@
+ ! { dg-do run }
+ ! { dg-options "-fno-range-check -pedantic" }
+ ! { dg-options "-fno-range-check -pedantic -mieee" { target alpha*-*-* sh*-*-* } }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+ ! PR fortran/34333
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nan_3.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/nan_3.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nan_3.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/nan_3.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,6 +1,7 @@
+ ! { dg-do run }
+ ! { dg-options "-fno-range-check" }
+ ! { dg-options "-fno-range-check -mieee" { target alpha*-*-* sh*-*-* } }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+ ! PR fortran/34319
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nan_4.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/nan_4.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nan_4.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/nan_4.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,6 +1,7 @@
+ ! { dg-do compile }
+ ! { dg-options "-std=gnu" } 
+ ! { dg-options "-std=gnu -mieee" { target alpha*-*-* sh*-*-* } } 
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+ ! PR fortran/34398.
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nearest_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/nearest_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nearest_1.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/nearest_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,6 +1,7 @@
+ ! { dg-do run }
+ ! { dg-options "-O0 -ffloat-store" }
+ ! { dg-options "-O0 -ffloat-store -mieee" { target alpha*-*-* } }
++! { dg-skip-if "Denormals not supported" { spu-*-* } { "*" } { "" } }
+ ! PR fortran/27021
+ ! Original code submitted by Dominique d'Humieres
+ ! Converted to Dejagnu for the testsuite by Steven G. Kargl
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nearest_3.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/nearest_3.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/nearest_3.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/nearest_3.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,5 +1,6 @@
+ ! { dg-do run }
+ ! { dg-options "-pedantic-errors -mieee" { target alpha*-*-* sh*-*-* } } 
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ !
+ ! PR fortran/34209
+ !
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/open_errors.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/open_errors.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/open_errors.f90	2008-04-30 13:24:46.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/open_errors.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,4 @@
+-! { dg-do run { target { ! *-*-mingw* } } }
++! { dg-do run { target { ! { *-*-mingw* spu-*-* } } } }
+ ! PR30005 Enhanced error messages for OPEN
+ ! Submitted by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+ character(60) :: msg
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/pr20257.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/pr20257.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/pr20257.f90	2008-03-04 16:59:34.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/pr20257.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,5 @@
+ ! { dg-do run { target fd_truncate } }
++! { dg-skip-if "Too big for local store" { spu-*-* } { "*" } { "" } }
+   integer,parameter :: n = 10000
+   real(8) array(10000)
+ 
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/real_const_3.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/real_const_3.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/real_const_3.f90	2008-12-09 23:49:40.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/real_const_3.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,6 +1,7 @@
+ !{ dg-do run }
+ !{ dg-options "-fno-range-check" }
+ !{ dg-options "-fno-range-check -mieee" { target alpha*-*-* sh*-*-* } }
++!{ dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ ! PR19310 and PR19904, allow disabling range check during compile.
+ ! Contributed by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+ program main
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/scalar_mask_2.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/scalar_mask_2.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/scalar_mask_2.f90	2006-03-20 13:56:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/scalar_mask_2.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,5 @@
+-! { dg-do run }
++! { dg-do run { xfail spu-*-* } }
++! FAILs on SPU because of rounding error reading kinds.h
+ program main
+   ! Test scalar masks for different intrinsics.
+   real, dimension(2,2) :: a
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/stat_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/stat_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/stat_1.f90	2008-05-18 10:55:39.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/stat_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,5 +1,5 @@
+ ! { dg-do run { target fd_truncate } }
+-! { dg-skip-if "" { *-*-mingw* } { "*" } { "" } }
++! { dg-skip-if "" { *-*-mingw* spu-*-* } { "*" } { "" } }
+ ! { dg-options "-std=gnu" }
+   character(len=*), parameter :: f = "testfile"
+   integer :: s1(13), r1, s2(13), r2, s3(13), r3
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/stat_2.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/stat_2.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/stat_2.f90	2008-05-18 10:55:39.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/stat_2.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,5 +1,5 @@
+ ! { dg-do run { target fd_truncate } }
+-! { dg-skip-if "" { *-*-mingw* } { "*" } { "" } }
++! { dg-skip-if "" { *-*-mingw* spu-*-* } { "*" } { "" } }
+ ! { dg-options "-std=gnu" }
+   character(len=*), parameter :: f = "testfile"
+   integer :: s1(13), r1, s2(13), r2, s3(13), r3
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/transfer_simplify_1.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/transfer_simplify_1.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/transfer_simplify_1.f90	2007-05-15 22:40:51.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/transfer_simplify_1.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,5 +1,6 @@
+ ! { dg-do run }
+ ! { dg-options "-O2" }
++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } }
+ ! Tests that the PRs caused by the lack of gfc_simplify_transfer are
+ ! now fixed. These were brought together in the meta-bug PR31237
+ ! (TRANSFER intrinsic).
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/vect/pr39318.f90 gcc-4.4.0/gcc/testsuite/gfortran.dg/vect/pr39318.f90
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.dg/vect/pr39318.f90	2009-03-02 03:52:15.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.dg/vect/pr39318.f90	2009-04-22 04:35:25.000000000 -0700
+@@ -1,4 +1,4 @@
+-! { dg-do compile } 
++! { dg-do compile { target fopenmp } } 
+ ! { dg-options "-c -fopenmp -fexceptions -O2 -ftree-vectorize" } 
+ 
+       subroutine adw_trajsp (F_u,i0,in,j0,jn)
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/compile/pr39937.f gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/compile/pr39937.f
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/compile/pr39937.f	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/compile/pr39937.f	2009-04-29 07:54:54.000000000 -0700
+@@ -0,0 +1,28 @@
++      SUBROUTINE DTREVC( SIDE, HOWMNY, SELECT, N, T, LDT, VL, LDVL, VR,
++     $                   LDVR, MM, M, WORK, INFO )
++      DOUBLE PRECISION   T( LDT, * ), VL( LDVL, * ), VR( LDVR, * ),
++     $                   WORK( * )
++      DOUBLE PRECISION   X( 2, 2 )
++      CALL DLALN2( .FALSE., 1, 1, SMIN, ONE, T( J, J ),
++     $                            ZERO, X, 2, SCALE, XNORM, IERR )
++      CALL DSCAL( KI, SCALE, WORK( 1+N ), 1 )
++      DO 90 J = KI - 2, 1, -1
++      IF( J.GT.JNXT )
++     $               GO TO 90
++      JNXT = J - 1
++      IF( J.GT.1 ) THEN
++          IF( T( J, J-1 ).NE.ZERO ) THEN
++              IF( WORK( J ).GT.BIGNUM / XNORM ) THEN
++                  X( 1, 1 ) = X( 1, 1 ) / XNORM
++              END IF
++          END IF
++          CALL DLALN2( .FALSE., 2, 2, SMIN, ONE,
++     $                            T( J-1, J-1 ), LDT, ONE, ONE,
++     $                            XNORM, IERR )
++          CALL DAXPY( J-2, -X( 1, 1 ), T( 1, J-1 ), 1,
++     $                           WORK( 1+N ), 1 )
++          CALL DAXPY( J-2, -X( 2, 2 ), T( 1, J ), 1,
++     $                           WORK( 1+N2 ), 1 )
++      END IF
++   90          CONTINUE
++      END
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/execute/getarg_1.x gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/execute/getarg_1.x
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/execute/getarg_1.x	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/execute/getarg_1.x	2009-04-22 04:35:25.000000000 -0700
+@@ -0,0 +1,5 @@
++if [istarget "spu-*-*"] {
++    # We need -mstdmain to enable argument processing on SPU.
++    lappend additional_flags "-mstdmain"
++}
++return 0
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.x gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.x
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.x	2004-09-12 11:07:28.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.x	2009-04-22 04:35:25.000000000 -0700
+@@ -1,2 +1,6 @@
++if [istarget "spu-*-*"] {
++    # No Inf/NaN support on SPU.
++    return 1
++}
+ add-ieee-options
+ return 0
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_set_exponent.x gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_set_exponent.x
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_set_exponent.x	2004-09-12 11:07:28.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_set_exponent.x	2009-04-22 04:35:25.000000000 -0700
+@@ -1,2 +1,6 @@
++if [istarget "spu-*-*"] {
++    # No denormal support on SPU.
++    return 1
++}
+ add-ieee-options
+ return 0
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.x gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.x
+--- gcc-4.4.0.orig/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.x	2004-09-12 11:07:28.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.x	2009-04-22 04:35:25.000000000 -0700
+@@ -1,2 +1,6 @@
++if [istarget "spu-*-*"] {
++    # No Inf/NaN support on SPU.
++    return 1
++}
+ add-ieee-options
+ return 0
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gnat.dg/enum2.adb gcc-4.4.0/gcc/testsuite/gnat.dg/enum2.adb
+--- gcc-4.4.0.orig/gcc/testsuite/gnat.dg/enum2.adb	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gnat.dg/enum2.adb	2009-04-22 15:33:59.000000000 -0700
+@@ -0,0 +1,11 @@
++-- { dg-do run }
++-- { dg-options "-gnat05 -O2" }
++
++with Enum2_Pkg; use Enum2_Pkg;
++
++procedure Enum2 is
++  type Enum is (A, B, C, D);
++  Table : array (B .. C, 1 .. 1) of F_String := (others => (others => Null_String));
++begin
++  Table := (others => (others => Null_String));
++end;
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/gnat.dg/enum2_pkg.ads gcc-4.4.0/gcc/testsuite/gnat.dg/enum2_pkg.ads
+--- gcc-4.4.0.orig/gcc/testsuite/gnat.dg/enum2_pkg.ads	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/gnat.dg/enum2_pkg.ads	2009-04-22 15:33:59.000000000 -0700
+@@ -0,0 +1,8 @@
++with Ada.Finalization; use Ada.Finalization;
++
++package Enum2_Pkg is
++  type F_String is new Controlled with record
++    Data : access String;
++  end record;
++  Null_String : constant F_String := (Controlled with Data => null);
++end Enum2_Pkg;
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/lib/gcc-defs.exp gcc-4.4.0/gcc/testsuite/lib/gcc-defs.exp
+--- gcc-4.4.0.orig/gcc/testsuite/lib/gcc-defs.exp	2009-03-19 15:10:22.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/lib/gcc-defs.exp	2009-04-22 04:35:25.000000000 -0700
+@@ -155,6 +155,10 @@
+     if [regexp "(^|\n)\[^\n\]*: region \[^\n\]* is full" $output] {
+ 	return "memory full"
+     }
++    if {[istarget spu-*-*] && \
++            [string match "*exceeds local store*" $output]} {
++	return "memory full"
++    }
+     return ""
+ }
+ 
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/lib/gcc-dg.exp gcc-4.4.0/gcc/testsuite/lib/gcc-dg.exp
+--- gcc-4.4.0.orig/gcc/testsuite/lib/gcc-dg.exp	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/lib/gcc-dg.exp	2009-04-22 04:35:25.000000000 -0700
+@@ -186,7 +186,7 @@
+     # Likewise, if we see ".text exceeds local store range" or
+     # similar.
+     if {[string match "spu-*" $system] && \
+-	    [string match "*exceeds local store range*" $text]} {
++	    [string match "*exceeds local store*" $text]} {
+ 	# The format here is important.  See dg.exp.
+ 	return "::unsupported::memory full"
+     }
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/lib/gfortran.exp gcc-4.4.0/gcc/testsuite/lib/gfortran.exp
+--- gcc-4.4.0.orig/gcc/testsuite/lib/gfortran.exp	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/testsuite/lib/gfortran.exp	2009-04-22 04:35:25.000000000 -0700
+@@ -27,6 +27,7 @@
+ load_lib gcc-defs.exp
+ load_lib timeout.exp
+ load_lib target-libpath.exp
++load_lib target-supports.exp
+ 
+ #
+ # GFORTRAN_UNDER_TEST is the compiler under test.
+@@ -177,6 +178,13 @@
+ 	lappend ALWAYS_GFORTRANFLAGS "additional_flags=$TOOL_OPTIONS"
+     }
+ 
++    # On the SPU, most of the fortran test cases exceed local store size.
++    # Use automatic overlay support to make them fit.
++    if { [check_effective_target_spu_auto_overlay] } {
++	lappend ALWAYS_GFORTRANFLAGS "ldflags=-Wl,--auto-overlay"
++	lappend ALWAYS_GFORTRANFLAGS "ldflags=-Wl,--reserved-space=131072"
++    }
++
+     verbose -log "ALWAYS_GFORTRANFLAGS set to $ALWAYS_GFORTRANFLAGS"
+ 
+     verbose "gfortran is initialized" 3
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/lib/target-supports.exp gcc-4.4.0/gcc/testsuite/lib/target-supports.exp
+--- gcc-4.4.0.orig/gcc/testsuite/lib/target-supports.exp	2009-03-16 14:11:57.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/lib/target-supports.exp	2009-04-28 13:57:42.000000000 -0700
+@@ -544,8 +544,6 @@
+ }
+ 
+ # Return 1 if thread local storage (TLS) is supported, 0 otherwise.
+-#
+-# This won't change for different subtargets so cache the result.
+ 
+ proc check_effective_target_tls {} {
+     return [check_no_compiler_messages tls assembly {
+@@ -556,8 +554,6 @@
+ }
+ 
+ # Return 1 if *native* thread local storage (TLS) is supported, 0 otherwise.
+-#
+-# This won't change for different subtargets so cache the result.
+ 
+ proc check_effective_target_tls_native {} {
+     # VxWorks uses emulated TLS machinery, but with non-standard helper
+@@ -575,8 +571,6 @@
+ }
+ 
+ # Return 1 if TLS executables can run correctly, 0 otherwise.
+-#
+-# This won't change for different subtargets so cache the result.
+ 
+ proc check_effective_target_tls_runtime {} {
+     return [check_runtime tls_runtime {
+diff -Naur gcc-4.4.0.orig/gcc/toplev.c gcc-4.4.0/gcc/toplev.c
+--- gcc-4.4.0.orig/gcc/toplev.c	2008-12-09 13:25:11.000000000 -0800
++++ gcc-4.4.0/gcc/toplev.c	2009-04-28 21:57:17.000000000 -0700
+@@ -1128,10 +1128,14 @@
+ 	   indent, __VERSION__);
+ 
+   /* We need to stringify the GMP macro values.  Ugh, gmp_version has
+-     two string formats, "i.j.k" and "i.j" when k is zero.  */
++     two string formats, "i.j.k" and "i.j" when k is zero.  As of
++     gmp-4.3.0, GMP always uses the 3 number format.  */
+ #define GCC_GMP_STRINGIFY_VERSION3(X) #X
+ #define GCC_GMP_STRINGIFY_VERSION2(X) GCC_GMP_STRINGIFY_VERSION3(X)
+-#if __GNU_MP_VERSION_PATCHLEVEL == 0
++#define GCC_GMP_VERSION_NUM(X,Y,Z) (((X) << 16L) | ((Y) << 8) | (Z))
++#define GCC_GMP_VERSION \
++  GCC_GMP_VERSION_NUM(__GNU_MP_VERSION, __GNU_MP_VERSION_MINOR, __GNU_MP_VERSION_PATCHLEVEL)
++#if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,0) && __GNU_MP_VERSION_PATCHLEVEL == 0
+ #define GCC_GMP_STRINGIFY_VERSION GCC_GMP_STRINGIFY_VERSION2(__GNU_MP_VERSION) "." \
+   GCC_GMP_STRINGIFY_VERSION2(__GNU_MP_VERSION_MINOR)
+ #else
+diff -Naur gcc-4.4.0.orig/gcc/tree-ssa-ccp.c gcc-4.4.0/gcc/tree-ssa-ccp.c
+--- gcc-4.4.0.orig/gcc/tree-ssa-ccp.c	2009-04-16 02:39:20.000000000 -0700
++++ gcc-4.4.0/gcc/tree-ssa-ccp.c	2009-04-22 12:55:24.000000000 -0700
+@@ -1290,7 +1290,9 @@
+ 	if (TREE_CODE (base) == SSA_NAME
+ 	    && (value = get_value (base))
+ 	    && value->lattice_val == CONSTANT
+-	    && TREE_CODE (value->value) == ADDR_EXPR)
++	    && TREE_CODE (value->value) == ADDR_EXPR
++	    && useless_type_conversion_p (TREE_TYPE (t),
++					  TREE_TYPE (TREE_TYPE (value->value))))
+ 	  return fold_const_aggregate_ref (TREE_OPERAND (value->value, 0));
+ 	break;
+       }
+diff -Naur gcc-4.4.0.orig/gcc/tree-ssa-live.c gcc-4.4.0/gcc/tree-ssa-live.c
+--- gcc-4.4.0.orig/gcc/tree-ssa-live.c	2009-03-17 10:53:01.000000000 -0700
++++ gcc-4.4.0/gcc/tree-ssa-live.c	2009-04-22 15:24:45.000000000 -0700
+@@ -595,6 +595,8 @@
+    /* Verfify that only blocks with source location set
+       are entry points to the inlined functions.  */
+      gcc_assert (BLOCK_SOURCE_LOCATION (scope) == UNKNOWN_LOCATION);
++
++   TREE_USED (scope) = !unused;
+    return unused;
+ }
+ 
+diff -Naur gcc-4.4.0.orig/gcc/version.c gcc-4.4.0/gcc/version.c
+--- gcc-4.4.0.orig/gcc/version.c	2007-08-21 08:35:30.000000000 -0700
++++ gcc-4.4.0/gcc/version.c	2009-04-29 14:17:15.000000000 -0700
+@@ -14,4 +14,4 @@
+    Makefile.  */
+ 
+ const char version_string[] = BASEVER DATESTAMP DEVPHASE REVISION;
+-const char pkgversion_string[] = PKGVERSION;
++const char pkgversion_string[] = "(GCC for Cross-LFS 4.4.0.20090429) ";
+diff -Naur gcc-4.4.0.orig/libcpp/po/ChangeLog gcc-4.4.0/libcpp/po/ChangeLog
+--- gcc-4.4.0.orig/libcpp/po/ChangeLog	2009-04-21 01:47:21.000000000 -0700
++++ gcc-4.4.0/libcpp/po/ChangeLog	2009-04-22 09:35:05.000000000 -0700
+@@ -1,3 +1,7 @@
++2009-04-22  Joseph Myers  <joseph@codesourcery.com>
++
++	* cpplib.pot: Regenerate.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/libcpp/po/cpplib.pot gcc-4.4.0/libcpp/po/cpplib.pot
+--- gcc-4.4.0.orig/libcpp/po/cpplib.pot	2009-03-28 00:26:17.000000000 -0700
++++ gcc-4.4.0/libcpp/po/cpplib.pot	2009-04-22 09:35:05.000000000 -0700
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
+-"POT-Creation-Date: 2009-03-28 07:24+0000\n"
++"POT-Creation-Date: 2009-04-22 16:32+0000\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+@@ -74,7 +74,7 @@
+ msgstr ""
+ 
+ #: charset.c:1039
+-#: lex.c:485
++#: lex.c:486
+ msgid "'$' in identifier or number"
+ msgstr ""
+ 
+@@ -398,8 +398,8 @@
+ msgstr ""
+ 
+ #: directives-only.c:222
+-#: lex.c:1148
+-#: traditional.c:162
++#: lex.c:1149
++#: traditional.c:163
+ msgid "unterminated comment"
+ msgstr ""
+ 
+@@ -424,203 +424,203 @@
+ msgid "%s: %s"
+ msgstr ""
+ 
+-#: expr.c:262
++#: expr.c:261
+ msgid "too many decimal points in number"
+ msgstr ""
+ 
+-#: expr.c:291
+-#: expr.c:366
++#: expr.c:290
++#: expr.c:365
+ msgid "fixed-point constants are a GCC extension"
+ msgstr ""
+ 
+-#: expr.c:304
++#: expr.c:303
+ #, c-format
+ msgid "invalid digit \"%c\" in binary constant"
+ msgstr ""
+ 
+-#: expr.c:306
++#: expr.c:305
+ #, c-format
+ msgid "invalid digit \"%c\" in octal constant"
+ msgstr ""
+ 
+-#: expr.c:314
++#: expr.c:313
+ msgid "invalid prefix \"0b\" for floating constant"
+ msgstr ""
+ 
+-#: expr.c:320
++#: expr.c:319
+ msgid "use of C99 hexadecimal floating constant"
+ msgstr ""
+ 
+-#: expr.c:329
++#: expr.c:328
+ msgid "exponent has no digits"
+ msgstr ""
+ 
+-#: expr.c:336
++#: expr.c:335
+ msgid "hexadecimal floating constants require an exponent"
+ msgstr ""
+ 
+-#: expr.c:342
++#: expr.c:341
+ #, c-format
+ msgid "invalid suffix \"%.*s\" on floating constant"
+ msgstr ""
+ 
+-#: expr.c:352
+-#: expr.c:394
++#: expr.c:351
++#: expr.c:393
+ #, c-format
+ msgid "traditional C rejects the \"%.*s\" suffix"
+ msgstr ""
+ 
+-#: expr.c:359
++#: expr.c:358
+ #, c-format
+ msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
+ msgstr ""
+ 
+-#: expr.c:370
++#: expr.c:369
+ msgid "decimal float constants are a GCC extension"
+ msgstr ""
+ 
+-#: expr.c:380
++#: expr.c:379
+ #, c-format
+ msgid "invalid suffix \"%.*s\" on integer constant"
+ msgstr ""
+ 
+-#: expr.c:402
++#: expr.c:401
+ msgid "use of C99 long long integer constant"
+ msgstr ""
+ 
+-#: expr.c:410
++#: expr.c:409
+ msgid "imaginary constants are a GCC extension"
+ msgstr ""
+ 
+-#: expr.c:413
++#: expr.c:412
+ msgid "binary constants are a GCC extension"
+ msgstr ""
+ 
+-#: expr.c:506
++#: expr.c:505
+ msgid "integer constant is too large for its type"
+ msgstr ""
+ 
+-#: expr.c:518
++#: expr.c:517
+ msgid "integer constant is so large that it is unsigned"
+ msgstr ""
+ 
+-#: expr.c:613
++#: expr.c:612
+ msgid "missing ')' after \"defined\""
+ msgstr ""
+ 
+-#: expr.c:620
++#: expr.c:619
+ msgid "operator \"defined\" requires an identifier"
+ msgstr ""
+ 
+-#: expr.c:628
++#: expr.c:627
+ #, c-format
+ msgid "(\"%s\" is an alternative token for \"%s\" in C++)"
+ msgstr ""
+ 
+-#: expr.c:638
++#: expr.c:637
+ msgid "this use of \"defined\" may not be portable"
+ msgstr ""
+ 
+-#: expr.c:691
++#: expr.c:690
+ msgid "floating constant in preprocessor expression"
+ msgstr ""
+ 
+-#: expr.c:697
++#: expr.c:696
+ msgid "imaginary number in preprocessor expression"
+ msgstr ""
+ 
+-#: expr.c:744
++#: expr.c:743
+ #, c-format
+ msgid "\"%s\" is not defined"
+ msgstr ""
+ 
+-#: expr.c:756
++#: expr.c:755
+ msgid "assertions are a GCC extension"
+ msgstr ""
+ 
+-#: expr.c:759
++#: expr.c:758
+ msgid "assertions are a deprecated extension"
+ msgstr ""
+ 
+-#: expr.c:892
+-#: expr.c:921
++#: expr.c:891
++#: expr.c:920
+ #, c-format
+ msgid "missing binary operator before token \"%s\""
+ msgstr ""
+ 
+-#: expr.c:912
++#: expr.c:911
+ #, c-format
+ msgid "token \"%s\" is not valid in preprocessor expressions"
+ msgstr ""
+ 
+-#: expr.c:929
++#: expr.c:928
+ msgid "missing expression between '(' and ')'"
+ msgstr ""
+ 
+-#: expr.c:932
++#: expr.c:931
+ #, c-format
+ msgid "%s with no expression"
+ msgstr ""
+ 
+-#: expr.c:935
++#: expr.c:934
+ #, c-format
+ msgid "operator '%s' has no right operand"
+ msgstr ""
+ 
+-#: expr.c:940
++#: expr.c:939
+ #, c-format
+ msgid "operator '%s' has no left operand"
+ msgstr ""
+ 
+-#: expr.c:966
++#: expr.c:965
+ msgid " ':' without preceding '?'"
+ msgstr ""
+ 
+-#: expr.c:994
++#: expr.c:993
+ #, c-format
+ msgid "unbalanced stack in %s"
+ msgstr ""
+ 
+-#: expr.c:1014
++#: expr.c:1013
+ #, c-format
+ msgid "impossible operator '%u'"
+ msgstr ""
+ 
+-#: expr.c:1115
++#: expr.c:1114
+ msgid "missing ')' in expression"
+ msgstr ""
+ 
+-#: expr.c:1144
++#: expr.c:1143
+ msgid "'?' without following ':'"
+ msgstr ""
+ 
+-#: expr.c:1154
++#: expr.c:1153
+ msgid "integer overflow in preprocessor expression"
+ msgstr ""
+ 
+-#: expr.c:1159
++#: expr.c:1158
+ msgid "missing '(' in expression"
+ msgstr ""
+ 
+-#: expr.c:1191
++#: expr.c:1190
+ #, c-format
+ msgid "the left operand of \"%s\" changes sign when promoted"
+ msgstr ""
+ 
+-#: expr.c:1196
++#: expr.c:1195
+ #, c-format
+ msgid "the right operand of \"%s\" changes sign when promoted"
+ msgstr ""
+ 
+-#: expr.c:1455
++#: expr.c:1454
+ msgid "traditional C rejects the unary plus operator"
+ msgstr ""
+ 
+-#: expr.c:1538
++#: expr.c:1537
+ msgid "comma operator in operand of #if"
+ msgstr ""
+ 
+-#: expr.c:1670
++#: expr.c:1669
+ msgid "division by zero in #if"
+ msgstr ""
+ 
+@@ -660,116 +660,116 @@
+ msgid "Multiple include guards may be useful for:\n"
+ msgstr ""
+ 
+-#: init.c:451
++#: init.c:452
+ msgid "cppchar_t must be an unsigned type"
+ msgstr ""
+ 
+-#: init.c:455
++#: init.c:456
+ #, c-format
+ msgid ""
+ "preprocessor arithmetic has maximum precision of %lu bits; target requires %"
+ "lu bits"
+ msgstr ""
+ 
+-#: init.c:462
++#: init.c:463
+ msgid "CPP arithmetic must be at least as precise as a target int"
+ msgstr ""
+ 
+-#: init.c:465
++#: init.c:466
+ msgid "target char is less than 8 bits wide"
+ msgstr ""
+ 
+-#: init.c:469
++#: init.c:470
+ msgid "target wchar_t is narrower than target char"
+ msgstr ""
+ 
+-#: init.c:473
++#: init.c:474
+ msgid "target int is narrower than target char"
+ msgstr ""
+ 
+-#: init.c:478
++#: init.c:479
+ msgid "CPP half-integer narrower than CPP character"
+ msgstr ""
+ 
+-#: init.c:482
++#: init.c:483
+ #, c-format
+ msgid ""
+ "CPP on this host cannot handle wide character constants over %lu bits, but "
+ "the target requires %lu bits"
+ msgstr ""
+ 
+-#: lex.c:284
++#: lex.c:285
+ msgid "backslash and newline separated by space"
+ msgstr ""
+ 
+-#: lex.c:289
++#: lex.c:290
+ msgid "backslash-newline at end of file"
+ msgstr ""
+ 
+-#: lex.c:304
++#: lex.c:305
+ #, c-format
+ msgid "trigraph ??%c converted to %c"
+ msgstr ""
+ 
+-#: lex.c:311
++#: lex.c:312
+ #, c-format
+ msgid "trigraph ??%c ignored, use -trigraphs to enable"
+ msgstr ""
+ 
+-#: lex.c:357
++#: lex.c:358
+ msgid "\"/*\" within comment"
+ msgstr ""
+ 
+-#: lex.c:415
++#: lex.c:416
+ #, c-format
+ msgid "%s in preprocessing directive"
+ msgstr ""
+ 
+-#: lex.c:424
++#: lex.c:425
+ msgid "null character(s) ignored"
+ msgstr ""
+ 
+-#: lex.c:461
++#: lex.c:462
+ #, c-format
+ msgid "`%.*s' is not in NFKC"
+ msgstr ""
+ 
+-#: lex.c:464
++#: lex.c:465
+ #, c-format
+ msgid "`%.*s' is not in NFC"
+ msgstr ""
+ 
+-#: lex.c:552
++#: lex.c:553
+ #, c-format
+ msgid "attempt to use poisoned \"%s\""
+ msgstr ""
+ 
+-#: lex.c:560
++#: lex.c:561
+ msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro"
+ msgstr ""
+ 
+-#: lex.c:674
++#: lex.c:675
+ msgid "null character(s) preserved in literal"
+ msgstr ""
+ 
+-#: lex.c:677
++#: lex.c:678
+ #, c-format
+ msgid "missing terminating %c character"
+ msgstr ""
+ 
+-#: lex.c:1159
++#: lex.c:1160
+ msgid "C++ style comments are not allowed in ISO C90"
+ msgstr ""
+ 
+-#: lex.c:1161
++#: lex.c:1162
+ msgid "(this will be reported only once per input file)"
+ msgstr ""
+ 
+-#: lex.c:1166
++#: lex.c:1167
+ msgid "multi-line comment"
+ msgstr ""
+ 
+-#: lex.c:1480
++#: lex.c:1481
+ #, c-format
+ msgid "unspellable token %s"
+ msgstr ""
+@@ -833,7 +833,7 @@
+ msgstr ""
+ 
+ #: macro.c:731
+-#: traditional.c:680
++#: traditional.c:681
+ #, c-format
+ msgid "unterminated argument list invoking macro \"%s\""
+ msgstr ""
+@@ -850,67 +850,67 @@
+ "C90 and ISO C++98"
+ msgstr ""
+ 
+-#: macro.c:1453
++#: macro.c:1479
+ #, c-format
+ msgid "duplicate macro parameter \"%s\""
+ msgstr ""
+ 
+-#: macro.c:1499
++#: macro.c:1525
+ #, c-format
+ msgid "\"%s\" may not appear in macro parameter list"
+ msgstr ""
+ 
+-#: macro.c:1507
++#: macro.c:1533
+ msgid "macro parameters must be comma-separated"
+ msgstr ""
+ 
+-#: macro.c:1524
++#: macro.c:1550
+ msgid "parameter name missing"
+ msgstr ""
+ 
+-#: macro.c:1541
++#: macro.c:1567
+ msgid "anonymous variadic macros were introduced in C99"
+ msgstr ""
+ 
+-#: macro.c:1546
++#: macro.c:1572
+ msgid "ISO C does not permit named variadic macros"
+ msgstr ""
+ 
+-#: macro.c:1555
++#: macro.c:1581
+ msgid "missing ')' in macro parameter list"
+ msgstr ""
+ 
+-#: macro.c:1604
++#: macro.c:1630
+ msgid "'##' cannot appear at either end of a macro expansion"
+ msgstr ""
+ 
+-#: macro.c:1638
++#: macro.c:1664
+ msgid "ISO C99 requires whitespace after the macro name"
+ msgstr ""
+ 
+-#: macro.c:1662
++#: macro.c:1688
+ msgid "missing whitespace after the macro name"
+ msgstr ""
+ 
+-#: macro.c:1692
++#: macro.c:1718
+ msgid "'#' is not followed by a macro parameter"
+ msgstr ""
+ 
+-#: macro.c:1811
++#: macro.c:1837
+ #, c-format
+ msgid "\"%s\" redefined"
+ msgstr ""
+ 
+-#: macro.c:1816
++#: macro.c:1842
+ msgid "this is the location of the previous definition"
+ msgstr ""
+ 
+-#: macro.c:1877
++#: macro.c:1903
+ #, c-format
+ msgid "macro argument \"%s\" would be stringified in traditional C"
+ msgstr ""
+ 
+-#: macro.c:1900
++#: macro.c:1926
+ #, c-format
+ msgid "invalid hash type %d in cpp_macro_definition"
+ msgstr ""
+@@ -954,11 +954,11 @@
+ msgid "while reading precompiled header"
+ msgstr ""
+ 
+-#: traditional.c:750
++#: traditional.c:751
+ #, c-format
+ msgid "detected recursion whilst expanding macro \"%s\""
+ msgstr ""
+ 
+-#: traditional.c:968
++#: traditional.c:969
+ msgid "syntax error in macro parameter list"
+ msgstr ""
+diff -Naur gcc-4.4.0.orig/libjava/ChangeLog gcc-4.4.0/libjava/ChangeLog
+--- gcc-4.4.0.orig/libjava/ChangeLog	2009-04-21 01:48:20.000000000 -0700
++++ gcc-4.4.0/libjava/ChangeLog	2009-04-28 05:51:10.000000000 -0700
+@@ -1,3 +1,27 @@
++2009-04-28  Andrew Haley  <aph@redhat.com>
++
++	PR libgcj/39899
++	* Makefile.am (libgcj_tools_la_LDFLAGS): Add
++	-fno-bootstrap-classes to libgcj_tools_la_GCJFLAGS.
++	* Makefile.in: Regenerate.
++
++2009-04-26  Matthias Klose <doko@ubuntu.com>
++
++	* contrib/aot-compile.in: Print diagnostics for malformed or invalid
++	class files.
++	* contrib/generate-cacerts.pl.in: New.
++	* configure.ac (AC_CONFIG_FILES): Add generate-cacerts.pl.
++
++2009-04-24  Matthias Klose  <doko@ubuntu.com>
++
++	* configure.ac: Create missing directory gnu/java/security/jce/prng.
++	* configure: Regenerate.
++
++2009-04-23  Matthias Klose  <doko@ubuntu.com>
++
++	* Makefile.am (install-data-local): Fix symlinks to header files.
++	* Makefile.in: Regenerate.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
+--- gcc-4.4.0.orig/libjava/configure	2009-04-21 02:08:08.000000000 -0700
++++ gcc-4.4.0/libjava/configure	2009-04-26 07:24:38.000000000 -0700
+@@ -19141,6 +19141,8 @@
+ 
+ 
+ # Likewise for natVMSecureRandom.cc
++test -d gnu/java/security || mkdir gnu/java/security
++test -d gnu/java/security/jce || mkdir gnu/java/security/jce
+ test -d gnu/java/security/jce/prng || mkdir gnu/java/security/jce/prng
+           ac_config_links="$ac_config_links gnu/java/security/jce/prng/natVMSecureRandom.cc:gnu/java/security/jce/prng/natVMSecureRandom${FILE-${PLATFORM}}.cc"
+ 
+@@ -28310,7 +28312,7 @@
+ 
+ fi
+ 
+-                                                                                                              ac_config_files="$ac_config_files Makefile libgcj.pc libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile contrib/aotcompile.py contrib/aot-compile contrib/aot-compile-rpm contrib/rebuild-gcj-db"
++                                                                                                                        ac_config_files="$ac_config_files Makefile libgcj.pc libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile contrib/aotcompile.py contrib/aot-compile contrib/aot-compile-rpm contrib/generate-cacerts.pl contrib/rebuild-gcj-db"
+ 
+ 
+ if test ${multilib} = yes; then
+@@ -29560,6 +29562,7 @@
+   "contrib/aotcompile.py" ) CONFIG_FILES="$CONFIG_FILES contrib/aotcompile.py" ;;
+   "contrib/aot-compile" ) CONFIG_FILES="$CONFIG_FILES contrib/aot-compile" ;;
+   "contrib/aot-compile-rpm" ) CONFIG_FILES="$CONFIG_FILES contrib/aot-compile-rpm" ;;
++  "contrib/generate-cacerts.pl" ) CONFIG_FILES="$CONFIG_FILES contrib/generate-cacerts.pl" ;;
+   "contrib/rebuild-gcj-db" ) CONFIG_FILES="$CONFIG_FILES contrib/rebuild-gcj-db" ;;
+   "scripts/jar" ) CONFIG_FILES="$CONFIG_FILES scripts/jar" ;;
+   "include/platform.h" ) CONFIG_LINKS="$CONFIG_LINKS include/platform.h:include/$PLATFORMH" ;;
+diff -Naur gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
+--- gcc-4.4.0.orig/libjava/configure.ac	2009-04-09 14:54:28.000000000 -0700
++++ gcc-4.4.0/libjava/configure.ac	2009-04-26 07:24:38.000000000 -0700
+@@ -834,6 +834,8 @@
+ AC_CONFIG_LINKS(gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc)
+ 
+ # Likewise for natVMSecureRandom.cc
++test -d gnu/java/security || mkdir gnu/java/security
++test -d gnu/java/security/jce || mkdir gnu/java/security/jce
+ test -d gnu/java/security/jce/prng || mkdir gnu/java/security/jce/prng
+ AC_CONFIG_LINKS(gnu/java/security/jce/prng/natVMSecureRandom.cc:gnu/java/security/jce/prng/natVMSecureRandom${FILE-${PLATFORM}}.cc)
+ 
+@@ -1921,6 +1923,7 @@
+ contrib/aotcompile.py
+ contrib/aot-compile
+ contrib/aot-compile-rpm
++contrib/generate-cacerts.pl
+ contrib/rebuild-gcj-db
+ ])
+ 
+diff -Naur gcc-4.4.0.orig/libjava/contrib/aotcompile.py.in gcc-4.4.0/libjava/contrib/aotcompile.py.in
+--- gcc-4.4.0.orig/libjava/contrib/aotcompile.py.in	2008-07-02 06:17:54.000000000 -0700
++++ gcc-4.4.0/libjava/contrib/aotcompile.py.in	2009-04-26 07:24:38.000000000 -0700
+@@ -177,11 +177,14 @@
+     
+     def __init__(self, path):
+         self.path, self.classes, self.blocks = path, {}, None
++        self.classnames = {}
+ 
+-    def addClass(self, bytes):
++    def addClass(self, bytes, name):
+         """Subclasses call this from their __init__ method for
+         every class they find."""
+-        self.classes[md5.new(bytes).digest()] = bytes
++        digest = md5.new(bytes).digest()
++        self.classes[digest] = bytes
++        self.classnames[digest] = name
+ 
+     def __makeBlocks(self):
+         """Split self.classes into chunks that can be compiled to
+@@ -200,7 +203,12 @@
+         if the job is subsetted."""
+         names = {}
+         for hash, bytes in self.classes.items():
+-            name = classname(bytes)
++            try:
++                name = classname(bytes)
++            except:
++                warn("job %s: class %s malformed or not a valid class file" \
++                     % (self.path, self.classnames[hash]))
++                raise
+             if not names.has_key(name):
+                 names[name] = []
+             names[name].append(hash)
+@@ -302,7 +310,7 @@
+             if bytes.startswith(ZIPMAGIC):
+                 self._walk(zipfile.ZipFile(StringIO.StringIO(bytes)))
+             elif bytes.startswith(CLASSMAGIC):
+-                self.addClass(bytes)
++                self.addClass(bytes, name)
+ 
+ class DirJob(Job):
+     """A Job whose origin was a directory of classfiles."""
+@@ -319,7 +327,7 @@
+             fp = open(path, "r")
+             magic = fp.read(4)
+             if magic == CLASSMAGIC:
+-                self.addClass(magic + fp.read())
++                self.addClass(magic + fp.read(), name)
+     
+ def weed_jobs(jobs):
+     """Remove any jarfiles that are completely contained within
+diff -Naur gcc-4.4.0.orig/libjava/contrib/generate-cacerts.pl.in gcc-4.4.0/libjava/contrib/generate-cacerts.pl.in
+--- gcc-4.4.0.orig/libjava/contrib/generate-cacerts.pl.in	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/libjava/contrib/generate-cacerts.pl.in	2009-04-26 07:24:38.000000000 -0700
+@@ -0,0 +1,106 @@
++#!/usr/bin/perl
++
++# Copyright (C) 2007, 2009 Free Software Foundation
++#
++# 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.
++
++# generate-cacerts.pl generates a gkeytool keystore named 'cacerts'
++# from OpenSSL's certificate bundle.
++
++# First extract each of OpenSSL's bundled certificates into its own
++# aliased filename.
++chomp($file=@ARGV[0]);
++$file = "/etc/pki/tls/cert.pem" unless $file ne "";
++open(CERTS, $file);
++@certs = <CERTS>;
++close(CERTS);
++
++$pem_file_number = 0;
++$writing_cert = 0;
++foreach $cert (@certs)
++{
++	 if ($cert eq "-----BEGIN CERTIFICATE-----\n")
++	 {
++		  if ($writing_cert != 0)
++		  {
++				die "$file is malformed.";
++		  }
++		  $pem_file_number++;
++		  # Numbering each file guarantees that cert aliases will be
++		  # unique.
++		  $pem_file_name = "$pem_file_number$cert_alias.pem";
++		  $writing_cert = 1;
++		  open(PEM, ">$pem_file_name");
++		  print PEM $cert;
++	 }
++	 elsif ($cert eq "-----END CERTIFICATE-----\n")
++	 {
++		  $writing_cert = 0;
++		  print PEM $cert;
++		  close(PEM);
++	 }
++	 elsif ($cert =~ /Issuer: /)
++	 {
++		  # Generate an alias using the OU and CN attributes of the
++		  # Issuer field if both are present, otherwise use only the CN
++		  # attribute.  The Issuer field must have either the OU or the
++		  # CN attribute.
++		  $_ = $cert;
++		  if ($cert =~ /OU=/)
++		  {
++				s/Issuer:.*?OU=//;
++				# Remove other occurrences of OU=.
++				s/OU=.*CN=//;
++				# Remove CN= if there were not other occurrences of OU=.
++				s/CN=//;
++		  }
++		  elsif ($cert =~ /CN=/)
++		  {
++				s/Issuer:.*CN=//;
++		  }
++		  s/\W//g;
++		  tr/A-Z/a-z/;
++		  $cert_alias = $_
++	 }
++	 else
++	 {
++		  if ($writing_cert == 1)
++		  {
++				print PEM $cert;
++		  }
++	 }
++}
++
++# Check that the correct number of .pem files were produced.
++@pem_files = <*.pem>;
++if (@pem_files != $pem_file_number)
++{
++	 die "Number of .pem files produced does not match".
++		  " number of certs read from $file.";
++}
++
++# Now store each cert in the 'cacerts' file using gkeytool.
++$certs_written_count = 0;
++foreach $pem_file (@pem_files)
++{
++	 system "yes | gkeytool@gcc_suffix@ -import -alias `basename $pem_file .pem`".
++		  " -keystore cacerts -storepass '' -file $pem_file".
++		  " 2>&1 >/dev/null";
++	 unlink($pem_file);
++	 $certs_written_count++;
++}
++
++# Check that the correct number of certs were added to the keystore.
++if ($certs_written_count != $pem_file_number)
++{
++	 die "Number of certs added to keystore does not match".
++		  " number of certs read from $file.";
++}
+diff -Naur gcc-4.4.0.orig/libjava/Makefile.am gcc-4.4.0/libjava/Makefile.am
+--- gcc-4.4.0.orig/libjava/Makefile.am	2009-03-03 09:03:51.000000000 -0800
++++ gcc-4.4.0/libjava/Makefile.am	2009-04-28 05:51:10.000000000 -0700
+@@ -305,8 +305,15 @@
+ ## compiled.
+ EXTRA_libgcj_la_SOURCES = java/lang/Object.java
+ 
++# We compile libgcj_tools with -findirect-dispatch so that they can
++# depend on external classes: in particular, gjdoc uses antlr.  In
++# addition, -fno-bootstrap-classes ensures that the tools are loaded
++# by the system class loader rather than the bootstrap class loader:
++# only core library classes should be loaded by the bootstrap loader.
+ libgcj_tools_la_SOURCES = classpath/tools/tools.zip
+-libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
++libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
++ -fno-bootstrap-classes -fno-indirect-classes \
++ -fsource-filename=$(here)/classpath/tools/all-classes.lst
+ libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
+  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+  $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
+@@ -578,6 +585,8 @@
+ 	RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \
+ 	ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+ 	  $(DESTDIR)$(SDK_BIN_DIR)/java; \
++	ln -sf $$RELATIVE/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
++	  $(DESTDIR)$(SDK_BIN_DIR)/javac; \
+ 	ln -sf $$RELATIVE/`echo gjar | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+ 	  $(DESTDIR)$(SDK_BIN_DIR)/jar; \
+ 	ln -sf $$RELATIVE/`echo gjdoc | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+diff -Naur gcc-4.4.0.orig/libjava/Makefile.in gcc-4.4.0/libjava/Makefile.in
+--- gcc-4.4.0.orig/libjava/Makefile.in	2009-04-21 02:08:08.000000000 -0700
++++ gcc-4.4.0/libjava/Makefile.in	2009-04-28 05:51:10.000000000 -0700
+@@ -72,6 +72,7 @@
+ 	$(top_srcdir)/contrib/aot-compile-rpm.in \
+ 	$(top_srcdir)/contrib/aot-compile.in \
+ 	$(top_srcdir)/contrib/aotcompile.py.in \
++	$(top_srcdir)/contrib/generate-cacerts.pl.in \
+ 	$(top_srcdir)/contrib/rebuild-gcj-db.in \
+ 	$(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
+ @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_19 = gen-from-JIS
+@@ -111,9 +112,10 @@
+ 	$(top_builddir)/gcj/libgcj-config.h
+ CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \
+ 	contrib/aotcompile.py contrib/aot-compile \
+-	contrib/aot-compile-rpm contrib/rebuild-gcj-db scripts/jar \
+-	java/io/natFile.cc java/lang/natConcreteProcess.cc \
+-	java/net/natVMInetAddress.cc java/net/natVMNetworkInterface.cc \
++	contrib/aot-compile-rpm contrib/generate-cacerts.pl \
++	contrib/rebuild-gcj-db scripts/jar java/io/natFile.cc \
++	java/lang/natConcreteProcess.cc java/net/natVMInetAddress.cc \
++	java/net/natVMNetworkInterface.cc \
+ 	gnu/java/net/natPlainSocketImpl.cc \
+ 	gnu/java/net/natPlainDatagramSocketImpl.cc \
+ 	gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
+@@ -1028,8 +1030,17 @@
+ 	$(libgcj_la_LIBADD) $(am__append_18)
+ libgcj_la_LINK = $(LIBLINK)
+ EXTRA_libgcj_la_SOURCES = java/lang/Object.java
++
++# We compile libgcj_tools with -findirect-dispatch so that they can
++# depend on external classes: in particular, gjdoc uses antlr.  In
++# addition, -fno-bootstrap-classes ensures that the tools are loaded
++# by the system class loader rather than the bootstrap class loader:
++# only core library classes should be loaded by the bootstrap loader.
+ libgcj_tools_la_SOURCES = classpath/tools/tools.zip
+-libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
++libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
++ -fno-bootstrap-classes -fno-indirect-classes \
++ -fsource-filename=$(here)/classpath/tools/all-classes.lst
++
+ libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
+  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+  $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
+@@ -8686,6 +8697,8 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ contrib/aot-compile-rpm: $(top_builddir)/config.status $(top_srcdir)/contrib/aot-compile-rpm.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
++contrib/generate-cacerts.pl: $(top_builddir)/config.status $(top_srcdir)/contrib/generate-cacerts.pl.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
+ contrib/rebuild-gcj-db: $(top_builddir)/config.status $(top_srcdir)/contrib/rebuild-gcj-db.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ scripts/jar: $(top_builddir)/config.status $(top_srcdir)/scripts/jar.in
+@@ -12425,6 +12438,8 @@
+ @CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_BIN_DIR)/java; \
++@CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
++@CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_BIN_DIR)/javac; \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/`echo gjar | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_BIN_DIR)/jar; \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/`echo gjdoc | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/ChangeLog gcc-4.4.0/libstdc++-v3/ChangeLog
+--- gcc-4.4.0.orig/libstdc++-v3/ChangeLog	2009-04-21 01:46:37.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/ChangeLog	2009-04-29 12:37:30.000000000 -0700
+@@ -1,3 +1,71 @@
++2009-04-29  Benjamin Kosnik  <bkoz@redhat.com>
++
++        * xml/authors.xml: Add space.
++        * xml/faq.xml: Update links.
++        * xml/manual/intro.xml: Same.
++        * xml/manual/abi.xml: Update.
++        * xml/manual/appendix_contributing.xml: Fix typo.
++        * xml/manual/status_cxxtr1.xml: Update links.
++        * xml/manual/status_cxx1998.xml: Same.
++        * xml/manual/status_cxx200x.xml: Same.
++
++2009-04-28  Benjamin Kosnik  <bkoz@redhat.com>
++
++        PR libstdc++/39868
++        * scripts/run_doxygen: Uncomment removal of includes.
++        (problematic): Rewrite __cxxabiv1 namespace to abi.
++
++2009-04-28  Paolo Carlini  <paolo.carlini@oracle.com>
++
++	PR libstdc++/39880
++	PR libstdc++/39881
++	PR libstdc++/39882
++	* include/std/system_error (is_error_code_enum<errc>): Remove.
++	(error_condition<>::error_condition(_ErrorCodeEnum,)
++	error_condition<>::operator=(_ErrorCodeEnum)): Use make_error_condition.
++	(error_code<>::error_code(_ErrorCodeEnum,),
++	error_code<>::operator=(_ErrorCodeEnum)): Use make_error_code.
++	* testsuite/19_diagnostics/system_error/39880.cc: New.
++	* testsuite/19_diagnostics/error_condition/modifiers/39881.cc:
++	Likewise.
++	* testsuite/19_diagnostics/error_condition/cons/39881.cc: Likewise.
++	* testsuite/19_diagnostics/error_code/modifiers/39882.cc: Likewise.
++	* testsuite/19_diagnostics/error_code/cons/39882.cc: Likewise.
++	* testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc:
++	Adjust.
++	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc:
++	Likewise.
++	* testsuite/19_diagnostics/error_code/cons/1.cc: Likewise.
++	* testsuite/19_diagnostics/error_code/operators/bool.cc: Likewise.
++	* testsuite/19_diagnostics/error_code/operators/equal.cc: Likewise.
++	* testsuite/19_diagnostics/error_code/operators/not_equal.cc:
++	Likewise.
++	* testsuite/19_diagnostics/error_category/cons/copy_neg.cc: Likewise.
++	* testsuite/19_diagnostics/system_error/cons-1.cc: Likewise.
++	* testsuite/19_diagnostics/system_error/what-4.cc: Likewise.
++	* testsuite/30_threads/unique_lock/locking/2.cc: Likewise.
++
++2009-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
++
++	Revert the last commit.
++
++2009-04-25  Jonathan Wakely  <jwakely.gcc@gmail.com>
++
++	* include/std/mutex (__get_once_functor_lock, __get_once_mutex):
++	Replace global lock object with local locks on global mutex.
++	* src/mutex.cc: Likewise.
++	* config/abi/pre/gnu.ver: Adjust.
++	* testsuite/30_threads/call_once/call_once2.cc: New.
++
++2009-04-21  Paolo Carlini  <paolo.carlini@oracle.com>
++
++	PR libstdc++/39802
++	* include/bits/locale_facets.tcc (num_get<>::_M_extract_int
++	(_InIter, _InIter, ios_base&, ios_base::iostate&, _ValueT&)):
++	Always accept negative values, for unsigned types too.
++	* testsuite/22_locale/num_get/get/char/39802.cc: New.
++	* testsuite/22_locale/num_get/get/wchar_t/39802.cc: Likewise.
++
+ 2009-04-21  Release Manager
+ 
+ 	* GCC 4.4.0 released.
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/doc/xml/authors.xml gcc-4.4.0/libstdc++-v3/doc/xml/authors.xml
+--- gcc-4.4.0.orig/libstdc++-v3/doc/xml/authors.xml	2008-04-10 15:14:17.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/doc/xml/authors.xml	2009-04-29 12:37:30.000000000 -0700
+@@ -21,6 +21,16 @@
+ -->
+ 
+   <author>
++    <firstname></firstname>
++    <surname></surname>
++
++    <authorblurb>
++      <para>
++      </para>
++    </authorblurb>
++  </author>
++
++  <author>
+     <firstname>Paolo</firstname>
+     <surname>Carlini</surname>
+ 
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/doc/xml/faq.xml gcc-4.4.0/libstdc++-v3/doc/xml/faq.xml
+--- gcc-4.4.0.orig/libstdc++-v3/doc/xml/faq.xml	2009-03-15 17:09:04.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/doc/xml/faq.xml	2009-04-29 12:37:30.000000000 -0700
+@@ -692,9 +692,9 @@
+     </para>
+     <para>    
+     Long answer: See the implementation status pages for 
+-    <link linkend="manual.intro.status.standard.1998">C++98</link>,
+-    <link linkend="manual.intro.status.standard.tr1">TR1</link>, and 
+-    <link linkend="manual.intro.status.standard.200x">C++0x</link>.
++    <link linkend="status.iso.1998">C++98</link>,
++    <link linkend="status.iso.tr1">TR1</link>, and 
++    <link linkend="status.iso.200x">C++0x</link>.
+     </para> 
+   </answer>
+ </qandaentry>
+@@ -1123,7 +1123,7 @@
+     </para>
+     <para>
+     The implementation status of TR1 in libstdc++ can be tracked <link
+-    linkend="manual.intro.status.standard.tr1">on the TR1 status
++    linkend="status.iso.tr1">on the TR1 status
+     page</link>.
+     </para>
+   </answer>
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/abi.xml gcc-4.4.0/libstdc++-v3/doc/xml/manual/abi.xml
+--- gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/abi.xml	2008-09-09 15:42:23.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/doc/xml/manual/abi.xml	2009-04-29 12:37:30.000000000 -0700
+@@ -207,6 +207,7 @@
+     <listitem><para>gcc-4.1.0: GCC_4.1.0</para></listitem>
+     <listitem><para>gcc-4.2.0: GCC_4.2.0</para></listitem>
+     <listitem><para>gcc-4.3.0: GCC_4.3.0</para></listitem>
++    <listitem><para>gcc-4.4.0: GCC_4.4.0</para></listitem>
+     </itemizedlist>
+     </listitem>
+ 
+@@ -264,6 +265,8 @@
+     <listitem><para>gcc-4.3.0: libstdc++.so.6.0.10</para></listitem>
+     <listitem><para>gcc-4.3.1: libstdc++.so.6.0.10</para></listitem>
+     <listitem><para>gcc-4.3.2: libstdc++.so.6.0.10</para></listitem>
++    <listitem><para>gcc-4.3.3: libstdc++.so.6.0.10</para></listitem>
++    <listitem><para>gcc-4.4.0: libstdc++.so.6.0.11</para></listitem>
+     </itemizedlist>
+     <para>
+       Note 1: Error should be libstdc++.so.3.0.3.
+@@ -320,6 +323,7 @@
+     <listitem><para>gcc-4.1.1: GLIBCXX_3.4.8</para></listitem>
+     <listitem><para>gcc-4.2.0: GLIBCXX_3.4.9</para></listitem>
+     <listitem><para>gcc-4.3.0: GLIBCXX_3.4.10, CXXABI_1.3.2</para></listitem>
++    <listitem><para>gcc-4.4.0: GLIBCXX_3.4.11, CXXABI_1.3.3</para></listitem>
+     </itemizedlist>
+     </listitem>
+   
+@@ -426,6 +430,8 @@
+     <listitem><para>gcc-4.3.0: 20080306</para></listitem>
+     <listitem><para>gcc-4.3.1: 20080606</para></listitem>
+     <listitem><para>gcc-4.3.2: 20080827</para></listitem>
++    <listitem><para>gcc-4.3.3: 20090124</para></listitem>
++    <listitem><para>gcc-4.4.0: 20090421</para></listitem>
+     </itemizedlist>
+     <para></para>
+     </listitem>
+@@ -524,7 +530,8 @@
+     <listitem><para>gcc-4.2.4: include/c++/4.2.4</para></listitem>
+     <listitem><para>gcc-4.3.0: include/c++/4.3.0</para></listitem>
+     <listitem><para>gcc-4.3.1: include/c++/4.3.1</para></listitem>
+-    <listitem><para>gcc-4.3.2: include/c++/4.3.2</para></listitem>
++    <listitem><para>gcc-4.3.3: include/c++/4.3.3</para></listitem>
++    <listitem><para>gcc-4.4.0: include/c++/4.4.0</para></listitem>
+     </itemizedlist>
+     <para></para>
+     </listitem>
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/appendix_contributing.xml gcc-4.4.0/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+--- gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/appendix_contributing.xml	2009-04-15 20:33:20.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/doc/xml/manual/appendix_contributing.xml	2009-04-29 12:37:30.000000000 -0700
+@@ -1102,7 +1102,7 @@
+ 	For validating the XML document, you'll need
+ 	something like <command>xmllint</command> and access to the
+ 	DocBook DTD. These are provided
+-	by a vendor package like <filename>lixml2</filename>.
++	by a vendor package like <filename>libxml2</filename>.
+       </para>
+ 
+       <para>
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/intro.xml gcc-4.4.0/libstdc++-v3/doc/xml/manual/intro.xml
+--- gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/intro.xml	2009-04-15 20:33:20.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/doc/xml/manual/intro.xml	2009-04-29 12:37:30.000000000 -0700
+@@ -27,7 +27,7 @@
+   <title>Status</title>
+ 
+   <!-- Section 01 : Implementation Status -->
+-  <sect1 id="manual.intro.status.standard" xreflabel="Status">
++  <sect1 id="manual.intro.status.iso" xreflabel="Status">
+     <title>Implementation Status</title>
+ 
+     <!-- Section 01.1 : Status C++ 1998 -->
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/status_cxx1998.xml gcc-4.4.0/libstdc++-v3/doc/xml/manual/status_cxx1998.xml
+--- gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/status_cxx1998.xml	2009-04-15 20:33:20.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/doc/xml/manual/status_cxx1998.xml	2009-04-29 12:37:30.000000000 -0700
+@@ -1,4 +1,4 @@
+-<sect2 id="manual.intro.status.standard.1998" xreflabel="ISO C++ 1998">
++<sect2 id="status.iso.1998" xreflabel="ISO C++ 1998">
+ <?dbhtml filename="status_iso_cxx1998.html"?>
+  
+ <sect2info>
+@@ -14,7 +14,7 @@
+ 
+ <title>C++ 1998/2003</title>
+ 
+-<sect3 id="standard.1998.status" xreflabel="Implementation Status">
++<sect3 id="iso.1998.status" xreflabel="Implementation Status">
+   <title>Implementation Status</title>
+ 
+ <para>
+@@ -1032,7 +1032,7 @@
+ </table>
+ </sect3>
+ 
+-<sect3 id="standard.1998.specific" xreflabel="Implementation Specific">
++<sect3 id="iso.1998.specific" xreflabel="Implementation Specific">
+   <title>Implementation Specific Behavior</title>
+ 
+    <para>
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/status_cxx200x.xml gcc-4.4.0/libstdc++-v3/doc/xml/manual/status_cxx200x.xml
+--- gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/status_cxx200x.xml	2009-04-15 20:33:20.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/doc/xml/manual/status_cxx200x.xml	2009-04-29 12:37:30.000000000 -0700
+@@ -1,4 +1,4 @@
+-<sect2 id="manual.intro.status.standard.200x" xreflabel="Status C++ 200x">
++<sect2 id="status.iso.200x" xreflabel="Status C++ 200x">
+ <?dbhtml filename="status_iso_cxx200x.html"?>
+  
+ <sect2info>
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/status_cxxtr1.xml gcc-4.4.0/libstdc++-v3/doc/xml/manual/status_cxxtr1.xml
+--- gcc-4.4.0.orig/libstdc++-v3/doc/xml/manual/status_cxxtr1.xml	2009-04-15 20:33:20.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/doc/xml/manual/status_cxxtr1.xml	2009-04-29 12:37:30.000000000 -0700
+@@ -1,4 +1,4 @@
+-<sect2 id="manual.intro.status.standard.tr1" xreflabel="Status C++ TR1">
++<sect2 id="status.iso.tr1" xreflabel="Status C++ TR1">
+ <?dbhtml filename="status_iso_cxxtr1.html"?>
+  
+ <sect2info>
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/include/bits/locale_facets.tcc gcc-4.4.0/libstdc++-v3/include/bits/locale_facets.tcc
+--- gcc-4.4.0.orig/libstdc++-v3/include/bits/locale_facets.tcc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/include/bits/locale_facets.tcc	2009-04-21 13:26:46.000000000 -0700
+@@ -379,8 +379,7 @@
+ 	if (!__testeof)
+ 	  {
+ 	    __c = *__beg;
+-	    if (__gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
+-	      __negative = __c == __lit[__num_base::_S_iminus];
++	    __negative = __c == __lit[__num_base::_S_iminus];
+ 	    if ((__negative || __c == __lit[__num_base::_S_iplus])
+ 		&& !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
+ 		&& !(__c == __lc->_M_decimal_point))
+@@ -449,7 +448,8 @@
+ 	  __found_grouping.reserve(32);
+ 	bool __testfail = false;
+ 	bool __testoverflow = false;
+-	const __unsigned_type __max = __negative
++	const __unsigned_type __max =
++	  (__negative && __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
+ 	  ? -__gnu_cxx::__numeric_traits<_ValueT>::__min
+ 	  : __gnu_cxx::__numeric_traits<_ValueT>::__max;
+ 	const __unsigned_type __smax = __max / __base;
+@@ -552,7 +552,8 @@
+ 	  }
+ 	else if (__testoverflow)
+ 	  {
+-	    if (__negative)
++	    if (__negative
++		&& __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
+ 	      __v = __gnu_cxx::__numeric_traits<_ValueT>::__min;
+ 	    else
+ 	      __v = __gnu_cxx::__numeric_traits<_ValueT>::__max;
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/include/std/system_error gcc-4.4.0/libstdc++-v3/include/std/system_error
+--- gcc-4.4.0.orig/libstdc++-v3/include/std/system_error	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/include/std/system_error	2009-04-28 03:32:22.000000000 -0700
+@@ -51,10 +51,6 @@
+   template<typename _Tp>
+     struct is_error_code_enum : public false_type { };
+ 
+-  template<> 
+-    struct is_error_code_enum<errc>
+-    : public true_type { };
+-
+   /// is_error_condition_enum
+   template<typename _Tp>
+     struct is_error_condition_enum : public false_type { };
+@@ -108,12 +104,14 @@
+   const error_category& system_category();
+   const error_category& generic_category();
+ 
++  error_code make_error_code(errc);
++
+   /// error_code
+   // Implementation-specific error identification
+   struct error_code
+   {
+     error_code()
+-      : _M_value(0), _M_cat(&system_category()) { }
++    : _M_value(0), _M_cat(&system_category()) { }
+ 
+     error_code(int __v, const error_category& __cat)
+     : _M_value(__v), _M_cat(&__cat) { }
+@@ -121,8 +119,7 @@
+     template<typename _ErrorCodeEnum>
+       error_code(_ErrorCodeEnum __e,
+       typename enable_if<is_error_code_enum<_ErrorCodeEnum>::value>::type* = 0)
+-      : _M_value(static_cast<int>(__e)), _M_cat(&generic_category())
+-      { }
++      { *this = make_error_code(__e); }
+ 
+     void 
+     assign(int __v, const error_category& __cat)
+@@ -140,10 +137,7 @@
+       typename enable_if<is_error_code_enum<_ErrorCodeEnum>::value,
+ 			 error_code&>::type
+       operator=(_ErrorCodeEnum __e)
+-      {
+-	assign(static_cast<int>(__e), generic_category());
+-	return *this;
+-      }
++      { return *this = make_error_code(__e); }
+ 
+     int
+     value() const { return _M_value; }
+@@ -192,12 +186,14 @@
+     operator<<(basic_ostream<_CharT, _Traits>& __os, const error_code& __e)
+     { return (__os << __e.category().name() << ':' << __e.value()); }
+ 
++  error_condition make_error_condition(errc);
+ 
+   /// error_condition
+   // Portable error identification
+   struct error_condition 
+   {
+-    error_condition() : _M_value(0), _M_cat(&generic_category()) { }
++    error_condition()
++    : _M_value(0), _M_cat(&generic_category()) { }
+ 
+     error_condition(int __v, const error_category& __cat)     
+     : _M_value(__v), _M_cat(&__cat) { }
+@@ -206,7 +202,7 @@
+       error_condition(_ErrorConditionEnum __e,
+ 		      typename enable_if<is_error_condition_enum
+ 		                      <_ErrorConditionEnum>::value>::type* = 0)
+-	: _M_value(static_cast<int>(__e)), _M_cat(&generic_category()) { }
++      { *this = make_error_condition(__e); }
+ 
+     void
+     assign(int __v, const error_category& __cat)
+@@ -220,10 +216,7 @@
+       typename enable_if<is_error_condition_enum
+ 			 <_ErrorConditionEnum>::value, error_condition&>::type
+       operator=(_ErrorConditionEnum __e)
+-      {
+-	assign(static_cast<int>(__e), generic_category());
+-	return *this;
+-      }
++      { return *this = make_error_condition(__e); }
+ 
+     void 
+     clear()
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/scripts/run_doxygen gcc-4.4.0/libstdc++-v3/scripts/run_doxygen
+--- gcc-4.4.0.orig/libstdc++-v3/scripts/run_doxygen	2009-02-19 00:15:15.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/scripts/run_doxygen	2009-04-29 12:37:30.000000000 -0700
+@@ -1,7 +1,8 @@
+ #!/bin/bash
+ 
+ # Runs doxygen and massages the output files.
+-# Copyright (C) 2001, 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009 
++# Free Software Foundation, Inc.
+ #
+ # Synopsis:  run_doxygen --mode=[html|man|xml] --host_alias=<alias> \
+ #                        v3srcdir  v3builddir
+@@ -225,11 +226,9 @@
+ 
+ # man pages are for functions/types/other entities, not source files
+ # directly.  who the heck would type "man foo.h" anyhow?
+-#find . -name "[a-z]*" -a ! -name "std_*" -print | xargs rm
++find . -name "[a-z]*" -a ! -name "std_*" -print | xargs rm
+ rm -f *.h.3 *.hpp.3 *config* *.cc.3 *.tcc.3 *_t.3
+-rm ext_*.3
+-rm tr1_*.3
+-rm debug_*.3
++#rm ext_*.3 tr1_*.3 debug_*.3
+ 
+ # this is used to examine what we would have deleted, for debugging
+ #mkdir trash
+@@ -254,18 +253,18 @@
+ # Some of the pages for generated modules have text that confuses certain
+ # implementations of man(1), e.g., Linux's.  We need to have another top-level
+ # *roff tag to /stop/ the .SH NAME entry.
+-#problematic=`egrep --files-without-match '^\.SH SYNOPSIS' [A-Z]*.3`
+-
++problematic=`egrep --files-without-match '^\.SH SYNOPSIS' [A-Z]*.3`
+ #problematic='Containers.3 Sequences.3 Assoc_containers.3 Iterator_types.3'
+-#for f in $problematic; do
+-#    sed '/^\.SH NAME/{
+-#n
+-#a\
+-#\
+-#.SH SYNOPSIS
+-#    }' $f > TEMP
+-#    mv TEMP $f
+-#done
++
++for f in $problematic; do
++    sed '/^\.SH NAME/{
++n
++a\
++\
++.SH SYNOPSIS
++    }' $f > TEMP
++    mv TEMP $f
++done
+ 
+ # Also, break this (generated) line up.  It's ugly as sin.
+ problematic=`grep -l '[^^]Definition at line' *.3`
+@@ -320,7 +319,10 @@
+     newname=`echo $f | sed 's/^__atomic2_/std::__atomic2::/'`
+     mv $f $newname
+ done
+-
++for f in __cxxabiv1_*; do
++    newname=`echo $f | sed 's/^__cxxabiv1_/abi::/'`
++    mv $f $newname
++done
+ 
+ # Generic removal bits, where there are things in the generated man
+ # pages that need to be killed.
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/copy_neg.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/copy_neg.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/copy_neg.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/copy_neg.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -32,7 +32,7 @@
+   return 0;
+ }
+ 
+-// { dg-error "deleted function" "" { target *-*-* } 76 }
++// { dg-error "deleted function" "" { target *-*-* } 72 }
+ // { dg-error "used here" "" { target *-*-* } 31 }
+ // { dg-error "first required here" "" { target *-*-* } 30 }
+ // { dg-excess-errors "copy constructor" }
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/1.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/1.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/1.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/1.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -37,7 +37,7 @@
+   VERIFY( e2.category() == cat );
+ 
+   // 3
+-  std::error_code e3(std::errc::operation_not_supported);
++  std::error_code e3(std::make_error_code(std::errc::operation_not_supported));
+   VERIFY( e3.value() == int(std::errc::operation_not_supported) );
+   VERIFY( e3.category() == std::generic_category() );
+ 
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/39882.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/39882.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/39882.cc	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/39882.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -0,0 +1,60 @@
++// { dg-options "-std=gnu++0x" }
++
++// Copyright (C) 2009 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 3, 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 COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++#include <system_error>
++#include <testsuite_hooks.h>
++
++enum my_errc { my_err = 0 };
++
++class my_error_category_impl
++: public std::error_category
++{
++public:
++  const char* name() const { return ""; }
++  std::string message(int) const { return ""; }
++} my_error_category_instance;
++
++std::error_code
++make_error_code(my_errc e)
++{
++  return std::error_code(static_cast<int>(e),
++			 my_error_category_instance);
++}
++
++namespace std
++{
++  template<>
++    struct is_error_code_enum<my_errc>
++    : public true_type {};
++}
++
++// libstdc++/39882
++void test01()
++{
++  bool test __attribute__((unused)) = true;
++
++  std::error_code ec1(my_err);
++  VERIFY( ec1 == make_error_code(my_err) );
++}
++
++int main()
++{
++  test01();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/modifiers/39882.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/modifiers/39882.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/modifiers/39882.cc	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/modifiers/39882.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -0,0 +1,61 @@
++// { dg-options "-std=gnu++0x" }
++
++// Copyright (C) 2009 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 3, 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 COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++#include <system_error>
++#include <testsuite_hooks.h>
++
++enum my_errc { my_err = 0 };
++
++class my_error_category_impl
++: public std::error_category
++{
++public:
++  const char* name() const { return ""; }
++  std::string message(int) const { return ""; }
++} my_error_category_instance;
++
++std::error_code
++make_error_code(my_errc e)
++{
++  return std::error_code(static_cast<int>(e),
++			 my_error_category_instance);
++}
++
++namespace std
++{
++  template<>
++    struct is_error_code_enum<my_errc>
++    : public true_type {};
++}
++
++// libstdc++/39882
++void test01()
++{
++  bool test __attribute__((unused)) = true;
++
++  std::error_code ec2;
++  ec2 = my_err;
++  VERIFY( ec2 == make_error_code(my_err) );
++}
++
++int main()
++{
++  test01();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -34,7 +34,7 @@
+     }
+ 
+   // 2
+-  std::error_code e2(std::errc::operation_not_supported);
++  std::error_code e2(std::make_error_code(std::errc::operation_not_supported));
+   if (e2)
+     {
+       VERIFY( true );
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/equal.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/equal.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/equal.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/equal.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -27,7 +27,7 @@
+   bool test __attribute__((unused)) = true;
+ 
+   std::error_code e1;
+-  std::error_code e2(std::errc::operation_not_supported);
++  std::error_code e2(std::make_error_code(std::errc::operation_not_supported));
+ 
+   VERIFY( e1 == e1 );
+   VERIFY( !(e1 == e2) );
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/not_equal.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/not_equal.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/not_equal.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/not_equal.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -27,7 +27,7 @@
+   bool test __attribute__((unused)) = true;
+ 
+   std::error_code e1;
+-  std::error_code e2(std::errc::operation_not_supported);
++  std::error_code e2(std::make_error_code(std::errc::operation_not_supported));
+ 
+   VERIFY( !(e1 != e1) );
+   VERIFY( e1 != e2 );
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/39881.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/39881.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/39881.cc	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/39881.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -0,0 +1,60 @@
++// { dg-options "-std=gnu++0x" }
++
++// Copyright (C) 2009 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 3, 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 COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++#include <system_error>
++#include <testsuite_hooks.h>
++
++enum my_errc { my_err = 0 };
++
++class my_error_category_impl
++: public std::error_category
++{
++public:
++  const char* name() const { return ""; }
++  std::string message(int) const { return ""; }
++} my_error_category_instance;
++
++std::error_condition
++make_error_condition(my_errc e)
++{
++  return std::error_condition(static_cast<int>(e),
++			      my_error_category_instance);
++}
++
++namespace std
++{
++  template<>
++    struct is_error_condition_enum<my_errc>
++    : public true_type { };
++}
++
++// libstdc++/39881
++void test01()
++{
++  bool test __attribute__((unused)) = true;
++
++  std::error_condition ec1(my_err);
++  VERIFY( ec1 == make_error_condition(my_err) );
++}
++
++int main()
++{
++  test01();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_condition/modifiers/39881.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_condition/modifiers/39881.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/error_condition/modifiers/39881.cc	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/error_condition/modifiers/39881.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -0,0 +1,61 @@
++// { dg-options "-std=gnu++0x" }
++
++// Copyright (C) 2009 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 3, 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 COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++#include <system_error>
++#include <testsuite_hooks.h>
++
++enum my_errc { my_err = 0 };
++
++class my_error_category_impl
++: public std::error_category
++{
++public:
++  const char* name() const { return ""; }
++  std::string message(int) const { return ""; }
++} my_error_category_instance;
++
++std::error_condition
++make_error_condition(my_errc e)
++{
++  return std::error_condition(static_cast<int>(e),
++			      my_error_category_instance);
++}
++
++namespace std
++{
++  template<>
++    struct is_error_condition_enum<my_errc>
++    : public true_type { };
++}
++
++// libstdc++/39881
++void test01()
++{
++  bool test __attribute__((unused)) = true;
++
++  std::error_condition ec2;
++  ec2 = my_err;
++  VERIFY( ec2 == make_error_condition(my_err) );
++}
++
++int main()
++{
++  test01();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/system_error/39880.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/system_error/39880.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/system_error/39880.cc	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/system_error/39880.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -0,0 +1,29 @@
++// { dg-options "-std=gnu++0x" }
++// { dg-do compile }
++
++// Copyright (C) 2009 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 3, 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 COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++#include <system_error>
++
++// libstdc++/39880
++void test01()
++{
++  std::error_code ec;
++  if (ec == std::errc::not_supported)
++    { }
++}
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/system_error/cons-1.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/system_error/cons-1.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/system_error/cons-1.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/system_error/cons-1.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -26,7 +26,8 @@
+ {
+   bool test __attribute__((unused)) = true;
+   const std::string s("too late: boulangerie out of pain au raisin");
+-  const std::error_code e(std::errc::operation_not_supported);
++  const std::error_code
++    e(std::make_error_code(std::errc::operation_not_supported));
+ 
+   // 1
+   {
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/system_error/what-4.cc gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/system_error/what-4.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/19_diagnostics/system_error/what-4.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/19_diagnostics/system_error/what-4.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -31,7 +31,8 @@
+   bool test __attribute__((unused)) = true;
+   std::string s("after nine thirty, this request cannot be met");
+ 
+-  std::system_error obj = std::system_error(std::errc::invalid_argument, s);
++  std::system_error obj =
++    std::system_error(std::make_error_code(std::errc::invalid_argument), s);
+   std::string s1(obj.what());
+   std::string s2(obj.what());
+   VERIFY( s1 == s2 );
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/22_locale/num_get/get/char/39802.cc gcc-4.4.0/libstdc++-v3/testsuite/22_locale/num_get/get/char/39802.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/22_locale/num_get/get/char/39802.cc	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/testsuite/22_locale/num_get/get/char/39802.cc	2009-04-21 13:26:46.000000000 -0700
+@@ -0,0 +1,77 @@
++// Copyright (C) 2009 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
++// terms of the GNU General Public License as published by the
++// Free Software Foundation; either version 3, 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 COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++// 22.2.2.1.1  num_get members
++
++#include <locale>
++#include <sstream>
++#include <limits>
++#include <testsuite_hooks.h>
++
++// libstdc++/39802
++void test01()
++{
++  using namespace std;
++  typedef istreambuf_iterator<char> iterator_type;
++  
++  bool test __attribute__((unused)) = true;
++
++  stringstream ss;
++  const num_get<char>& ng = use_facet<num_get<char> >(ss.getloc()); 
++  ios_base::iostate err;
++  iterator_type end;
++  const string empty;
++
++  unsigned long ul0 = 1;
++  const unsigned long ul1 = numeric_limits<unsigned long>::max();
++
++  ss << "-0";
++  err = ios_base::goodbit;
++  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
++  VERIFY( err == ios_base::eofbit );
++  VERIFY( ul0 == 0 );
++
++  ss.clear();
++  ss.str(empty);
++  ss << "-1";
++  err = ios_base::goodbit;
++  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
++  VERIFY( err == ios_base::eofbit );
++  VERIFY( ul0 == ul1 );
++
++  ss.clear();
++  ss.str(empty);
++  ss << '-' << ul1;
++  err = ios_base::goodbit;
++  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
++  VERIFY( err == ios_base::eofbit );
++  VERIFY( ul0 == 1 );
++
++  ss.clear();
++  ss.str(empty);
++  ss << '-' << ul1 << '0';
++  err = ios_base::goodbit;
++  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
++  VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
++  VERIFY( ul0 == ul1 );
++}
++
++int main()
++{
++  test01();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39802.cc gcc-4.4.0/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39802.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39802.cc	1969-12-31 16:00:00.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39802.cc	2009-04-21 13:26:46.000000000 -0700
+@@ -0,0 +1,77 @@
++// Copyright (C) 2009 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
++// terms of the GNU General Public License as published by the
++// Free Software Foundation; either version 3, 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 COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++// 22.2.2.1.1  num_get members
++
++#include <locale>
++#include <sstream>
++#include <limits>
++#include <testsuite_hooks.h>
++
++// libstdc++/39802
++void test01()
++{
++  using namespace std;
++  typedef istreambuf_iterator<wchar_t> iterator_type;
++  
++  bool test __attribute__((unused)) = true;
++
++  wstringstream ss;
++  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(ss.getloc()); 
++  ios_base::iostate err;
++  iterator_type end;
++  const wstring empty;
++
++  unsigned long ul0 = 1;
++  const unsigned long ul1 = numeric_limits<unsigned long>::max();
++
++  ss << L"-0";
++  err = ios_base::goodbit;
++  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
++  VERIFY( err == ios_base::eofbit );
++  VERIFY( ul0 == 0 );
++
++  ss.clear();
++  ss.str(empty);
++  ss << L"-1";
++  err = ios_base::goodbit;
++  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
++  VERIFY( err == ios_base::eofbit );
++  VERIFY( ul0 == ul1 );
++
++  ss.clear();
++  ss.str(empty);
++  ss << L'-' << ul1;
++  err = ios_base::goodbit;
++  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
++  VERIFY( err == ios_base::eofbit );
++  VERIFY( ul0 == 1 );
++
++  ss.clear();
++  ss.str(empty);
++  ss << L'-' << ul1 << L'0';
++  err = ios_base::goodbit;
++  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
++  VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
++  VERIFY( ul0 == ul1 );
++}
++
++int main()
++{
++  test01();
++  return 0;
++}
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc gcc-4.4.0/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -32,7 +32,7 @@
+ 
+   char buf[64];
+   error_code e1;
+-  error_code e2(errc::bad_address);
++  error_code e2(make_error_code(errc::bad_address));
+   string s, s1, s2;
+ 
+   {
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc gcc-4.4.0/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -1,6 +1,6 @@
+ // { dg-options "-std=gnu++0x" }
+ 
+-// Copyright (C) 2007, 2009 Free Software Foundation
++// Copyright (C) 2007, 2008, 2009 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 @@
+ 
+   wchar_t buf[64];
+   error_code e1;
+-  error_code e2(errc::bad_address);
++  error_code e2(make_error_code(errc::bad_address));
+   wstring s, s1, s2;
+ 
+   {
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc gcc-4.4.0/libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc
+--- gcc-4.4.0.orig/libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc	2009-04-28 03:32:22.000000000 -0700
+@@ -44,7 +44,8 @@
+         }
+       catch (const std::system_error& ex)
+         {
+-	  VERIFY( ex.code() == std::error_code(std::errc::operation_not_permitted) );
++	  VERIFY( ex.code() == std::make_error_code
++		  (std::errc::operation_not_permitted) );
+         }
+       catch (...)
+         {
+@@ -80,8 +81,8 @@
+ 	}
+       catch (const std::system_error& ex)
+ 	{
+-	  VERIFY( ex.code() == std::error_code(
+-		    std::errc::resource_deadlock_would_occur) );
++	  VERIFY( ex.code() == std::make_error_code
++		  (std::errc::resource_deadlock_would_occur) );
+ 	}
+       catch (...)
+ 	{
Index: patches/gcc-4.4.0-posix-1.patch
===================================================================
--- patches/gcc-4.4.0-posix-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
+++ patches/gcc-4.4.0-posix-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
@@ -0,0 +1,305 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 04-21-2009
+Initial Package Version: 4.4.0
+Origin: Jim Gifford
+        Rediffed against 4.1.0 by Chris Staub
+        Rediffed against 4.1.2 by Jim Gifford
+	Rediffed and additions against 4.2.0 by Joe Ciccone
+	Rediffed against 4.3.0 by Joe Ciccone
+	Rediffed against 4.3.3 by Jim Gifford
+	Rediffed against 4.4.0 by Jim Gifford
+Upstream Status: On Hold
+Description: Makes GCC Posix Compliant
+
+diff -Naur gcc-4.4.0.orig/contrib/patch_tester.sh gcc-4.4.0/contrib/patch_tester.sh
+--- gcc-4.4.0.orig/contrib/patch_tester.sh	2008-05-08 08:14:47.000000000 -0700
++++ gcc-4.4.0/contrib/patch_tester.sh	2009-04-21 09:56:06.009963403 -0700
+@@ -324,7 +324,7 @@
+     MAKE_ARGS="$default_make $MAKE_ARGS"
+     if ! eval make $dashj $MAKE_ARGS &> $1/bootstrap ; then
+ 	report "bootstrap with `basename $1` version failed with last lines:"
+-	tail -30 $1/bootstrap > $1/last_bootstrap
++	tail -n 30 $1/bootstrap > $1/last_bootstrap
+ 	freport $1/last_bootstrap
+ 	report "grep --context=20 Error bootstrap:"
+ 	grep --context=20 Error $1/bootstrap > $1/bootstrap_error
+@@ -464,7 +464,7 @@
+ # After selfexec, $TESTING is already set up.  
+ if [ -d $TESTING ]; then
+     # The only file in $TESTING is the patch.
+-    PATCH=`ls -rt -1 $TESTING | head -1`
++    PATCH=`ls -rt -1 $TESTING | head -n 1`
+     PATCH=$TESTING/$PATCH
+     if [ -f $PATCH ]; then
+ 	bootntest_patched && bootntest_pristine && compare_passes
+@@ -474,7 +474,7 @@
+ 
+ firstpatch=true
+ while true; do
+-    PATCH=`ls -rt -1 $PATCHES | head -1`
++    PATCH=`ls -rt -1 $PATCHES | head -n 1`
+     if [ x$PATCH = x ]; then
+ 	if [ $stop = true ]; then
+ 	    if [ $firstpatch = true ]; then
+diff -Naur gcc-4.4.0.orig/contrib/test_summary gcc-4.4.0/contrib/test_summary
+--- gcc-4.4.0.orig/contrib/test_summary	2007-02-09 16:30:46.000000000 -0800
++++ gcc-4.4.0/contrib/test_summary	2009-04-21 09:55:36.820093030 -0700
+@@ -107,7 +107,7 @@
+     srcdir = configflags;
+     sub(/\/configure .*/, "", srcdir);
+     printf "LAST_UPDATED: ";
+-    system("tail -1 " srcdir "/LAST_UPDATED");
++    system("tail -n 1 " srcdir "/LAST_UPDATED");
+     print "";
+ 
+     sub(/^[^ ]*\/configure */, " ", configflags);
+diff -Naur gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
+--- gcc-4.4.0.orig/gcc/configure	2009-03-24 10:46:03.000000000 -0700
++++ gcc-4.4.0/gcc/configure	2009-04-21 09:55:36.828093310 -0700
+@@ -21750,7 +21750,7 @@
+   # Therefore, use diff -b for the comparisons.
+   if test x$gcc_cv_objdump != x \
+   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+-     | tail -3 > conftest.got \
++     | tail -n 3 > conftest.got \
+   && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \
+     || diff -b conftest.big conftest.got > /dev/null 2>&1; }
+   then
+diff -Naur gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
+--- gcc-4.4.0.orig/gcc/configure.ac	2009-03-24 10:46:03.000000000 -0700
++++ gcc-4.4.0/gcc/configure.ac	2009-04-21 09:55:36.840094427 -0700
+@@ -2351,7 +2351,7 @@
+   # Therefore, use diff -b for the comparisons.
+   if test x$gcc_cv_objdump != x \
+   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+-     | tail -3 > conftest.got \
++     | tail -n 3 > conftest.got \
+   && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \
+     || diff -b conftest.big conftest.got > /dev/null 2>&1; }
+   then
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/ada/acats/run_all.sh gcc-4.4.0/gcc/testsuite/ada/acats/run_all.sh
+--- gcc-4.4.0.orig/gcc/testsuite/ada/acats/run_all.sh	2006-09-14 03:12:03.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/ada/acats/run_all.sh	2009-04-21 09:55:36.848094706 -0700
+@@ -68,7 +68,7 @@
+   ls ${i}?.adb > ${i}.lst 2> /dev/null
+   ls ${i}*m.adb >> ${i}.lst 2> /dev/null
+   ls ${i}.adb >> ${i}.lst 2> /dev/null
+-  main=`tail -1 ${i}.lst`
++  main=`tail -n 1 ${i}.lst`
+ }
+ 
+ EXTERNAL_OBJECTS=""
+diff -Naur gcc-4.4.0.orig/libgomp/acinclude.m4 gcc-4.4.0/libgomp/acinclude.m4
+--- gcc-4.4.0.orig/libgomp/acinclude.m4	2009-01-31 09:09:24.000000000 -0800
++++ gcc-4.4.0/libgomp/acinclude.m4	2009-04-21 09:56:53.993037854 -0700
+@@ -152,7 +152,7 @@
+     libgomp_ld_is_gold=yes
+   fi
+   changequote(,)
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+   changequote([,])
+   libgomp_gnu_ld_version=`echo $ldver | \
+diff -Naur gcc-4.4.0.orig/libgomp/configure gcc-4.4.0/libgomp/configure
+--- gcc-4.4.0.orig/libgomp/configure	2009-04-21 02:08:08.000000000 -0700
++++ gcc-4.4.0/libgomp/configure	2009-04-21 09:56:33.615732086 -0700
+@@ -18486,7 +18486,7 @@
+     libgomp_ld_is_gold=yes
+   fi
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+   libgomp_gnu_ld_version=`echo $ldver | \
+diff -Naur gcc-4.4.0.orig/libjava/classpath/configure gcc-4.4.0/libjava/classpath/configure
+--- gcc-4.4.0.orig/libjava/classpath/configure	2009-03-16 05:08:23.000000000 -0700
++++ gcc-4.4.0/libjava/classpath/configure	2009-04-21 09:55:36.872096103 -0700
+@@ -29072,7 +29072,7 @@
+ fi # shortcircut to system "stdint.h"
+ # ------------------ PREPARE VARIABLES ------------------------------
+ if test "$GCC" = "yes" ; then
+-ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
++ac_cv_stdint_message="using gnu compiler "`$CC --version | head -n 1`
+ else
+ ac_cv_stdint_message="using $CC"
+ fi
+diff -Naur gcc-4.4.0.orig/libjava/classpath/ltcf-c.sh gcc-4.4.0/libjava/classpath/ltcf-c.sh
+--- gcc-4.4.0.orig/libjava/classpath/ltcf-c.sh	2006-01-17 10:09:40.000000000 -0800
++++ gcc-4.4.0/libjava/classpath/ltcf-c.sh	2009-04-21 09:55:36.872096103 -0700
+@@ -153,7 +153,7 @@
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname-def;
+       else
+         echo EXPORTS > $output_objdir/$soname-def;
+diff -Naur gcc-4.4.0.orig/libjava/classpath/ltcf-gcj.sh gcc-4.4.0/libjava/classpath/ltcf-gcj.sh
+--- gcc-4.4.0.orig/libjava/classpath/ltcf-gcj.sh	2005-09-23 14:31:04.000000000 -0700
++++ gcc-4.4.0/libjava/classpath/ltcf-gcj.sh	2009-04-21 09:55:36.872096103 -0700
+@@ -156,7 +156,7 @@
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname-def;
+       else
+         echo EXPORTS > $output_objdir/$soname-def;
+diff -Naur gcc-4.4.0.orig/libjava/classpath/m4/ax_create_stdint_h.m4 gcc-4.4.0/libjava/classpath/m4/ax_create_stdint_h.m4
+--- gcc-4.4.0.orig/libjava/classpath/m4/ax_create_stdint_h.m4	2007-05-19 13:44:43.000000000 -0700
++++ gcc-4.4.0/libjava/classpath/m4/ax_create_stdint_h.m4	2009-04-21 09:55:36.872096103 -0700
+@@ -217,7 +217,7 @@
+ fi # shortcircut to system "stdint.h"
+ # ------------------ PREPARE VARIABLES ------------------------------
+ if test "$GCC" = "yes" ; then
+-ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
++ac_cv_stdint_message="using gnu compiler "`$CC --version | head -n 1`
+ else
+ ac_cv_stdint_message="using $CC"
+ fi
+diff -Naur gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
+--- gcc-4.4.0.orig/libjava/configure	2009-04-21 02:08:08.000000000 -0700
++++ gcc-4.4.0/libjava/configure	2009-04-21 09:55:36.884096662 -0700
+@@ -18919,8 +18919,8 @@
+ echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6
+ LD_PROG=`$CC --print-prog-name=ld`
+ LD_VERSION=`$LD_PROG --version`
+-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
+-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
+ if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
+   LD_OK="ok"
+ else
+diff -Naur gcc-4.4.0.orig/libjava/mingwld.m4 gcc-4.4.0/libjava/mingwld.m4
+--- gcc-4.4.0.orig/libjava/mingwld.m4	2005-08-22 15:36:35.000000000 -0700
++++ gcc-4.4.0/libjava/mingwld.m4	2009-04-21 09:55:36.892097500 -0700
+@@ -3,8 +3,8 @@
+ AC_MSG_CHECKING(whether 'ld' is at least 2.13)
+ LD_PROG=`$CC --print-prog-name=ld`
+ LD_VERSION=`$LD_PROG --version`
+-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
+-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
+ if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
+   LD_OK="ok"
+ else
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/acinclude.m4 gcc-4.4.0/libstdc++-v3/acinclude.m4
+--- gcc-4.4.0.orig/libstdc++-v3/acinclude.m4	2009-02-23 12:42:53.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/acinclude.m4	2009-04-21 09:57:46.768419611 -0700
+@@ -238,7 +238,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+     changequote([,])
+     glibcxx_gnu_ld_version=`echo $ldver | \
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/configure gcc-4.4.0/libstdc++-v3/configure
+--- gcc-4.4.0.orig/libstdc++-v3/configure	2009-03-01 09:49:31.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/configure	2009-04-21 09:57:27.527186478 -0700
+@@ -23489,7 +23489,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -42055,7 +42055,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -76333,7 +76333,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -76645,7 +76645,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -77328,7 +77328,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -95080,7 +95080,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -112274,7 +112274,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -112493,7 +112493,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -112678,7 +112678,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -112899,7 +112899,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -113121,7 +113121,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
Index: patches/gcc-4.4.0-pure64-1.patch
===================================================================
--- patches/gcc-4.4.0-pure64-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
+++ patches/gcc-4.4.0-pure64-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
@@ -0,0 +1,190 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 04-21-2009
+Initial Package Version: 4.4.0
+Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
+        the Pure LFS project.
+Upstream Status: Not Applied
+Description: This patch modifies the location of the dynamic linker for gcc-4.4.0.
+
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux64.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/linux64.h	2009-04-21 10:12:45.639047632 -0700
+@@ -58,8 +58,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/t-linux64 gcc-4.4.0/gcc/config/i386/t-linux64
+--- gcc-4.4.0.orig/gcc/config/i386/t-linux64	2008-07-02 08:59:19.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/t-linux64	2009-04-21 10:12:52.642213438 -0700
+@@ -7,7 +7,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+diff -Naur gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h
+--- gcc-4.4.0.orig/gcc/config/linux.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/linux.h	2009-04-21 10:12:49.548334684 -0700
+@@ -118,7 +118,7 @@
+    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
+    supporting both 32-bit and 64-bit compilation.  */
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux64.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux64.h	2009-04-21 10:12:49.630265960 -0700
+@@ -35,10 +35,10 @@
+ %{!shared: \
+   %{profile:-lc_p} %{!profile:-lc}}"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
++#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKERN32 \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
+ 
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/t-linux64 gcc-4.4.0/gcc/config/mips/t-linux64
+--- gcc-4.4.0.orig/gcc/config/mips/t-linux64	2006-06-06 05:51:24.000000000 -0700
++++ gcc-4.4.0/gcc/config/mips/t-linux64	2009-04-21 10:12:52.704637799 -0700
+@@ -1,6 +1,6 @@
+ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
+ MULTILIB_DIRNAMES = n32 32 64
+-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
++MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
+ 
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+ 
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/linux64.h	2009-04-21 10:12:42.311081157 -0700
+@@ -342,9 +342,9 @@
+ #undef	LINK_OS_DEFAULT_SPEC
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
++#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/t-linux64 gcc-4.4.0/gcc/config/rs6000/t-linux64
+--- gcc-4.4.0.orig/gcc/config/rs6000/t-linux64	2007-09-27 12:56:06.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/t-linux64	2009-04-21 10:12:52.552479957 -0700
+@@ -19,7 +19,7 @@
+ MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
+ MULTILIB_EXCEPTIONS     = m64/msoft-float
+ MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
+-MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
++MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
+ MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
+ 
+ softfp_wrap_start := '\#ifndef __powerpc64__'
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
+--- gcc-4.4.0.orig/gcc/config/s390/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/s390/linux.h	2009-04-21 10:12:44.800229083 -0700
+@@ -72,7 +72,7 @@
+ #define MULTILIB_DEFAULTS { "m31" }
+ #endif
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
+ 
+ #undef  LINK_SPEC
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/t-linux64 gcc-4.4.0/gcc/config/s390/t-linux64
+--- gcc-4.4.0.orig/gcc/config/s390/t-linux64	2006-02-06 09:41:54.000000000 -0800
++++ gcc-4.4.0/gcc/config/s390/t-linux64	2009-04-21 10:12:52.607098757 -0700
+@@ -1,6 +1,6 @@
+ MULTILIB_OPTIONS = m64/m31
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64 ../lib
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux64.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux64.h	2009-04-21 10:12:52.029679006 -0700
+@@ -109,8 +109,8 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
+ 
+ #ifdef SPARC_BI_ARCH
+ 
+@@ -121,7 +121,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib32 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -130,7 +130,7 @@
+         %{static:-static}}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -211,7 +211,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux.h	2009-04-21 10:12:52.271571169 -0700
+@@ -86,7 +86,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!ibcs: \
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/t-linux64 gcc-4.4.0/gcc/config/sparc/t-linux64
+--- gcc-4.4.0.orig/gcc/config/sparc/t-linux64	2006-02-07 23:19:43.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/t-linux64	2009-04-21 10:12:52.755357174 -0700
+@@ -1,6 +1,6 @@
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64 ../lib
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
Index: patches/gcc-4.4.0-pure64_specs-1.patch
===================================================================
--- patches/gcc-4.4.0-pure64_specs-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
+++ patches/gcc-4.4.0-pure64_specs-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
@@ -0,0 +1,384 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 04-21-2009
+Initial Package Version: 4.4.0
+Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
+        the Pure LFS project.
+Upstream Status: Not Applied
+Description: This patch modifies the location of the dynamic linker for gcc-4.4.0.
+
+diff -Naur gcc-4.4.0.orig/gcc/config/alpha/gnu.h gcc-4.4.0/gcc/config/alpha/gnu.h
+--- gcc-4.4.0.orig/gcc/config/alpha/gnu.h	2004-09-07 17:17:19.000000000 -0700
++++ gcc-4.4.0/gcc/config/alpha/gnu.h	2009-04-21 10:09:46.008647019 -0700
+@@ -11,7 +11,7 @@
+     } while (0)
+ 
+ #undef ELF_DYNAMIC_LINKER
+-#define ELF_DYNAMIC_LINKER	"/lib/ld.so"
++#define ELF_DYNAMIC_LINKER	"/tools/lib/ld.so"
+ 
+ #undef	STARTFILE_SPEC
+ #define STARTFILE_SPEC \
+diff -Naur gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h gcc-4.4.0/gcc/config/alpha/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/alpha/linux-elf.h	2009-04-21 10:09:46.121789915 -0700
+@@ -27,8 +27,8 @@
+ #define EXTRA_SPECS \
+ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
+ 
+-#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+ #else
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h	2007-11-08 05:44:09.000000000 -0800
++++ gcc-4.4.0/gcc/config/arm/linux-eabi.h	2009-04-21 10:09:50.440732227 -0700
+@@ -61,7 +61,7 @@
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
+ #undef  GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
+ 
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/linux-elf.h gcc-4.4.0/gcc/config/arm/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/arm/linux-elf.h	2009-04-21 10:09:50.233952787 -0700
+@@ -62,7 +62,7 @@
+ 
+ #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
+    %{b} \
+diff -Naur gcc-4.4.0.orig/gcc/config/bfin/linux.h gcc-4.4.0/gcc/config/bfin/linux.h
+--- gcc-4.4.0.orig/gcc/config/bfin/linux.h	2008-11-27 01:11:50.000000000 -0800
++++ gcc-4.4.0/gcc/config/bfin/linux.h	2009-04-21 10:09:43.316621596 -0700
+@@ -22,7 +22,7 @@
+   %{shared:-G -Bdynamic} \
+   %{!shared: %{!static: \
+    %{rdynamic:-export-dynamic} \
+-   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
++   %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \
+    %{static}} -init __init -fini __fini"
+ 
+ #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
+diff -Naur gcc-4.4.0.orig/gcc/config/cris/linux.h gcc-4.4.0/gcc/config/cris/linux.h
+--- gcc-4.4.0.orig/gcc/config/cris/linux.h	2009-03-22 08:15:04.000000000 -0700
++++ gcc-4.4.0/gcc/config/cris/linux.h	2009-04-21 10:09:40.257856685 -0700
+@@ -103,7 +103,7 @@
+ #undef CRIS_DEFAULT_CPU_VERSION
+ #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ /* We need an -rpath-link to ld.so.1, and presumably to each directory
+    specified with -B.  */
+diff -Naur gcc-4.4.0.orig/gcc/config/frv/linux.h gcc-4.4.0/gcc/config/frv/linux.h
+--- gcc-4.4.0.orig/gcc/config/frv/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/frv/linux.h	2009-04-21 10:09:39.996456769 -0700
+@@ -35,7 +35,7 @@
+ #define ENDFILE_SPEC \
+   "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/gnu.h gcc-4.4.0/gcc/config/i386/gnu.h
+--- gcc-4.4.0.orig/gcc/config/i386/gnu.h	2008-11-13 15:28:46.000000000 -0800
++++ gcc-4.4.0/gcc/config/i386/gnu.h	2009-04-21 10:09:43.601430088 -0700
+@@ -21,7 +21,7 @@
+ */
+ 
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so"
+ 
+ #undef TARGET_VERSION
+ #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux64.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/linux64.h	2009-04-21 10:09:43.480484706 -0700
+@@ -58,8 +58,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
+ 
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux.h gcc-4.4.0/gcc/config/i386/linux.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/i386/linux.h	2009-04-21 10:09:44.806987009 -0700
+@@ -100,7 +100,7 @@
+ 
+ /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
+ #define LINK_EMULATION "elf_i386"
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef  ASM_SPEC
+ #define ASM_SPEC \
+diff -Naur gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
+--- gcc-4.4.0.orig/gcc/config/ia64/linux.h	2009-02-12 08:30:53.000000000 -0800
++++ gcc-4.4.0/gcc/config/ia64/linux.h	2009-04-21 10:09:45.879897193 -0700
+@@ -37,7 +37,7 @@
+ /* Define this for shared library support because it isn't in the main
+    linux.h file.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+diff -Naur gcc-4.4.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.4.0/gcc/config/kopensolaris-gnu.h
+--- gcc-4.4.0.orig/gcc/config/kopensolaris-gnu.h	2009-01-29 10:48:41.000000000 -0800
++++ gcc-4.4.0/gcc/config/kopensolaris-gnu.h	2009-04-21 10:09:51.100084091 -0700
+@@ -33,5 +33,5 @@
+ 
+ #ifdef GLIBC_DYNAMIC_LINKER
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ #endif
+diff -Naur gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h
+--- gcc-4.4.0.orig/gcc/config/linux.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/linux.h	2009-04-21 10:09:48.591428691 -0700
+@@ -117,9 +117,9 @@
+    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
+    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
+    supporting both 32-bit and 64-bit compilation.  */
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ #define LINUX_DYNAMIC_LINKER32 \
+diff -Naur gcc-4.4.0.orig/gcc/config/m32r/linux.h gcc-4.4.0/gcc/config/m32r/linux.h
+--- gcc-4.4.0.orig/gcc/config/m32r/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/m32r/linux.h	2009-04-21 10:09:43.059122504 -0700
+@@ -58,7 +58,7 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef	LINK_SPEC
+ #if TARGET_LITTLE_ENDIAN
+diff -Naur gcc-4.4.0.orig/gcc/config/m68k/linux.h gcc-4.4.0/gcc/config/m68k/linux.h
+--- gcc-4.4.0.orig/gcc/config/m68k/linux.h	2007-09-24 14:07:08.000000000 -0700
++++ gcc-4.4.0/gcc/config/m68k/linux.h	2009-04-21 10:09:40.768950971 -0700
+@@ -84,7 +84,7 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "-m m68kelf %{shared} \
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux64.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux64.h	2009-04-21 10:09:48.700669088 -0700
+@@ -35,10 +35,10 @@
+ %{!shared: \
+   %{profile:-lc_p} %{!profile:-lc}}"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld.so.1"
++#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKERN32 \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
+ 
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux.h gcc-4.4.0/gcc/config/mips/linux.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux.h	2009-04-21 10:09:49.211763096 -0700
+@@ -64,7 +64,7 @@
+ #undef MIPS_DEFAULT_GVALUE
+ #define MIPS_DEFAULT_GVALUE 0
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ /* Borrowed from sparc/linux.h */
+ #undef LINK_SPEC
+diff -Naur gcc-4.4.0.orig/gcc/config/mn10300/linux.h gcc-4.4.0/gcc/config/mn10300/linux.h
+--- gcc-4.4.0.orig/gcc/config/mn10300/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/mn10300/linux.h	2009-04-21 10:09:49.613617265 -0700
+@@ -32,7 +32,7 @@
+ #undef  ASM_SPEC
+ #define ASM_SPEC "%{Wa,*:%*}"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
+diff -Naur gcc-4.4.0.orig/gcc/config/pa/pa-linux.h gcc-4.4.0/gcc/config/pa/pa-linux.h
+--- gcc-4.4.0.orig/gcc/config/pa/pa-linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/pa/pa-linux.h	2009-04-21 10:09:47.709694092 -0700
+@@ -44,7 +44,7 @@
+ /* Define this for shared library support because it isn't in the main
+    linux.h file.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/linux64.h	2009-04-21 10:09:38.246016484 -0700
+@@ -342,10 +342,10 @@
+ #undef	LINK_OS_DEFAULT_SPEC
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
++#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+ #else
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h gcc-4.4.0/gcc/config/rs6000/sysv4.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/sysv4.h	2009-04-21 10:09:38.529498813 -0700
+@@ -901,8 +901,8 @@
+ 
+ #define LINK_START_LINUX_SPEC ""
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+ #else
+@@ -944,7 +944,7 @@
+ 
+ #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+-  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
++  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
+ 
+ #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__	\
+ %{!undef:					                \
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
+--- gcc-4.4.0.orig/gcc/config/s390/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/s390/linux.h	2009-04-21 10:09:42.454394469 -0700
+@@ -72,8 +72,8 @@
+ #define MULTILIB_DEFAULTS { "m31" }
+ #endif
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+diff -Naur gcc-4.4.0.orig/gcc/config/sh/linux.h gcc-4.4.0/gcc/config/sh/linux.h
+--- gcc-4.4.0.orig/gcc/config/sh/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/sh/linux.h	2009-04-21 10:09:47.046441123 -0700
+@@ -47,7 +47,7 @@
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux64.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux64.h	2009-04-21 10:09:50.518762676 -0700
+@@ -109,8 +109,8 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
+ 
+ #ifdef SPARC_BI_ARCH
+ 
+@@ -121,7 +121,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib32 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -130,7 +130,7 @@
+         %{static:-static}}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -211,7 +211,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux.h	2009-04-21 10:09:50.838684733 -0700
+@@ -83,10 +83,10 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!ibcs: \
+diff -Naur gcc-4.4.0.orig/gcc/config/xtensa/linux.h gcc-4.4.0/gcc/config/xtensa/linux.h
+--- gcc-4.4.0.orig/gcc/config/xtensa/linux.h	2008-01-17 17:37:53.000000000 -0800
++++ gcc-4.4.0/gcc/config/xtensa/linux.h	2009-04-21 10:09:39.836497556 -0700
+@@ -43,7 +43,7 @@
+   %{mlongcalls:--longcalls} \
+   %{mno-longcalls:--no-longcalls}"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC \
Index: patches/gcc-4.4.0-specs-1.patch
===================================================================
--- patches/gcc-4.4.0-specs-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
+++ patches/gcc-4.4.0-specs-1.patch	(revision 56a4eb51bd4503f8b8583887f7d3d76b6cb16324)
@@ -0,0 +1,384 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 04-21-2009
+Initial Package Version: 4.4.0
+Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
+        the Pure LFS project.
+Upstream Status: Not Applied
+Description: This patch modifies the location of the dynamic linker for gcc-4.4.0.
+
+diff -Naur gcc-4.4.0.orig/gcc/config/alpha/gnu.h gcc-4.4.0/gcc/config/alpha/gnu.h
+--- gcc-4.4.0.orig/gcc/config/alpha/gnu.h	2004-09-07 17:17:19.000000000 -0700
++++ gcc-4.4.0/gcc/config/alpha/gnu.h	2009-04-21 10:05:33.058642828 -0700
+@@ -11,7 +11,7 @@
+     } while (0)
+ 
+ #undef ELF_DYNAMIC_LINKER
+-#define ELF_DYNAMIC_LINKER	"/lib/ld.so"
++#define ELF_DYNAMIC_LINKER	"/tools/lib/ld.so"
+ 
+ #undef	STARTFILE_SPEC
+ #define STARTFILE_SPEC \
+diff -Naur gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h gcc-4.4.0/gcc/config/alpha/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/alpha/linux-elf.h	2009-04-21 10:05:33.167886578 -0700
+@@ -27,8 +27,8 @@
+ #define EXTRA_SPECS \
+ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
+ 
+-#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+ #else
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h	2007-11-08 05:44:09.000000000 -0800
++++ gcc-4.4.0/gcc/config/arm/linux-eabi.h	2009-04-21 10:05:37.592169299 -0700
+@@ -61,7 +61,7 @@
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
+ #undef  GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
+ 
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/linux-elf.h gcc-4.4.0/gcc/config/arm/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/arm/linux-elf.h	2009-04-21 10:05:37.389291242 -0700
+@@ -62,7 +62,7 @@
+ 
+ #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
+    %{b} \
+diff -Naur gcc-4.4.0.orig/gcc/config/bfin/linux.h gcc-4.4.0/gcc/config/bfin/linux.h
+--- gcc-4.4.0.orig/gcc/config/bfin/linux.h	2008-11-27 01:11:50.000000000 -0800
++++ gcc-4.4.0/gcc/config/bfin/linux.h	2009-04-21 10:05:29.793102668 -0700
+@@ -22,7 +22,7 @@
+   %{shared:-G -Bdynamic} \
+   %{!shared: %{!static: \
+    %{rdynamic:-export-dynamic} \
+-   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
++   %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \
+    %{static}} -init __init -fini __fini"
+ 
+ #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
+diff -Naur gcc-4.4.0.orig/gcc/config/cris/linux.h gcc-4.4.0/gcc/config/cris/linux.h
+--- gcc-4.4.0.orig/gcc/config/cris/linux.h	2009-03-22 08:15:04.000000000 -0700
++++ gcc-4.4.0/gcc/config/cris/linux.h	2009-04-21 10:05:27.167401313 -0700
+@@ -103,7 +103,7 @@
+ #undef CRIS_DEFAULT_CPU_VERSION
+ #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ /* We need an -rpath-link to ld.so.1, and presumably to each directory
+    specified with -B.  */
+diff -Naur gcc-4.4.0.orig/gcc/config/frv/linux.h gcc-4.4.0/gcc/config/frv/linux.h
+--- gcc-4.4.0.orig/gcc/config/frv/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/frv/linux.h	2009-04-21 10:05:26.843578992 -0700
+@@ -35,7 +35,7 @@
+ #define ENDFILE_SPEC \
+   "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/gnu.h gcc-4.4.0/gcc/config/i386/gnu.h
+--- gcc-4.4.0.orig/gcc/config/i386/gnu.h	2008-11-13 15:28:46.000000000 -0800
++++ gcc-4.4.0/gcc/config/i386/gnu.h	2009-04-21 10:05:30.113024445 -0700
+@@ -21,7 +21,7 @@
+ */
+ 
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so"
+ 
+ #undef TARGET_VERSION
+ #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux64.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/linux64.h	2009-04-21 10:05:29.968667692 -0700
+@@ -58,8 +58,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux-x86-64.so.2"
+ 
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux.h gcc-4.4.0/gcc/config/i386/linux.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/i386/linux.h	2009-04-21 10:05:31.665813103 -0700
+@@ -100,7 +100,7 @@
+ 
+ /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
+ #define LINK_EMULATION "elf_i386"
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef  ASM_SPEC
+ #define ASM_SPEC \
+diff -Naur gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
+--- gcc-4.4.0.orig/gcc/config/ia64/linux.h	2009-02-12 08:30:53.000000000 -0800
++++ gcc-4.4.0/gcc/config/ia64/linux.h	2009-04-21 10:05:32.933795782 -0700
+@@ -37,7 +37,7 @@
+ /* Define this for shared library support because it isn't in the main
+    linux.h file.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+diff -Naur gcc-4.4.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.4.0/gcc/config/kopensolaris-gnu.h
+--- gcc-4.4.0.orig/gcc/config/kopensolaris-gnu.h	2009-01-29 10:48:41.000000000 -0800
++++ gcc-4.4.0/gcc/config/kopensolaris-gnu.h	2009-04-21 10:05:38.232013132 -0700
+@@ -33,5 +33,5 @@
+ 
+ #ifdef GLIBC_DYNAMIC_LINKER
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ #endif
+diff -Naur gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h
+--- gcc-4.4.0.orig/gcc/config/linux.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/linux.h	2009-04-21 10:05:35.793583462 -0700
+@@ -117,9 +117,9 @@
+    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
+    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
+    supporting both 32-bit and 64-bit compilation.  */
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ #define LINUX_DYNAMIC_LINKER32 \
+diff -Naur gcc-4.4.0.orig/gcc/config/m32r/linux.h gcc-4.4.0/gcc/config/m32r/linux.h
+--- gcc-4.4.0.orig/gcc/config/m32r/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/m32r/linux.h	2009-04-21 10:05:29.512193603 -0700
+@@ -58,7 +58,7 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef	LINK_SPEC
+ #if TARGET_LITTLE_ENDIAN
+diff -Naur gcc-4.4.0.orig/gcc/config/m68k/linux.h gcc-4.4.0/gcc/config/m68k/linux.h
+--- gcc-4.4.0.orig/gcc/config/m68k/linux.h	2007-09-24 14:07:08.000000000 -0700
++++ gcc-4.4.0/gcc/config/m68k/linux.h	2009-04-21 10:05:27.799443777 -0700
+@@ -84,7 +84,7 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "-m m68kelf %{shared} \
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux64.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux64.h	2009-04-21 10:05:35.898926387 -0700
+@@ -35,10 +35,10 @@
+ %{!shared: \
+   %{profile:-lc_p} %{!profile:-lc}}"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
++#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
++#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKERN32 \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
+ 
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux.h gcc-4.4.0/gcc/config/mips/linux.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux.h	2009-04-21 10:05:36.394414304 -0700
+@@ -64,7 +64,7 @@
+ #undef MIPS_DEFAULT_GVALUE
+ #define MIPS_DEFAULT_GVALUE 0
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ /* Borrowed from sparc/linux.h */
+ #undef LINK_SPEC
+diff -Naur gcc-4.4.0.orig/gcc/config/mn10300/linux.h gcc-4.4.0/gcc/config/mn10300/linux.h
+--- gcc-4.4.0.orig/gcc/config/mn10300/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/mn10300/linux.h	2009-04-21 10:05:36.792364856 -0700
+@@ -32,7 +32,7 @@
+ #undef  ASM_SPEC
+ #define ASM_SPEC "%{Wa,*:%*}"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
+diff -Naur gcc-4.4.0.orig/gcc/config/pa/pa-linux.h gcc-4.4.0/gcc/config/pa/pa-linux.h
+--- gcc-4.4.0.orig/gcc/config/pa/pa-linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/pa/pa-linux.h	2009-04-21 10:05:34.931355497 -0700
+@@ -44,7 +44,7 @@
+ /* Define this for shared library support because it isn't in the main
+    linux.h file.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/linux64.h	2009-04-21 10:05:24.642748987 -0700
+@@ -342,10 +342,10 @@
+ #undef	LINK_OS_DEFAULT_SPEC
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1"
++#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+ #else
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h gcc-4.4.0/gcc/config/rs6000/sysv4.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/sysv4.h	2009-04-21 10:05:25.034773572 -0700
+@@ -901,8 +901,8 @@
+ 
+ #define LINK_START_LINUX_SPEC ""
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+ #else
+@@ -944,7 +944,7 @@
+ 
+ #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+-  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
++  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
+ 
+ #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__	\
+ %{!undef:					                \
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
+--- gcc-4.4.0.orig/gcc/config/s390/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/s390/linux.h	2009-04-21 10:05:28.673376171 -0700
+@@ -72,8 +72,8 @@
+ #define MULTILIB_DEFAULTS { "m31" }
+ #endif
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+diff -Naur gcc-4.4.0.orig/gcc/config/sh/linux.h gcc-4.4.0/gcc/config/sh/linux.h
+--- gcc-4.4.0.orig/gcc/config/sh/linux.h	2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/sh/linux.h	2009-04-21 10:05:34.264203940 -0700
+@@ -47,7 +47,7 @@
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux64.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux64.h	2009-04-21 10:05:37.666298087 -0700
+@@ -109,8 +109,8 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
+ 
+ #ifdef SPARC_BI_ARCH
+ 
+@@ -121,7 +121,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -130,7 +130,7 @@
+         %{static:-static}}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -211,7 +211,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux.h	2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux.h	2009-04-21 10:05:37.978417377 -0700
+@@ -83,10 +83,10 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!ibcs: \
+diff -Naur gcc-4.4.0.orig/gcc/config/xtensa/linux.h gcc-4.4.0/gcc/config/xtensa/linux.h
+--- gcc-4.4.0.orig/gcc/config/xtensa/linux.h	2008-01-17 17:37:53.000000000 -0800
++++ gcc-4.4.0/gcc/config/xtensa/linux.h	2009-04-21 10:05:26.652405923 -0700
+@@ -43,7 +43,7 @@
+   %{mlongcalls:--longcalls} \
+   %{mno-longcalls:--no-longcalls}"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC \
