Merge lp:~ams-codesourcery/gcc-linaro/merge-from-fsf-20110526-4.6 into lp:gcc-linaro/4.6

[Andrew Stubbs]

Merge from FSF 4.6 branch r174261.

[Linaro Toolchain Builder (cbuild)]

cbuild has taken a snapshot of this branch at r106751 and queued it for build.

The snapshot is available at:
 http://ex.seabright.co.nz/snapshots/gcc-linaro-4.6+bzr106751~ams-codesourcery~merge-from-fsf-20110526-4.6.tar.xdelta3.xz

and will be built on the following builders:
 a9-builder i686 x86_64

You can track the build queue at:
 http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: gcc-linaro-4.6+bzr106751~ams-codesourcery~merge-from-fsf-20110526-4.6
cbuild-ancestor: lp:gcc-linaro/4.6+bzr106750
cbuild-state: check

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on i686-lucid-cbuild120-scorpius-i686r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106751~ams-codesourcery~merge-from-fsf-20110526-4.6/logs/i686-lucid-cbuild120-scorpius-i686r1

The test suite results changed compared to the branch point lp:gcc-linaro/4.6+bzr106750:
 +PASS: c-c++-common/vla-1.c -Wc++-compat (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O0 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O1 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 -flto -flto-partition=none (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 -flto (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O3 -fomit-frame-pointer (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O3 -g (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -Os (test for excess errors)
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O0
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O1
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -Os
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O0
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O1
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -Os
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O0
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O1
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -Os
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O0
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O1
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O3 -fomit-frame-pointer
 ...and 245 more

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106751~ams-codesourcery~merge-from-fsf-20110526-4.6/logs/i68...

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on armv7l-maverick-cbuild120-ursa3-cortexa9r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106751~ams-codesourcery~merge-from-fsf-20110526-4.6/logs/armv7l-maverick-cbuild120-ursa3-cortexa9r1

The test suite results changed compared to the branch point lp:gcc-linaro/4.6+bzr106750:
 +PASS: c-c++-common/vla-1.c -Wc++-compat (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O0 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O1 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 -flto -flto-partition=none (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 -flto (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O3 -fomit-frame-pointer (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O3 -g (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -Os (test for excess errors)
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O0
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O1
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -Os
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O0
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O1
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -Os
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O0
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O1
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -Os
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O0
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O1
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O3 -fomit-frame-pointer
 ...and 250 more

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106751~ams-codesourcery~merge-from-fsf-20110526-...

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on x86_64-maverick-cbuild121-crucis-x86_64r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106751~ams-codesourcery~merge-from-fsf-20110526-4.6/logs/x86_64-maverick-cbuild121-crucis-x86_64r1

The test suite results changed compared to the branch point lp:gcc-linaro/4.6+bzr106750:
 +PASS: c-c++-common/vla-1.c -Wc++-compat (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O0 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O1 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 -flto -flto-partition=none (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 -flto (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O2 (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O3 -fomit-frame-pointer (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -O3 -g (test for excess errors)
 +PASS: gcc.c-torture/compile/pr49029.c -Os (test for excess errors)
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O0
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O1
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-1.c compilation, -Os
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O0
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O1
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-1.c execution, -Os
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O0
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O1
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O3 -fomit-frame-pointer
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -O3 -g
 +PASS: gcc.c-torture/execute/pr48973-2.c compilation, -Os
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O0
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O1
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2 -flto
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O2 -flto -flto-partition=none
 +PASS: gcc.c-torture/execute/pr48973-2.c execution, -O3 -fomit-frame-pointer
 ...and 245 more

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106751~ams-codesourcery~merge-from-fsf-20110526-4....

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2011-05-19 07:44:22 +0000
+++ ChangeLog.linaro	2011-05-26 15:02:13 +0000
@@ -1,3 +1,7 @@
[phone]  Andrew Stubbs  <[e-mail]>
+
+	Merge from FSF GCC 4.6 (svn branches/gcc-4_6-branch 174261).
+
 2011-05-16  Andrew Stubbs  <[e-mail]>
 
 	gcc/

=== modified file 'gcc/ChangeLog'
--- gcc/ChangeLog	2011-05-06 11:28:27 +0000
+++ gcc/ChangeLog	2011-05-26 15:02:13 +0000
@@ -1,8 +1,367 @@
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR target/49128
+	* config/i386/driver-i386.c (host_detect_local_cpu): Fix a typo.
+
[phone]  Jan Hubicka  <[e-mail]>
+
+	PR tree-optimization/44897 
+	* ipa-inline.c (cgraph_decide_recursive_inlining): Do not divide
+	by zero for insane profiles.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	* config/sparc/sparc.c (sparc_option_override): If not set by the user,
+	force flag_ira_share_save_slots to 0.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	PR target/49133
+	* config/i386/sse.md (sse2_loadhpd): Remove shufpd alternative.
+
[phone]  H.J. Lu  <[e-mail]>
+
+	Backport from mainline
+	2011-05-24  H.J. Lu  <[e-mail]>
+
+	PR target/49128
+	* config/i386/driver-i386.c (host_detect_local_cpu): Always
+	add -mno-XXX.  Handle FMA.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR lto/49123
+	* fold-const.c (constant_boolean_node): If type is non-NULL,
+	use build_int_cst_type instead of build_int_cst.
+
+	PR debug/49032
+	* dbxout.c: Include cgraph.h.
+	(dbxout_expand_expr): If a VAR_DECL is TREE_STATIC, not written
+	and without value expr, return NULL if no varpool node exists for
+	it or if it is not needed.
+	* Makefile.in (dbxout.o): Depend on $(CGRAPH_H).
+
+	PR c/49120
+	* c-decl.c (start_decl): Convert expr to void_type_node.
+
+	PR middle-end/48973
+	* expr.c (expand_expr_real_2) <case LT_EXPR>: If do_store_flag
+	failed and the comparison has a single bit signed type, use
+	constm1_rtx instead of const1_rtx for true value.
+	(do_store_flag): If ops->type is single bit signed type, disable
+	signel bit test optimization and pass -1 instead of 1 as last
+	parameter to emit_store_flag_force.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	* config.gcc (sparc-*-elf*): Add sparc/t-crtin.
+	(sparc-*-rtems*): Likewise.
+	(sparc64-*-elf*): Likewise.
+	(sparc64-*-rtems*): Likewise.
+	(sparc*-*-solaris2*): Likewise.  Remove crti.o crtn.o extra parts.
+	* config/sparc/t-crtin: New file.
+	* config/sparc/t-sol2 (crti.o): Delete rule.
+	(crtn.o): Likewise.
+	* config/sparc/t-linux64 (EXTRA_MULTILIB_PARTS): Delete.
+	* config/sparc/t-sol2-64 (EXTRA_MULTILIB_PARTS): Likewise.
+	* config/sparc/sp64-elf.h (STARTFILE_SPEC): Tidy and add crti.o.
+	(ENDFILE_SPEC): Add crtn.o.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	PR target/49104
+	* config/i386/cpuid.h (bit_MMXEXT): New define.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR middle-end/49029
+	* expmed.c (extract_fixed_bit_field): Test whether target can be used
+	only after deciding which mode to use.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	* config/sparc/sparc.md (setjmp): Handle PIC mode and use the hard
+	frame pointer.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	* config/sparc/sparc.c (eligible_for_return_delay): Do not return
+	false if there are call-saved registers here...
+	(sparc_can_use_return_insn_p): ...but here instead.
+	(save_or_restore_regs): Fix thinko.
+	(sparc_expand_prologue): Use current_function_is_leaf.
+	(sparc_frame_pointer_required): Likewise.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR bootstrap/49086
+	* gimple-fold.c (and_comparisons_1, or_comparisons_1): Return NULL
+	for PHI args that are SSA_NAME_IS_DEFAULT_DEF.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/49079
+	* tree-dfa.c (get_ref_base_and_extent): Handle view-converting
+	MEM_REFs correctly for the trailing array access detection.
+	Special case constants the same way as decls for overall size
+	constraining.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/49073
+	* gimple-fold.c (and_comparisons_1, or_comparisons_1): Return
+	NULL if PHI argument is SSA_NAME, whose def_stmt is dominated
+	by the PHI.
+	* tree-ssa-ifcombine.c (tree_ssa_ifcombine): Calculate dominators.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	* config/i386/i386.c (option_override_internal): Enable TARGET_CMOVE
+	when TARGET_RDRND is active.
+	(ix86_expand_builtin) <case IX86_BUILTIN_RDRAND{16,32,64}_STEP>:
+	Generate dummy SImode target register when target is NULL.
+
[phone]  H.J. Lu  <[e-mail]>
+
+	Backport from mainline
+	2011-05-18  H.J. Lu  <[e-mail]>
+
+	PR target/49002
+	* config/i386/sse.md (avx_<avxmodesuffixp><avxmodesuffix>_<avxmodesuffixp>):
+	Properly handle load cast.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/49039
+	* tree-vrp.c (extract_range_from_binary_expr): For
+	MIN_EXPR <~[a, b], ~[c, d]> and MAX_EXPR <~[a, b], ~[c, d]>
+	return ~[MAX_EXPR <a, c>, MIN_EXPR <b, d>].
+
[phone]  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/49018
+	* gimple.c (gimple_has_side_effects): Volatile asms have side-effects.
+	* tree-ssa-ifcombine.c (bb_no_side_effects_p): Use
+	gimple_has_side_effects.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	Backport from mainline
+	2011-04-19  Richard Guenther  <[e-mail]>
+
+	PR lto/48207
+	* tree.c (free_lang_data): Do not reset the decl-assembler-name
+	langhook.
+
+	2011-04-21  Richard Guenther  <[e-mail]>
+
+	PR lto/48703
+	* tree.c (free_lang_data_in_decl): Do not zero TREE_TYPE of
+	DECL_NAME.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	Backport from mainline
+	2011-05-12  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/48172
+	* tree-vect-loop-manip.c (vect_vfa_segment_size): Do not exclude
+	the number of iterations from the segment size calculation.
+	(vect_create_cond_for_alias_checks): Adjust.
+
+	2011-05-13  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/48172
+	* tree-vect-loop-manip.c (vect_vfa_segment_size): Avoid
+	multiplying by number of iterations for equal step.
+	(vect_create_cond_for_alias_checks): Likewise.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/49000
+	* tree-ssa.c (execute_update_addresses_taken): Call
+	maybe_rewrite_mem_ref_base on debug stmt value.  If it couldn't
+	be rewritten and decl has been marked for renaming, reset
+	the debug stmt.
+
[phone]  Nick Clifton  <[e-mail]>
+
+	Import these patches from the mainline:
+
+	2011-05-17  Nick Clifton  <[e-mail]>
+
+	* config/rx/rx.c (rx_memory_move_cost): Include cost of register
+	moves.
+
+	* config/rx/rx.md: Add peephole to remove redundant extensions
+	after loads.
+	(bitset_in_memory): Use rx_restricted_mem_operand.
+	(bitinvert_in_memory): Likewise.
+	(bitclr_in_memory): Likewise.
+
+	2011-05-17  Kazuhio Inaoka  <[e-mail]>
+	    Nick Clifton  <[e-mail]>
+
+	* config/rx/rx.md: Add peepholes to match a register move followed
+	by a comparison of the moved register.  Replace these with an
+	addition of zero that does both actions in one instruction.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR target/48986
+	* config/i386/sync.md (sync_old_add<mode>): Relax operand 2
+	predicate to allow CONST_INT.
+
[phone]  Joseph Myers  <[e-mail]>
+
+	PR preprocessor/48677
+	* cppspec.c (lang_specific_driver): Set new_decoded_options[0]
+	from decoded_options[0], not from itself.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	* config/i386/i386.md (*movxf_internal): Disable CONST_DOUBLE
+	optimization for CM_MEDIUM and CM_LARGE code models.  Fix usage
+	of standard_80387_constant_p.
+	(*movxf_internal_nointeger): Ditto.
+	(*movdf_internal): Remove dead code-size optimization.
+	(*movdf_internal_rex64): Fix usage of standard_80387_constant_p.
+	(*movdf_internal_nointeger): Ditto.
+	(*movsf_internal): Ditto.
+	(floating point move splitters): Ditto.
+	* config/i386/constraints.md (G): Ditto.
+	* config/i386/i386.c (ix86_preferred_reload_class): Ditto.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/48975
+	* tree-if-conv.c (combine_blocks): Call free_bb_predicate
+	on all bbs here and free and clear ifc_bbs at the end.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	Backport from mainline
+	2011-05-02  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/48822
+	* tree-ssa-sccvn.c (set_ssa_val_to): Never go up the lattice.
+	(process_scc): Indicate which iteration we start.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR debug/48967
+	* var-tracking.c (use_narrower_mode_test) <case REG>: Return 1
+	if validate_subreg fails.
+
[phone]  Nick Clifton  <[e-mail]>
+
+	* config/rx/rx.h (HAVE_PRE_DECREMENT): Fix typo.
+	* config/rx/rx.c (rx_is_legitimate_constant): Use gcc_unreachable
+	instead of abort.
+	(rx_align_for_label): Test label before extracting its number of
+	uses.
+	(rx_max_skip_for_label): Ignore debug insns.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR debug/48159
+	* tree-ssa.c (reset_debug_uses): New function.
+	* tree-flow.h (reset_debug_uses): New prototype.
+	* tree-data-ref.c (stmts_from_loop): Ignore debug stmts.
+	* tree-loop-distribution.c (generate_loops_for_partition): Call
+	reset_debug_uses on the stmts that will be removed.  Keep around
+	all debug stmts, don't count them as bits in partition bitmap.
+	(generate_builtin): Don't count debug stmts or labels as bits in
+	partition bitmap.
+
[phone]  Michael Meissner  <[e-mail]>
+
+	Backport from mainline
+	2011-05-10  Michael Meissner  <[e-mail]>
+
+	PR target/48857, 48495
+	* config/rs6000/rs6000.h (VSX_SCALAR_MODE): Delete.
+	(VSX_MODE): Ditto.
+	(VSX_MOVE_MODE): Ditto.
+	(ALTIVEC_OR_VSX_VECTOR_MODE): New macro, combine all Altivec and
+	VSX vector types.  Add V2DImode.
+	(HARD_REGNO_CALLER_SAVE_MODE): Use it instead of
+	ALTIVEC_VECTOR_MODE and VSX_VECTOR_MODE calls.
+	(MODES_TIEABLE_P): Ditto.
+
+	* config/rs6000/rs6000.c (rs6000_emit_move): Use
+	ALTIVEC_OR_VSX_MODE instead of ALTIVEC_VECTOR_MODE and
+	VSX_VECTOR_MODE.
+	(init_cumulative_args): Ditto.
+	(rs6000_function_arg_boundary): Ditto.
+	(rs6000_function_arg_advance_1): Ditto.
+	(rs6000_function_arg): Ditto.
+	(rs6000_function_ok_for_sibcall): Ditto.
+	(emit_frame_save): Ditto.
+	(rs6000_function_value): Ditto.
+	(rs6000_libcall_value): Ditto.
+
[phone]  Nick Clifton  <[e-mail]>
+
+	* config/rx/rx.c (rx_memory_move_cost): Reduce the cost for
+	stores.
+
[phone]  DJ Delorie  <[e-mail]>
+
+	* config/rx/rx.h (JUMP_ALIGN, LABEL_ALIGN, LOOP_ALIGN): Define.
+	(LABEL_ALIGN_AFTER_BARRIER): Pass label to rx_align_for_label
+	* config/rx/rx.c (rx_align_for_label): Add label and
+	uses_threshold parameters.  Do not align when the label is not
+	used enough.
+	* config/rx/rx-protos.h (rx_align_for_label): Update prototype.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	Backported from mainline
+	2011-05-07  Zdenek Dvorak  <[e-mail]>
+
+	PR tree-optimization/48837
+	* tree-tailcall.c (tree_optimize_tail_calls_1): Do not mark tailcalls
+	when accumulator transformation is performed.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/48611
+	PR tree-optimization/48794
+	* tree-eh.c (remove_unreachable_handlers): Don't remove regions
+	referenced from RESX or EH_DISPATCH arguments.
+
[phone]  Andreas Krebbel  <[e-mail]>
+
+	* config/s390/s390.md (TD/TF mem to reg move splitter): Make the
+	temporary register to match Pmode.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	* var-tracking.c (find_mem_expr_in_1pdv): Fix thinko.
+	(dataflow_set_preserve_mem_locs): Likewise.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	* config/i386/i386.md (*movdf_internal_nointeger): Apply "*"
+	constraint modifier to "r".
+
[phone]  Alan Modra  <[e-mail]>
+
+	PR target/48900
+	* config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Use
+	const0_rtx as the arg to the dummy __tls_get_addr libcall.
+
[phone]  Andreas Krebbel  <[e-mail]>
+
+	* config/s390/s390.c (s390_asm_trampoline_template): Comment
+	instruction sizes.
+	(s390_trampoline_init): Replace UNITS_PER_WORD with UNITS_PER_LONG.
+
 2011-05-06  Ramana Radhakrishnan  <[e-mail]>
 
 	PR target/48252
-	* config/arm/neon.md (neon_vtrn<mode>): Fix typo
-	from earlier commit.
+	* config/arm/neon.md (neon_vtrn<mode>): Fix typo from earlier commit.
 
 2011-05-05  Michael Meissner  <[e-mail]>
 

=== modified file 'gcc/DATESTAMP'
--- gcc/DATESTAMP	2011-05-06 00:19:00 +0000
+++ gcc/DATESTAMP	2011-05-26 15:02:13 +0000
@@ -1,1 +1,1 @@
-20110506
[phone]

=== modified file 'gcc/Makefile.in'
--- gcc/Makefile.in	2011-04-18 11:31:29 +0000
+++ gcc/Makefile.in	2011-05-26 15:02:13 +0000
@@ -2922,7 +2922,8 @@
 dbxout.o : dbxout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
    $(RTL_H) $(FLAGS_H) $(REGS_H) debug.h $(TM_P_H) $(TARGET_H) $(FUNCTION_H) \
    langhooks.h insn-config.h reload.h $(GSTAB_H) xcoffout.h output.h dbxout.h \
-   toplev.h $(DIAGNOSTIC_CORE_H) $(GGC_H) $(OBSTACK_H) $(EXPR_H) gt-dbxout.h
+   toplev.h $(DIAGNOSTIC_CORE_H) $(GGC_H) $(OBSTACK_H) $(EXPR_H) $(CGRAPH_H) \
+   gt-dbxout.h
 debug.o : debug.c debug.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H)
 sdbout.o : sdbout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) debug.h \
    $(TREE_H) $(GGC_H) $(RTL_H) $(REGS_H) $(FLAGS_H) insn-config.h \

=== modified file 'gcc/c-decl.c'
--- gcc/c-decl.c	2011-03-20 01:55:25 +0000
+++ gcc/c-decl.c	2011-05-26 15:02:13 +0000
@@ -1,6 +1,6 @@
 /* Process declarations and variables for C compiler.
    Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -3948,7 +3948,7 @@
     return 0;
 
   if (expr)
-    add_stmt (expr);
+    add_stmt (fold_convert (void_type_node, expr));
 
   if (TREE_CODE (decl) != FUNCTION_DECL && MAIN_NAME_P (DECL_NAME (decl)))
     warning (OPT_Wmain, "%q+D is usually a function", decl);

=== modified file 'gcc/config.gcc'
--- gcc/config.gcc	2011-04-08 21:41:35 +0000
+++ gcc/config.gcc	2011-05-26 15:02:13 +0000
@@ -2522,12 +2522,12 @@
 		tmake_file="sparc/t-elf"
 		;;
 	esac
-	tmake_file="${tmake_file} sparc/t-crtfm"
+	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm"
 	extra_parts="crtbegin.o crtend.o"
 	;;
 sparc-*-rtems*)
 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
-	tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
+	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm t-rtems"
 	extra_parts="crtbegin.o crtend.o"
 	;;
 sparc-*-linux*)
@@ -2585,7 +2585,7 @@
 		tm_file="${tm_file} sol2-gld.h sparc/sol2-gld-bi.h"
 	fi
 	tm_file="${tm_file} tm-dwarf2.h"
-	tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
+	tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtin sparc/t-crtfm"
 	if test x$gnu_ld = xyes; then
 		tmake_file="$tmake_file t-slibgcc-elf-ver"
 	else
@@ -2598,7 +2598,7 @@
 	cxx_target_objs="sol2-c.o"
 	extra_objs="sol2.o"
 	tm_p_file="${tm_p_file} sol2-protos.h"
-	extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
+	extra_parts="crt1.o gcrt1.o gmon.o crtbegin.o crtend.o"
 	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
 	  "":yes:* | yes:yes:* )
 		thread_file=posix
@@ -2615,13 +2615,13 @@
 sparc64-*-elf*)
 	tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h"
 	extra_options="${extra_options} sparc/little-endian.opt"
-	tmake_file="${tmake_file} sparc/t-crtfm"
+	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm"
 	extra_parts="crtbegin.o crtend.o"
 	;;
 sparc64-*-rtems*)
 	tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
 	extra_options="${extra_options} sparc/little-endian.opt"
-	tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
+	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm t-rtems"
 	extra_parts="crtbegin.o crtend.o"
 	;;
 sparc64-*-linux*)

=== modified file 'gcc/config/i386/constraints.md'
--- gcc/config/i386/constraints.md	2009-07-08 15:41:23 +0000
+++ gcc/config/i386/constraints.md	2011-05-26 15:02:13 +0000
@@ -149,7 +149,7 @@
 (define_constraint "G"
   "Standard 80387 floating point constant."
   (and (match_code "const_double")
-       (match_test "standard_80387_constant_p (op)")))
+       (match_test "standard_80387_constant_p (op) > 0")))
 
 ;; This can theoretically be any mode's CONST0_RTX.
 (define_constraint "C"

=== modified file 'gcc/config/i386/cpuid.h'
--- gcc/config/i386/cpuid.h	2010-11-10 22:02:34 +0000
+++ gcc/config/i386/cpuid.h	2011-05-26 15:02:13 +0000
@@ -57,6 +57,7 @@
 #define bit_TBM         (1 << 21)
 
 /* %edx */
+#define bit_MMXEXT	(1 << 22)
 #define bit_LM		(1 << 29)
 #define bit_3DNOWP	(1 << 30)
 #define bit_3DNOW	(1 << 31)

=== modified file 'gcc/config/i386/driver-i386.c'
--- gcc/config/i386/driver-i386.c	2011-01-06 22:59:46 +0000
+++ gcc/config/i386/driver-i386.c	2011-05-26 15:02:13 +0000
@@ -395,7 +395,7 @@
   unsigned int has_movbe = 0, has_sse4_1 = 0, has_sse4_2 = 0;
   unsigned int has_popcnt = 0, has_aes = 0, has_avx = 0;
   unsigned int has_pclmul = 0, has_abm = 0, has_lwp = 0;
-  unsigned int has_fma4 = 0, has_xop = 0;
+  unsigned int has_fma = 0, has_fma4 = 0, has_xop = 0;
   unsigned int has_bmi = 0, has_tbm = 0;
 
   bool arch;
@@ -443,6 +443,7 @@
   has_popcnt = ecx & bit_POPCNT;
   has_aes = ecx & bit_AES;
   has_pclmul = ecx & bit_PCLMUL;
+  has_fma = ecx & bit_FMA;
 
   has_cmpxchg8b = edx & bit_CMPXCHG8B;
   has_cmov = edx & bit_CMOV;
@@ -681,37 +682,26 @@
 
   if (arch)
     {
-      if (has_cmpxchg16b)
-	options = concat (options, " -mcx16", NULL);
-      if (has_lahf_lm)
-	options = concat (options, " -msahf", NULL);
-      if (has_movbe)
-	options = concat (options, " -mmovbe", NULL);
-      if (has_aes)
-	options = concat (options, " -maes", NULL);
-      if (has_pclmul)
-	options = concat (options, " -mpclmul", NULL);
-      if (has_popcnt)
-	options = concat (options, " -mpopcnt", NULL);
-      if (has_abm)
-	options = concat (options, " -mabm", NULL);
-      if (has_lwp)
-	options = concat (options, " -mlwp", NULL);
-      if (has_fma4)
-	options = concat (options, " -mfma4", NULL);
-      if (has_xop)
-	options = concat (options, " -mxop", NULL);
-      if (has_bmi)
-	options = concat (options, " -mbmi", NULL);
-      if (has_tbm)
-	options = concat (options, " -mtbm", NULL);
+      const char *cx16 = has_cmpxchg16b ? " -mcx16" : " -mno-cx16";
+      const char *sahf = has_lahf_lm ? " -msahf" : " -mno-sahf";
+      const char *movbe = has_movbe ? " -mmovbe" : " -mno-movbe";
+      const char *ase = has_aes ? " -maes" : " -mno-aes";
+      const char *pclmul = has_pclmul ? " -mpclmul" : " -mno-pclmul";
+      const char *popcnt = has_popcnt ? " -mpopcnt" : " -mno-popcnt";
+      const char *abm = has_abm ? " -mabm" : " -mno-abm";
+      const char *lwp = has_lwp ? " -mlwp" : " -mno-lwp";
+      const char *fma = has_fma ? " -mfma" : " -mno-fma";
+      const char *fma4 = has_fma4 ? " -mfma4" : " -mno-fma4";
+      const char *xop = has_xop ? " -mxop" : " -mno-xop";
+      const char *bmi = has_bmi ? " -mbmi" : " -mno-bmi";
+      const char *tbm = has_tbm ? " -mtbm" : " -mno-tbm";
+      const char *avx = has_avx ? " -mavx" : " -mno-avx";
+      const char *sse4_2 = has_sse4_2 ? " -msse4.2" : " -mno-sse4.2";
+      const char *sse4_1 = has_sse4_1 ? " -msse4.1" : " -mno-sse4.1";
 
-      if (has_avx)
-	options = concat (options, " -mavx", NULL);
-      else if (has_sse4_2)
-	options = concat (options, " -msse4.2", NULL);
-      else if (has_sse4_1)
-	options = concat (options, " -msse4.1", NULL);
+      options = concat (options, cx16, sahf, movbe, ase, pclmul,
+			popcnt, abm, lwp, fma, fma4, xop, bmi, tbm,
+			avx, sse4_2, sse4_1, NULL);
     }
 
 done:

=== modified file 'gcc/config/i386/i386.c'
--- gcc/config/i386/i386.c	2011-05-03 13:06:06 +0000
+++ gcc/config/i386/i386.c	2011-05-26 15:02:13 +0000
@@ -4164,8 +4164,9 @@
     }
 
   /* For sane SSE instruction set generation we need fcomi instruction.
-     It is safe to enable all CMOVE instructions.  */
-  if (TARGET_SSE)
+     It is safe to enable all CMOVE instructions.  Also, RDRAND intrinsic
+     expands to a sequence that includes conditional move. */
+  if (TARGET_SSE || TARGET_RDRND)
     TARGET_CMOVE = 1;
 
   /* Figure out what ASM_GENERATE_INTERNAL_LABEL builds as a prefix.  */
@@ -27450,6 +27451,12 @@
       op0 = gen_reg_rtx (mode0);
       emit_insn (GEN_FCN (icode) (op0));
 
+      arg0 = CALL_EXPR_ARG (exp, 0);
+      op1 = expand_normal (arg0);
+      if (!address_operand (op1, VOIDmode))
+	op1 = copy_addr_to_reg (op1);
+      emit_move_insn (gen_rtx_MEM (mode0, op1), op0);
+
       op1 = gen_reg_rtx (SImode);
       emit_move_insn (op1, CONST1_RTX (SImode));
 
@@ -27464,17 +27471,13 @@
       else
 	op2 = gen_rtx_SUBREG (SImode, op0, 0);
 
+      if (target == 0)
+	target = gen_reg_rtx (SImode);
+
       pat = gen_rtx_GEU (VOIDmode, gen_rtx_REG (CCCmode, FLAGS_REG),
 			 const0_rtx);
-      emit_insn (gen_rtx_SET (VOIDmode, op1,
+      emit_insn (gen_rtx_SET (VOIDmode, target,
 			      gen_rtx_IF_THEN_ELSE (SImode, pat, op2, op1)));
-      emit_move_insn (target, op1);
-
-      arg0 = CALL_EXPR_ARG (exp, 0);
-      op1 = expand_normal (arg0);
-      if (!address_operand (op1, VOIDmode))
-	op1 = copy_addr_to_reg (op1);
-      emit_move_insn (gen_rtx_MEM (mode0, op1), op0);
       return target;
 
     default:
@@ -28252,7 +28255,7 @@
 	 zero above.  We only want to wind up preferring 80387 registers if
 	 we plan on doing computation with them.  */
       if (TARGET_80387
-	  && standard_80387_constant_p (x))
+	  && standard_80387_constant_p (x) > 0)
 	{
 	  /* Limit class to non-sse.  */
 	  if (regclass == FLOAT_SSE_REGS)

=== modified file 'gcc/config/i386/i386.md'
--- gcc/config/i386/i386.md	2011-05-04 17:01:43 +0000
+++ gcc/config/i386/i386.md	2011-05-26 15:02:13 +0000
@@ -2836,6 +2836,7 @@
   "optimize_function_for_speed_p (cfun)
    && !(MEM_P (operands[0]) && MEM_P (operands[1]))
    && (reload_in_progress || reload_completed
+       || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
        || memory_operand (operands[0], XFmode))"
 {
@@ -2865,7 +2866,8 @@
   "optimize_function_for_size_p (cfun)
    && !(MEM_P (operands[0]) && MEM_P (operands[1]))
    && (reload_in_progress || reload_completed
-       || standard_80387_constant_p (operands[1])
+       || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
+       || standard_80387_constant_p (operands[1]) > 0
        || GET_CODE (operands[1]) != CONST_DOUBLE
        || memory_operand (operands[0], XFmode))"
 {
@@ -2911,7 +2913,7 @@
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || (!(TARGET_SSE2 && TARGET_SSE_MATH)
            && optimize_function_for_size_p (cfun)
-	   && standard_80387_constant_p (operands[1]))
+	   && standard_80387_constant_p (operands[1]) > 0)
        || GET_CODE (operands[1]) != CONST_DOUBLE
        || memory_operand (operands[0], DFmode))"
 {
@@ -3078,9 +3080,6 @@
    && TARGET_INTEGER_DFMODE_MOVES
    && (reload_in_progress || reload_completed
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
-       || (!(TARGET_SSE2 && TARGET_SSE_MATH)
-           && optimize_function_for_size_p (cfun)
-	   && standard_80387_constant_p (operands[1]))
        || GET_CODE (operands[1]) != CONST_DOUBLE
        || memory_operand (operands[0], DFmode))"
 {
@@ -3240,7 +3239,7 @@
   [(set (match_operand:DF 0 "nonimmediate_operand"
 			"=f,m,f,*r  ,o  ,Y2*x,Y2*x,Y2*x ,m  ")
 	(match_operand:DF 1 "general_operand"
-			"fm,f,G,*roF,*Fr,C   ,Y2*x,mY2*x,Y2*x"))]
+			"fm,f,G,*roF,F*r,C   ,Y2*x,mY2*x,Y2*x"))]
   "!TARGET_64BIT && !(MEM_P (operands[0]) && MEM_P (operands[1]))
    && (optimize_function_for_size_p (cfun)
        || !TARGET_INTEGER_DFMODE_MOVES)
@@ -3249,11 +3248,10 @@
        || (!(TARGET_SSE2 && TARGET_SSE_MATH)
            && optimize_function_for_size_p (cfun)
            && !memory_operand (operands[0], DFmode)
-	   && standard_80387_constant_p (operands[1]))
+	   && standard_80387_constant_p (operands[1]) > 0)
        || GET_CODE (operands[1]) != CONST_DOUBLE
        || ((optimize_function_for_size_p (cfun)
-            || !TARGET_MEMORY_MISMATCH_STALL
-	    || reload_in_progress || reload_completed)
+            || !TARGET_MEMORY_MISMATCH_STALL)
  	   && memory_operand (operands[0], DFmode)))"
 {
   switch (which_alternative)
@@ -3427,7 +3425,7 @@
    && (reload_in_progress || reload_completed
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || (!TARGET_SSE_MATH && optimize_function_for_size_p (cfun)
-	   && standard_80387_constant_p (operands[1]))
+	   && standard_80387_constant_p (operands[1]) > 0)
        || GET_CODE (operands[1]) != CONST_DOUBLE
        || memory_operand (operands[0], SFmode))"
 {
@@ -3540,7 +3538,7 @@
     }
   else if (FP_REG_P (r))
     {
-      if (!standard_80387_constant_p (c))
+      if (standard_80387_constant_p (c) < 1)
 	FAIL;
     }
   else if (MMX_REG_P (r))
@@ -3572,7 +3570,7 @@
     }
   else if (FP_REG_P (r))
     {
-      if (!standard_80387_constant_p (c))
+      if (standard_80387_constant_p (c) < 1)
 	FAIL;
     }
   else if (MMX_REG_P (r))

=== modified file 'gcc/config/i386/sse.md'
--- gcc/config/i386/sse.md	2011-05-04 17:01:43 +0000
+++ gcc/config/i386/sse.md	2011-05-26 15:02:13 +0000
@@ -4950,24 +4950,22 @@
 ;; Avoid combining registers from different units in a single alternative,
 ;; see comment above inline_secondary_memory_needed function in i386.c
 (define_insn "sse2_loadhpd"
-  [(set (match_operand:V2DF 0 "nonimmediate_operand"     "=x,x,x,o,o,o")
+  [(set (match_operand:V2DF 0 "nonimmediate_operand"     "=x,x,o,o,o")
 	(vec_concat:V2DF
 	  (vec_select:DF
-	    (match_operand:V2DF 1 "nonimmediate_operand" " 0,0,x,0,0,0")
+	    (match_operand:V2DF 1 "nonimmediate_operand" " 0,0,0,0,0")
 	    (parallel [(const_int 0)]))
-	  (match_operand:DF 2 "nonimmediate_operand"     " m,x,0,x,*f,r")))]
+	  (match_operand:DF 2 "nonimmediate_operand"     " m,x,x,*f,r")))]
   "TARGET_SSE2 && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "@
    movhpd\t{%2, %0|%0, %2}
    unpcklpd\t{%2, %0|%0, %2}
-   shufpd\t{$1, %1, %0|%0, %1, 1}
    #
    #
    #"
-  [(set_attr "type" "ssemov,sselog,sselog,ssemov,fmov,imov")
-   (set_attr "prefix_data16" "1,*,*,*,*,*")
-   (set_attr "length_immediate" "*,*,1,*,*,*")
-   (set_attr "mode" "V1DF,V2DF,V2DF,DF,DF,DF")])
+  [(set_attr "type" "ssemov,sselog,ssemov,fmov,imov")
+   (set_attr "prefix_data16" "1,*,*,*,*")
+   (set_attr "mode" "V1DF,V2DF,DF,DF,DF")])
 
 (define_split
   [(set (match_operand:V2DF 0 "memory_operand" "")
@@ -12017,12 +12015,13 @@
   "&& reload_completed"
   [(const_int 0)]
 {
+  rtx op0 = operands[0];
   rtx op1 = operands[1];
-  if (REG_P (op1))
+  if (REG_P (op0))
+    op0 = gen_rtx_REG (<avxhalfvecmode>mode, REGNO (op0));
+  else 
     op1 = gen_rtx_REG (<MODE>mode, REGNO (op1));
-  else
-    op1 = gen_lowpart (<MODE>mode, op1);
-  emit_move_insn (operands[0], op1);
+  emit_move_insn (op0, op1);
   DONE;
 })
 

=== modified file 'gcc/config/i386/sync.md'
--- gcc/config/i386/sync.md	2010-05-17 19:28:56 +0000
+++ gcc/config/i386/sync.md	2011-05-26 15:02:13 +0000
@@ -1,5 +1,5 @@
 ;; GCC machine description for i386 synchronization instructions.
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;; Free Software Foundation, Inc.
 ;;
 ;; This file is part of GCC.
@@ -164,13 +164,16 @@
   "!TARGET_64BIT && TARGET_CMPXCHG8B && flag_pic"
   "xchg{l}\t%%ebx, %3\;lock{%;} cmpxchg8b\t%1\;xchg{l}\t%%ebx, %3")
 
+;; For operand 2 nonmemory_operand predicate is used instead of
+;; register_operand to allow combiner to better optimize atomic
+;; additions of constants.
 (define_insn "sync_old_add<mode>"
   [(set (match_operand:SWI 0 "register_operand" "=<r>")
 	(unspec_volatile:SWI
 	  [(match_operand:SWI 1 "memory_operand" "+m")] UNSPECV_XCHG))
    (set (match_dup 1)
 	(plus:SWI (match_dup 1)
-		  (match_operand:SWI 2 "register_operand" "0")))
+		  (match_operand:SWI 2 "nonmemory_operand" "0")))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_XADD"
   "lock{%;} xadd{<imodesuffix>}\t{%0, %1|%1, %0}")

=== modified file 'gcc/config/rs6000/rs6000.c'
--- gcc/config/rs6000/rs6000.c	2011-05-05 21:32:40 +0000
+++ gcc/config/rs6000/rs6000.c	2011-05-26 15:02:13 +0000
@@ -6545,10 +6545,11 @@
 
       if (model == TLS_MODEL_GLOBAL_DYNAMIC)
 	{
-	  r3 = gen_rtx_REG (Pmode, 3);
 	  tga = rs6000_tls_get_addr ();
-	  emit_library_call_value (tga, dest, LCT_CONST, Pmode, 1, r3, Pmode);
+	  emit_library_call_value (tga, dest, LCT_CONST, Pmode,
+				   1, const0_rtx, Pmode);
 
+	  r3 = gen_rtx_REG (Pmode, 3);
 	  if (DEFAULT_ABI == ABI_AIX && TARGET_64BIT)
 	    insn = gen_tls_gd_aix64 (r3, got, addr, tga, const0_rtx);
 	  else if (DEFAULT_ABI == ABI_AIX && !TARGET_64BIT)
@@ -6565,11 +6566,12 @@
 	}
       else if (model == TLS_MODEL_LOCAL_DYNAMIC)
 	{
-	  r3 = gen_rtx_REG (Pmode, 3);
 	  tga = rs6000_tls_get_addr ();
 	  tmp1 = gen_reg_rtx (Pmode);
-	  emit_library_call_value (tga, tmp1, LCT_CONST, Pmode, 1, r3, Pmode);
+	  emit_library_call_value (tga, tmp1, LCT_CONST, Pmode,
+				   1, const0_rtx, Pmode);
 
+	  r3 = gen_rtx_REG (Pmode, 3);
 	  if (DEFAULT_ABI == ABI_AIX && TARGET_64BIT)
 	    insn = gen_tls_ld_aix64 (r3, got, tga, const0_rtx);
 	  else if (DEFAULT_ABI == ABI_AIX && !TARGET_64BIT)
@@ -7889,7 +7891,7 @@
 
 /* Nonzero if we can use an AltiVec register to pass this arg.  */
 #define USE_ALTIVEC_FOR_ARG_P(CUM,MODE,TYPE,NAMED)		\
-  ((ALTIVEC_VECTOR_MODE (MODE) || VSX_VECTOR_MODE (MODE))	\
+  (ALTIVEC_OR_VSX_VECTOR_MODE (MODE)				\
    && (CUM)->vregno <= ALTIVEC_ARG_MAX_REG			\
    && TARGET_ALTIVEC_ABI					\
    && (NAMED))
@@ -8089,8 +8091,7 @@
 	    }
 	  if (SCALAR_FLOAT_MODE_P (return_mode))
 	    rs6000_passes_float = true;
-	  else if (ALTIVEC_VECTOR_MODE (return_mode)
-		   || VSX_VECTOR_MODE (return_mode)
+	  else if (ALTIVEC_OR_VSX_VECTOR_MODE (return_mode)
 		   || SPE_VECTOR_MODE (return_mode))
 	    rs6000_passes_vector = true;
 	}
@@ -8188,7 +8189,7 @@
    existing library interfaces.
 
    Doubleword align SPE vectors.
-   Quadword align Altivec vectors.
+   Quadword align Altivec/VSX vectors.
    Quadword align large synthetic vector types.   */
 
 static unsigned int
@@ -8205,7 +8206,7 @@
 	       && int_size_in_bytes (type) >= 8
 	       && int_size_in_bytes (type) < 16))
     return 64;
-  else if ((ALTIVEC_VECTOR_MODE (mode) || VSX_VECTOR_MODE (mode))
+  else if (ALTIVEC_OR_VSX_VECTOR_MODE (mode)
 	   || (type && TREE_CODE (type) == VECTOR_TYPE
 	       && int_size_in_bytes (type) >= 16))
     return 128;
@@ -8425,7 +8426,7 @@
     {
       if (SCALAR_FLOAT_MODE_P (mode))
 	rs6000_passes_float = true;
-      else if (named && (ALTIVEC_VECTOR_MODE (mode) || VSX_VECTOR_MODE (mode)))
+      else if (named && ALTIVEC_OR_VSX_VECTOR_MODE (mode))
 	rs6000_passes_vector = true;
       else if (SPE_VECTOR_MODE (mode)
 	       && !cum->stdarg
@@ -8435,8 +8436,7 @@
 #endif
 
   if (TARGET_ALTIVEC_ABI
-      && (ALTIVEC_VECTOR_MODE (mode)
-	  || VSX_VECTOR_MODE (mode)
+      && (ALTIVEC_OR_VSX_VECTOR_MODE (mode)
 	  || (type && TREE_CODE (type) == VECTOR_TYPE
 	      && int_size_in_bytes (type) == 16)))
     {
@@ -9054,8 +9054,7 @@
     else
       return gen_rtx_REG (mode, cum->vregno);
   else if (TARGET_ALTIVEC_ABI
-	   && (ALTIVEC_VECTOR_MODE (mode)
-	       || VSX_VECTOR_MODE (mode)
+	   && (ALTIVEC_OR_VSX_VECTOR_MODE (mode)
 	       || (type && TREE_CODE (type) == VECTOR_TYPE
 		   && int_size_in_bytes (type) == 16)))
     {
@@ -19981,7 +19980,7 @@
 
   /* Some cases that need register indexed addressing.  */
   if ((TARGET_ALTIVEC_ABI && ALTIVEC_VECTOR_MODE (mode))
-      || (TARGET_VSX && VSX_VECTOR_MODE (mode))
+      || (TARGET_VSX && ALTIVEC_OR_VSX_VECTOR_MODE (mode))
       || (TARGET_E500_DOUBLE && mode == DFmode)
       || (TARGET_SPE_ABI
 	  && SPE_VECTOR_MODE (mode)
@@ -27264,13 +27263,12 @@
   else if (TREE_CODE (valtype) == COMPLEX_TYPE
 	   && targetm.calls.split_complex_arg)
     return rs6000_complex_function_value (mode);
+  /* VSX is a superset of Altivec and adds V2DImode/V2DFmode.  Since the same
+     return register is used in both cases, and we won't see V2DImode/V2DFmode
+     for pure altivec, combine the two cases.  */
   else if (TREE_CODE (valtype) == VECTOR_TYPE
 	   && TARGET_ALTIVEC && TARGET_ALTIVEC_ABI
-	   && ALTIVEC_VECTOR_MODE (mode))
-    regno = ALTIVEC_ARG_RETURN;
-  else if (TREE_CODE (valtype) == VECTOR_TYPE
-	   && TARGET_VSX && TARGET_ALTIVEC_ABI
-	   && VSX_VECTOR_MODE (mode))
+	   && ALTIVEC_OR_VSX_VECTOR_MODE (mode))
     regno = ALTIVEC_ARG_RETURN;
   else if (TARGET_E500_DOUBLE && TARGET_HARD_FLOAT
 	   && (mode == DFmode || mode == DCmode
@@ -27310,12 +27308,12 @@
 	   && TARGET_HARD_FLOAT && TARGET_FPRS
            && ((TARGET_SINGLE_FLOAT && mode == SFmode) || TARGET_DOUBLE_FLOAT))
     regno = FP_ARG_RETURN;
-  else if (ALTIVEC_VECTOR_MODE (mode)
+  /* VSX is a superset of Altivec and adds V2DImode/V2DFmode.  Since the same
+     return register is used in both cases, and we won't see V2DImode/V2DFmode
+     for pure altivec, combine the two cases.  */
+  else if (ALTIVEC_OR_VSX_VECTOR_MODE (mode)
 	   && TARGET_ALTIVEC && TARGET_ALTIVEC_ABI)
     regno = ALTIVEC_ARG_RETURN;
-  else if (VSX_VECTOR_MODE (mode)
-	   && TARGET_VSX && TARGET_ALTIVEC_ABI)
-    regno = ALTIVEC_ARG_RETURN;
   else if (COMPLEX_MODE_P (mode) && targetm.calls.split_complex_arg)
     return rs6000_complex_function_value (mode);
   else if (TARGET_E500_DOUBLE && TARGET_HARD_FLOAT

=== modified file 'gcc/config/rs6000/rs6000.h'
--- gcc/config/rs6000/rs6000.h	2011-03-07 19:27:09 +0000
+++ gcc/config/rs6000/rs6000.h	2011-05-26 15:02:13 +0000
@@ -1007,10 +1007,9 @@
 
 /* When setting up caller-save slots (MODE == VOIDmode) ensure we allocate
    enough space to account for vectors in FP regs. */
-#define HARD_REGNO_CALLER_SAVE_MODE(REGNO, NREGS, MODE)	\
-  (TARGET_VSX						\
-   && ((MODE) == VOIDmode || VSX_VECTOR_MODE (MODE)	\
-       || ALTIVEC_VECTOR_MODE (MODE))			\
+#define HARD_REGNO_CALLER_SAVE_MODE(REGNO, NREGS, MODE)			\
+  (TARGET_VSX								\
+   && ((MODE) == VOIDmode || ALTIVEC_OR_VSX_VECTOR_MODE (MODE))		\
    && FP_REGNO_P (REGNO)				\
    ? V2DFmode						\
    : choose_hard_reg_mode ((REGNO), (NREGS), false))
@@ -1026,25 +1025,16 @@
 	 ((MODE) == V4SFmode		\
 	  || (MODE) == V2DFmode)	\
 
-#define VSX_SCALAR_MODE(MODE)		\
-	((MODE) == DFmode)
-
-#define VSX_MODE(MODE)			\
-	(VSX_VECTOR_MODE (MODE)		\
-	 || VSX_SCALAR_MODE (MODE))
-
-#define VSX_MOVE_MODE(MODE)		\
-	(VSX_VECTOR_MODE (MODE)		\
-	 || VSX_SCALAR_MODE (MODE)	\
-	 || ALTIVEC_VECTOR_MODE (MODE)	\
-	 || (MODE) == TImode)
-
 #define ALTIVEC_VECTOR_MODE(MODE)	\
 	 ((MODE) == V16QImode		\
 	  || (MODE) == V8HImode		\
 	  || (MODE) == V4SFmode		\
 	  || (MODE) == V4SImode)
 
+#define ALTIVEC_OR_VSX_VECTOR_MODE(MODE)				\
+  (ALTIVEC_VECTOR_MODE (MODE) || VSX_VECTOR_MODE (MODE)			\
+   || (MODE) == V2DImode)
+
 #define SPE_VECTOR_MODE(MODE)		\
 	((MODE) == V4HImode          	\
          || (MODE) == V2SFmode          \
@@ -1080,10 +1070,10 @@
    ? ALTIVEC_VECTOR_MODE (MODE2)		\
    : ALTIVEC_VECTOR_MODE (MODE2)		\
    ? ALTIVEC_VECTOR_MODE (MODE1)		\
-   : VSX_VECTOR_MODE (MODE1)			\
-   ? VSX_VECTOR_MODE (MODE2)			\
-   : VSX_VECTOR_MODE (MODE2)			\
-   ? VSX_VECTOR_MODE (MODE1)			\
+   : ALTIVEC_OR_VSX_VECTOR_MODE (MODE1)		\
+   ? ALTIVEC_OR_VSX_VECTOR_MODE (MODE2)		\
+   : ALTIVEC_OR_VSX_VECTOR_MODE (MODE2)		\
+   ? ALTIVEC_OR_VSX_VECTOR_MODE (MODE1)		\
    : 1)
 
 /* Post-reload, we can't use any new AltiVec registers, as we already

=== modified file 'gcc/config/rx/rx-protos.h'
--- gcc/config/rx/rx-protos.h	2011-03-29 12:27:07 +0000
+++ gcc/config/rx/rx-protos.h	2011-05-26 15:02:13 +0000
@@ -30,7 +30,7 @@
 extern int		rx_initial_elimination_offset (int, int);
 
 #ifdef RTX_CODE
-extern int 		rx_align_for_label (void);
+extern int 		rx_align_for_label (rtx, int);
 extern void             rx_emit_stack_popm (rtx *, bool);
 extern void             rx_emit_stack_pushm (rtx *);
 extern void		rx_expand_epilogue (bool);
@@ -38,7 +38,7 @@
 extern bool		rx_is_legitimate_constant (rtx);
 extern bool		rx_is_restricted_memory_address (rtx, Mmode);
 extern bool		rx_match_ccmode (rtx, Mmode);
-extern void		rx_notice_update_cc (rtx body, rtx insn);
+extern void		rx_notice_update_cc (rtx, rtx);
 extern void		rx_split_cbranch (Mmode, Rcode, rtx, rtx, rtx);
 extern Mmode		rx_select_cc_mode (Rcode, rtx, rtx);
 #endif

=== modified file 'gcc/config/rx/rx.c'
--- gcc/config/rx/rx.c	2011-03-29 12:27:07 +0000
+++ gcc/config/rx/rx.c	2011-05-26 15:02:13 +0000
@@ -2451,8 +2451,7 @@
 
 	default:
 	  /* FIXME: Can this ever happen ?  */
-	  abort ();
-	  return false;
+	  gcc_unreachable ();
 	}
       break;
       
@@ -2593,9 +2592,11 @@
 }
 

 static int
-rx_memory_move_cost (enum machine_mode mode, reg_class_t regclass, bool in)
+rx_memory_move_cost (enum machine_mode mode ATTRIBUTE_UNUSED,
+		     reg_class_t regclass ATTRIBUTE_UNUSED,
+		     bool in)
 {
-  return 2 + memory_move_secondary_cost (mode, regclass, in);
+  return (in ? 2 : 0) + REGISTER_MOVE_COST (mode, regclass, regclass);
 }
 
 /* Convert a CC_MODE to the set of flags that it represents.  */
@@ -2752,8 +2753,15 @@
 
 

 int
-rx_align_for_label (void)
+rx_align_for_label (rtx lab, int uses_threshold)
 {
+  /* This is a simple heuristic to guess when an alignment would not be useful
+     because the delay due to the inserted NOPs would be greater than the delay
+     due to the misaligned branch.  If uses_threshold is zero then the alignment
+     is always useful.  */
+  if (LABEL_P (lab) && LABEL_NUSES (lab) < uses_threshold)
+    return 0;
+
   return optimize_size ? 1 : 3;
 }
 
@@ -2768,7 +2776,7 @@
   op = lab;
   do
     {
-      op = next_nonnote_insn (op);
+      op = next_nonnote_nondebug_insn (op);
     }
   while (op && (LABEL_P (op)
 		|| (INSN_P (op) && GET_CODE (PATTERN (op)) == USE)));

=== modified file 'gcc/config/rx/rx.h'
--- gcc/config/rx/rx.h	2011-03-29 12:27:07 +0000
+++ gcc/config/rx/rx.h	2011-05-26 15:02:13 +0000
@@ -155,7 +155,7 @@
 
 #define LEGITIMATE_CONSTANT_P(X) 	rx_is_legitimate_constant (X)
 
-#define HAVE_PRE_DECCREMENT		1
+#define HAVE_PRE_DECREMENT		1
 #define HAVE_POST_INCREMENT		1
 
 #define MOVE_RATIO(SPEED) 		((SPEED) ? 4 : 2)
@@ -617,7 +617,13 @@
 
 #define SELECT_CC_MODE(OP,X,Y)  rx_select_cc_mode((OP), (X), (Y))
 
-#define LABEL_ALIGN_AFTER_BARRIER(x)		rx_align_for_label ()
+/* Compute the alignment needed for label X in various situations.
+   If the user has specified an alignment then honour that, otherwise
+   use rx_align_for_label.  */
+#define JUMP_ALIGN(x)				(align_jumps ? align_jumps : rx_align_for_label (x, 0))
+#define LABEL_ALIGN(x)				(align_labels ? align_labels : rx_align_for_label (x, 3))
+#define LOOP_ALIGN(x)				(align_loops ? align_loops : rx_align_for_label (x, 2))
+#define LABEL_ALIGN_AFTER_BARRIER(x)		rx_align_for_label (x, 0)
 
 #define ASM_OUTPUT_MAX_SKIP_ALIGN(STREAM, LOG, MAX_SKIP)	\
   do						\

=== modified file 'gcc/config/rx/rx.md'
--- gcc/config/rx/rx.md	2011-03-29 12:27:07 +0000
+++ gcc/config/rx/rx.md	2011-05-26 15:02:13 +0000
@@ -904,6 +904,39 @@
    (set_attr "length"   "3,4,5,6,7,6")]
 )
 
+;; Peepholes to match:
+;;   (set (reg A) (reg B))
+;;   (set (CC) (compare:CC (reg A/reg B) (const_int 0)))
+;; and replace them with the addsi3_flags pattern, using an add
+;; of zero to copy the register and set the condition code bits.
+(define_peephole2
+  [(set (match_operand:SI 0 "register_operand")
+        (match_operand:SI 1 "register_operand"))
+   (set (reg:CC CC_REG)
+        (compare:CC (match_dup 0)
+                    (const_int 0)))]
+  ""
+  [(parallel [(set (match_dup 0)
+		   (plus:SI (match_dup 1) (const_int 0)))
+	      (set (reg:CC_ZSC CC_REG)
+		   (compare:CC_ZSC (plus:SI (match_dup 1) (const_int 0))
+				   (const_int 0)))])]
+)
+
+(define_peephole2
+  [(set (match_operand:SI 0 "register_operand")
+        (match_operand:SI 1 "register_operand"))
+   (set (reg:CC CC_REG)
+        (compare:CC (match_dup 1)
+                    (const_int 0)))]
+  ""
+  [(parallel [(set (match_dup 0)
+		   (plus:SI (match_dup 1) (const_int 0)))
+	      (set (reg:CC_ZSC CC_REG)
+		   (compare:CC_ZSC (plus:SI (match_dup 1) (const_int 0))
+				   (const_int 0)))])]
+)
+
 (define_expand "adddi3"
   [(set (match_operand:DI          0 "register_operand")
 	(plus:DI (match_operand:DI 1 "register_operand")
@@ -1668,6 +1701,35 @@
 		    (extend_types:SI (match_dup 1))))]
 )
 
+;; Convert:
+;;   (set (reg1) (sign_extend (mem))
+;;   (set (reg2) (zero_extend (reg1))
+;; into
+;;   (set (reg2) (zero_extend (mem)))
+(define_peephole2
+  [(set (match_operand:SI                              0 "register_operand")
+	(sign_extend:SI (match_operand:small_int_modes 1 "memory_operand")))
+   (set (match_operand:SI                              2 "register_operand")
+	(zero_extend:SI (match_operand:small_int_modes 3 "register_operand")))]
+  "REGNO (operands[0]) == REGNO (operands[3])
+   && (REGNO (operands[0]) == REGNO (operands[2])
+       || peep2_regno_dead_p (2, REGNO (operands[0])))"
+  [(set (match_dup 2)
+	(zero_extend:SI (match_dup 1)))]
+)
+
+;; Remove the redundant sign extension from:
+;;   (set (reg) (extend (mem)))
+;;   (set (reg) (extend (reg)))
+(define_peephole2
+  [(set (match_operand:SI                               0 "register_operand")
+	(extend_types:SI (match_operand:small_int_modes 1 "memory_operand")))
+   (set (match_dup 0)
+	(extend_types:SI (match_operand:small_int_modes 2 "register_operand")))]
+  "REGNO (operands[0]) == REGNO (operands[2])"
+  [(set (match_dup 0) (extend_types:SI (match_dup 1)))]
+)
+
 (define_insn "*comparesi3_<extend_types:code><small_int_modes:mode>"
   [(set (reg:CC CC_REG)
 	(compare:CC (match_operand:SI                               0 "register_operand" "=r")
@@ -1769,7 +1831,7 @@
 )
 
 (define_insn "*bitset_in_memory"
-  [(set (match_operand:QI                    0 "memory_operand" "+Q")
+  [(set (match_operand:QI                    0 "rx_restricted_mem_operand" "+Q")
 	(ior:QI (ashift:QI (const_int 1)
 			   (match_operand:QI 1 "nonmemory_operand" "ri"))
 		(match_dup 0)))]
@@ -1790,7 +1852,7 @@
 )
 
 (define_insn "*bitinvert_in_memory"
-  [(set (match_operand:QI 0 "memory_operand" "+Q")
+  [(set (match_operand:QI 0 "rx_restricted_mem_operand" "+Q")
 	(xor:QI (ashift:QI (const_int 1)
 			   (match_operand:QI 1 "nonmemory_operand" "ri"))
 		(match_dup 0)))]
@@ -1813,7 +1875,7 @@
 )
 
 (define_insn "*bitclr_in_memory"
-  [(set (match_operand:QI 0 "memory_operand" "+Q")
+  [(set (match_operand:QI 0 "rx_restricted_mem_operand" "+Q")
 	(and:QI (not:QI
 		  (ashift:QI
 		    (const_int 1)

=== modified file 'gcc/config/s390/s390.c'
--- gcc/config/s390/s390.c	2011-03-29 11:57:40 +0000
+++ gcc/config/s390/s390.c	2011-05-26 15:02:13 +0000
@@ -9281,16 +9281,16 @@
 
   if (TARGET_64BIT)
     {
-      output_asm_insn ("basr\t%1,0", op);
-      output_asm_insn ("lmg\t%0,%1,14(%1)", op);
-      output_asm_insn ("br\t%1", op);
+      output_asm_insn ("basr\t%1,0", op);         /* 2 byte */
+      output_asm_insn ("lmg\t%0,%1,14(%1)", op);  /* 6 byte */
+      output_asm_insn ("br\t%1", op);             /* 2 byte */
       ASM_OUTPUT_SKIP (file, (HOST_WIDE_INT)(TRAMPOLINE_SIZE - 10));
     }
   else
     {
-      output_asm_insn ("basr\t%1,0", op);
-      output_asm_insn ("lm\t%0,%1,6(%1)", op);
-      output_asm_insn ("br\t%1", op);
+      output_asm_insn ("basr\t%1,0", op);         /* 2 byte */
+      output_asm_insn ("lm\t%0,%1,6(%1)", op);    /* 4 byte */
+      output_asm_insn ("br\t%1", op);             /* 2 byte */
       ASM_OUTPUT_SKIP (file, (HOST_WIDE_INT)(TRAMPOLINE_SIZE - 8));
     }
 }
@@ -9306,11 +9306,11 @@
   rtx mem;
 
   emit_block_move (m_tramp, assemble_trampoline_template (),
-		   GEN_INT (2*UNITS_PER_WORD), BLOCK_OP_NORMAL);
+		   GEN_INT (2 * UNITS_PER_LONG), BLOCK_OP_NORMAL);
 
-  mem = adjust_address (m_tramp, Pmode, 2*UNITS_PER_WORD);
+  mem = adjust_address (m_tramp, Pmode, 2 * UNITS_PER_LONG);
   emit_move_insn (mem, cxt);
-  mem = adjust_address (m_tramp, Pmode, 3*UNITS_PER_WORD);
+  mem = adjust_address (m_tramp, Pmode, 3 * UNITS_PER_LONG);
   emit_move_insn (mem, fnaddr);
 }
 

=== modified file 'gcc/config/s390/s390.md'
--- gcc/config/s390/s390.md	2011-04-15 12:43:40 +0000
+++ gcc/config/s390/s390.md	2011-05-26 15:02:13 +0000
@@ -2026,6 +2026,7 @@
   [(set (match_dup 0) (match_dup 1))]
 {
   rtx addr = operand_subword (operands[0], 1, 0, <MODE>mode);
+  addr = gen_lowpart (Pmode, addr);
   s390_load_address (addr, XEXP (operands[1], 0));
   operands[1] = replace_equiv_address (operands[1], addr);
 })

=== modified file 'gcc/config/sparc/sp64-elf.h'
--- gcc/config/sparc/sp64-elf.h	2011-01-14 18:41:05 +0000
+++ gcc/config/sparc/sp64-elf.h	2011-05-26 15:02:13 +0000
@@ -53,18 +53,13 @@
 %{mlittle-endian:-EL} \
 "
 
-/* We need something a little simpler for the embedded environment.
-   Profiling doesn't really work yet so we just copy the default.  */
 #undef STARTFILE_SPEC
-#define STARTFILE_SPEC "\
-%{!shared:%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}} \
-crtbegin.o%s \
-"
+#define STARTFILE_SPEC "crt0.o%s crti.o%s crtbegin.o%s"
 
 #undef ENDFILE_SPEC
 #define ENDFILE_SPEC \
   "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-   crtend.o%s"
+   crtend.o%s crtn.o%s"
 
 /* Use the default (for now).  */
 #undef LIB_SPEC

=== modified file 'gcc/config/sparc/sparc.c'
--- gcc/config/sparc/sparc.c	2011-03-11 16:51:29 +0000
+++ gcc/config/sparc/sparc.c	2011-05-26 15:02:13 +0000
@@ -970,6 +970,12 @@
 			  ? 64 : 32),
 			 global_options.x_param_values,
 			 global_options_set.x_param_values);
+
+  /* Disable save slot sharing for call-clobbered registers by default.
+     The IRA sharing algorithm works on single registers only and this
+     pessimizes for double floating-point registers.  */
+  if (!global_options_set.x_flag_ira_share_save_slots)
+    flag_ira_share_save_slots = 0;
 }
 

 /* Miscellaneous utilities.  */
@@ -2845,11 +2851,6 @@
   if (get_attr_length (trial) != 1)
     return 0;
 
-  /* If there are any call-saved registers, we should scan TRIAL if it
-     does not reference them.  For now just make it easy.  */
-  if (num_gfregs)
-    return 0;
-
   /* If the function uses __builtin_eh_return, the eh_return machinery
      occupies the delay slot.  */
   if (crtl->calls_eh_return)
@@ -4421,7 +4422,7 @@
 	    emit_move_insn (gen_rtx_REG (mode, regno), mem);
 
 	  /* Always preserve double-word alignment.  */
-	  offset = (offset + 7) & -8;
+	  offset = (offset + 8) & -8;
 	}
     }
 
@@ -4528,7 +4529,7 @@
      example, the regrename pass has special provisions to not rename to
      non-leaf registers in a leaf function.  */
   sparc_leaf_function_p
-    = optimize > 0 && leaf_function_p () && only_leaf_regs_used ();
+    = optimize > 0 && current_function_is_leaf && only_leaf_regs_used ();
 
   /* Need to use actual_fsize, since we are also allocating
      space for our callee (and our own register save area).  */
@@ -4658,6 +4659,7 @@
 sparc_can_use_return_insn_p (void)
 {
   return sparc_prologue_data_valid_p
+	 && num_gfregs == 0
 	 && (actual_fsize == 0 || !sparc_leaf_function_p);
 }
 
@@ -9680,7 +9682,7 @@
 bool
 sparc_frame_pointer_required (void)
 {
-  return !(leaf_function_p () && only_leaf_regs_used ());
+  return !(current_function_is_leaf && only_leaf_regs_used ());
 }
 
 /* The way this is structured, we can't eliminate SFP in favor of SP

=== modified file 'gcc/config/sparc/sparc.md'
--- gcc/config/sparc/sparc.md	2010-12-19 12:19:12 +0000
+++ gcc/config/sparc/sparc.md	2011-05-26 15:02:13 +0000
@@ -6507,8 +6507,8 @@
 		      (const_int 4)))])
 
 ;; For __builtin_setjmp we need to flush register windows iff the function
-;; calls alloca as well, because otherwise the register window might be
-;; saved after %sp adjustment and thus setjmp would crash
+;; calls alloca as well, because otherwise the current register window might
+;; be saved after the %sp adjustment and thus setjmp would crash.
 (define_expand "builtin_setjmp_setup"
   [(match_operand 0 "register_operand" "r")]
   ""
@@ -6547,19 +6547,26 @@
                (eq_attr "pic" "true")
                  (const_int 4)] (const_int 3)))])
 
-;; Pattern for use after a setjmp to store FP and the return register
-;; into the stack area.
+;; Pattern for use after a setjmp to store registers into the save area.
 
 (define_expand "setjmp"
   [(const_int 0)]
   ""
 {
   rtx mem;
-  
+
+  if (flag_pic)
+    {
+      mem = gen_rtx_MEM (Pmode,
+			 plus_constant (stack_pointer_rtx,
+					SPARC_STACK_BIAS + 7 * UNITS_PER_WORD));
+      emit_insn (gen_rtx_SET (VOIDmode, mem, pic_offset_table_rtx));
+    }
+
   mem = gen_rtx_MEM (Pmode,
 		     plus_constant (stack_pointer_rtx,
 				    SPARC_STACK_BIAS + 14 * UNITS_PER_WORD));
-  emit_insn (gen_rtx_SET (VOIDmode, mem, frame_pointer_rtx));
+  emit_insn (gen_rtx_SET (VOIDmode, mem, hard_frame_pointer_rtx));
 
   mem = gen_rtx_MEM (Pmode,
 		     plus_constant (stack_pointer_rtx,

=== added file 'gcc/config/sparc/t-crtin'
--- gcc/config/sparc/t-crtin	1970-01-01 00:00:00 +0000
+++ gcc/config/sparc/t-crtin	2011-05-26 15:02:13 +0000
@@ -0,0 +1,6 @@
+EXTRA_PARTS += crti.o crtn.o
+
+$(T)crti.o: $(srcdir)/config/sparc/sol2-ci.asm $(GCC_PASSES)
+	$(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/sparc/sol2-ci.asm
+$(T)crtn.o: $(srcdir)/config/sparc/sol2-cn.asm $(GCC_PASSES)
+	$(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/sparc/sol2-cn.asm

=== modified file 'gcc/config/sparc/t-linux64'
--- gcc/config/sparc/t-linux64	2011-01-03 20:52:22 +0000
+++ gcc/config/sparc/t-linux64	2011-05-26 15:02:13 +0000
@@ -31,9 +31,6 @@
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
 
-EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o \
-	crtfastmath.o
-
 CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
 				 -print-multi-os-directory) \
 			= x../lib64; then echo -mcmodel=medany; fi`

=== modified file 'gcc/config/sparc/t-sol2'
--- gcc/config/sparc/t-sol2	2009-04-21 18:03:23 +0000
+++ gcc/config/sparc/t-sol2	2011-05-26 15:02:13 +0000
@@ -26,10 +26,6 @@
 # Assemble startup files.
 $(T)crt1.o: $(srcdir)/config/sparc/sol2-c1.asm $(GCC_PASSES)
 	$(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -o $(T)crt1.o -x assembler-with-cpp $(srcdir)/config/sparc/sol2-c1.asm
-$(T)crti.o: $(srcdir)/config/sparc/sol2-ci.asm $(GCC_PASSES)
-	$(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/sparc/sol2-ci.asm
-$(T)crtn.o: $(srcdir)/config/sparc/sol2-cn.asm $(GCC_PASSES)
-	$(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/sparc/sol2-cn.asm
 $(T)gcrt1.o: $(srcdir)/config/sparc/sol2-c1.asm $(GCC_PASSES)
 	$(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -DGCRT1 -o $(T)gcrt1.o -x assembler-with-cpp $(srcdir)/config/sparc/sol2-c1.asm
 

=== modified file 'gcc/config/sparc/t-sol2-64'
--- gcc/config/sparc/t-sol2-64	2010-03-10 23:25:37 +0000
+++ gcc/config/sparc/t-sol2-64	2011-05-26 15:02:13 +0000
@@ -5,6 +5,3 @@
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
-
-EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o gmon.o crt1.o crti.o crtn.o gcrt1.o \
-	crtfastmath.o

=== modified file 'gcc/cp/ChangeLog'
--- gcc/cp/ChangeLog	2011-05-06 08:34:10 +0000
+++ gcc/cp/ChangeLog	2011-05-26 15:02:13 +0000
@@ -1,3 +1,201 @@
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/44994
+	PR c++/49156
+	* error.c (dump_template_bindings): Set processing_template_decl
+	for a partial instantiation.
+
+	PR c++/45401
+	* decl.c (grokdeclarator): Don't change type when adding rvalue ref
+	to another reference type.
+
[phone]  Fabien Chêne  <[e-mail]>
+	* init.c (diagnose_uninitialized_cst_or_ref_member_1): Use
+	permerror instead of error, adjust the error count.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/44311
+	* decl.c (case_conversion): New.
+	(finish_case_label): Use it.
+
+	PR c++/45698
+	* pt.c (dependent_template_arg_p): See through ARGUMENT_PACK_SELECT.
+
+	PR c++/46145
+	* decl.c (grokdeclarator): Complain about auto typedef.
+
+	PR c++/46245
+	* decl.c (grokdeclarator): Complain later for auto parameter.
+	* pt.c (splice_late_return_type): Handle use in a template
+	type-parameter.
+
+	PR c++/46696
+	* typeck.c (cp_build_modify_expr): Check DECL_DEFAULTED_FN.
+
+	PR c++/47184
+	* parser.c (cp_parser_parameter_declaration): Recognize
+	list-initialization.
+	(cp_parser_direct_declarator): Check for the closing
+	paren before parsing definitely.
+
+	PR c++/48935
+	* parser.c (cp_parser_constructor_declarator_p): Don't check
+	constructor_name_p for enums.
+	(cp_parser_diagnose_invalid_type_name): Correct error message.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/45418
+	* init.c (perform_member_init): Handle list-initialization
+	of array of non-trivial class type.
+
+	PR c++/45080
+	* pt.c (instantiate_class_template_1): Call maybe_add_lambda_conv_op.
+	* semantics.c (lambda_function): Check COMPLETE_OR_OPEN_TYPE_P.
+
+	PR c++/48292
+	* pt.c (tsubst_decl) [PARM_DECL]: Handle partial instantiation of
+	function parameter pack.
+	(tsubst_pack_expansion): Likewise.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR c++/49136
+	* semantics.c (cxx_eval_bit_field_ref): Handle the
+	case when BIT_FIELD_REF doesn't cover only a single field.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/49042
+	* pt.c (get_mostly_instantiated_function_type): Use
+	push_deferring_access_checks rather than set flag_access_control.
+
+	PR c++/48884
+	* pt.c (fn_type_unification): Disable access control during
+	substitution.
+
+	PR c++/49105
+	* typeck.c (build_const_cast_1): Handle rvalue references.
+
+	PR c++/47263
+	* decl.c (use_eh_spec_block): Do use an EH spec block for a
+	lambda op().
+
+	PR c++/47336
+	* error.c (dump_template_bindings): Suppress access control.
+
+	PR c++/47544
+	* pt.c (instantiate_decl): Handle =default.
+
+	PR c++/48617
+	* pt.c (invalid_nontype_parm_type_p): Allow DECLTYPE_TYPE.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/48647
+	* typeck.c (composite_pointer_type_r): Return error_mark_node
+	on error in SFINAE context.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/48945
+	* decl.c (revert_static_member_fn): Ignore const on constexpr fn.
+
+	PR c++/48780
+	* cvt.c (type_promotes_to): Warn about promoting scoped enums.
+
+	PR c++/49066
+	* decl.c (duplicate_decls): Preserve DECL_DELETED_FN.
+
+	DR 1073
+	PR c++/49082
+	* typeck.c (comp_except_specs): noexcept(false) is not compatible
+	with throw(type-list).
+	* typeck2.c (merge_exception_specifiers): noexcept(false)
+	beats any more limited specification.
+
+	PR c++/48948
+	* class.c (finalize_literal_type_property): Only check
+	for constexpr member functions of non-literal class.
+	* decl.c (cp_finish_decl): Don't call validate_constexpr_fundecl.
+	* semantics.c (literal_type_p): Call complete_type.
+
+	* semantics.c (validate_constexpr_fundecl): Check DECL_TEMPLATE_INFO
+	rather than DECL_TEMPLATE_INSTANTIATION.
+	(cxx_eval_call_expression): Likewise.
+
+	* semantics.c (register_constexpr_fundef): Add to hash table here.
+	(validate_constexpr_fundecl): Not here.
+
+	PR c++/48745
+	* pt.c (value_dependent_expr_p): Handle CONSTRUCTOR.
+
+	PR c++/48736
+	* pt.c (tsubst_copy_and_build): Handle substitution of a pack
+	expansion producing another expansion.
+
+	PR c++/48873
+	* tree.c (stabilize_expr): Don't make gratuitous copies of classes.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR c++/49043
+	* decl.c (check_omp_return): Stop searching on sk_function_parms.
+
+	PR c++/48869
+	* method.c (get_dtor, get_copy_ctor): Add COMPLAIN argument,
+	pass it down to locate_fn_flags.
+	* cp-tree.h (get_dtor, get_copy_ctor): Adjust prototypes.
+	* semantics.c (cxx_omp_create_clause_info): Adjust callers.
+	* cp-gimplify.c: Include splay-tree.h.
+	(splay_tree_compare_decl_uid, omp_var_to_track,
+	omp_cxx_notice_variable): New functions.
+	(struct cp_genericize_omp_taskreg): New type.
+	(struct cp_genericize_data): Add omp_ctx field.
+	(cp_genericize_r): Attempt to determine implicitly determined
+	firstprivate class type variables.
+	(cp_genericize): Clear omp_ctx.
+	* Make-lang.in (cp/cp-gimplify.o): Depend on $(SPLAY_TREE_H).
+
[phone]  Jason Merrill  <[e-mail]>
+
+	* pt.c (build_non_dependent_expr): Don't check null_ptr_cst_p.
+
[phone]  Fabien Chêne  <[e-mail]>
+
+	PR c++/48859
+	* init.c (diagnose_uninitialized_cst_or_ref_member_1): stop the
+	recursion if there is user defined constructor.
+
[phone]  Dodji Seketeli  <[e-mail]>
+
+	PR c++/48574
+	* class.c (fixed_type_or_null): Use type_dependent_p_push to test
+	if the instance has a dependent initializer.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/48909
+	* semantics.c (cxx_eval_conditional_expression): Check
+	integer_zerop instead.
+	(potential_constant_expression_1): Likewise.
+
+	PR c++/48911
+	* semantics.c (cxx_eval_array_reference): Handle implicit
+	initializers.
+
+	PR c++/48446
+	* decl.c (stabilize_save_expr_r, stabilize_vla_size): New.
+	(grokdeclarator): Use stabilize_vla_size.
+	* init.c (get_temp_regvar): No longer static.
+	* cp-tree.h: Declare it.
+
+	PR c++/48089
+	* semantics.c (potential_constant_expression_1): Don't allow *this
+	in a constructor.
+	(register_constexpr_fundef): Use potential_rvalue_constant_expression.
+
 2011-05-06  Dodji Seketeli  <[e-mail]>
 
     	PR c++/48838

=== modified file 'gcc/cp/Make-lang.in'
--- gcc/cp/Make-lang.in	2011-02-13 19:57:30 +0000
+++ gcc/cp/Make-lang.in	2011-05-26 15:02:13 +0000
@@ -1,6 +1,6 @@
 # Top level -*- makefile -*- fragment for GNU C++.
 #   Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2007, 2008, 2009, 2010
+#   2005, 2007, 2008, 2009, 2010, 2011
 #   Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -318,7 +318,7 @@
   gt-cp-parser.h output.h $(TARGET_H) $(PLUGIN_H) intl.h \
   c-family/c-objc.h
 cp/cp-gimplify.o: cp/cp-gimplify.c $(CXX_TREE_H) $(C_COMMON_H) \
-	$(TM_H) coretypes.h pointer-set.h tree-iterator.h
+	$(TM_H) coretypes.h pointer-set.h tree-iterator.h $(SPLAY_TREE_H)
 
 cp/name-lookup.o: cp/name-lookup.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 	$(TM_H) $(CXX_TREE_H) $(TIMEVAR_H) gt-cp-name-lookup.h \

=== modified file 'gcc/cp/class.c'
--- gcc/cp/class.c	2011-05-05 02:51:01 +0000
+++ gcc/cp/class.c	2011-05-26 15:02:13 +0000
@@ -4559,10 +4559,17 @@
 	   && !TYPE_HAS_CONSTEXPR_CTOR (t))
     CLASSTYPE_LITERAL_P (t) = false;
 
-  for (fn = TYPE_METHODS (t); fn; fn = DECL_CHAIN (fn))
-    if (DECL_DECLARED_CONSTEXPR_P (fn)
-	&& TREE_CODE (fn) != TEMPLATE_DECL)
-      validate_constexpr_fundecl (fn);
+  if (!CLASSTYPE_LITERAL_P (t))
+    for (fn = TYPE_METHODS (t); fn; fn = DECL_CHAIN (fn))
+      if (DECL_DECLARED_CONSTEXPR_P (fn)
+	  && TREE_CODE (fn) != TEMPLATE_DECL
+	  && DECL_NONSTATIC_MEMBER_FUNCTION_P (fn)
+	  && !DECL_CONSTRUCTOR_P (fn))
+	{
+	  DECL_DECLARED_CONSTEXPR_P (fn) = false;
+	  if (!DECL_TEMPLATE_INFO (fn))
+	    error ("enclosing class of %q+#D is not a literal type", fn);
+	}
 }
 
 /* Check the validity of the bases and members declared in T.  Add any
@@ -5937,7 +5944,7 @@
 	     itself.  */
 	  if (TREE_CODE (instance) == VAR_DECL
 	      && DECL_INITIAL (instance)
-	      && !type_dependent_expression_p (DECL_INITIAL (instance))
+	      && !type_dependent_expression_p_push (DECL_INITIAL (instance))
 	      && !htab_find (ht, instance))
 	    {
 	      tree type;

=== modified file 'gcc/cp/cp-gimplify.c'
--- gcc/cp/cp-gimplify.c	2010-12-15 17:50:34 +0000
+++ gcc/cp/cp-gimplify.c	2011-05-26 15:02:13 +0000
@@ -1,6 +1,6 @@
 /* C++-specific tree lowering bits; see also c-gimplify.c and tree-gimple.c.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Contributed by Jason Merrill <[e-mail]>
 
@@ -32,6 +32,7 @@
 #include "hashtab.h"
 #include "pointer-set.h"
 #include "flags.h"
+#include "splay-tree.h"
 
 /* Local declarations.  */
 
@@ -731,10 +732,105 @@
   return ((const struct cxx_int_tree_map *)item)->uid;
 }
 
+/* A stable comparison routine for use with splay trees and DECLs.  */
+
+static int
+splay_tree_compare_decl_uid (splay_tree_key xa, splay_tree_key xb)
+{
+  tree a = (tree) xa;
+  tree b = (tree) xb;
+
+  return DECL_UID (a) - DECL_UID (b);
+}
+
+/* OpenMP context during genericization.  */
+
+struct cp_genericize_omp_taskreg
+{
+  bool is_parallel;
+  bool default_shared;
+  struct cp_genericize_omp_taskreg *outer;
+  splay_tree variables;
+};
+
+/* Return true if genericization should try to determine if
+   DECL is firstprivate or shared within task regions.  */
+
+static bool
+omp_var_to_track (tree decl)
+{
+  tree type = TREE_TYPE (decl);
+  if (is_invisiref_parm (decl))
+    type = TREE_TYPE (type);
+  while (TREE_CODE (type) == ARRAY_TYPE)
+    type = TREE_TYPE (type);
+  if (type == error_mark_node || !CLASS_TYPE_P (type))
+    return false;
+  if (TREE_CODE (decl) == VAR_DECL && DECL_THREAD_LOCAL_P (decl))
+    return false;
+  if (cxx_omp_predetermined_sharing (decl) != OMP_CLAUSE_DEFAULT_UNSPECIFIED)
+    return false;
+  return true;
+}
+
+/* Note DECL use in OpenMP region OMP_CTX during genericization.  */
+
+static void
+omp_cxx_notice_variable (struct cp_genericize_omp_taskreg *omp_ctx, tree decl)
+{
+  splay_tree_node n = splay_tree_lookup (omp_ctx->variables,
+					 (splay_tree_key) decl);
+  if (n == NULL)
+    {
+      int flags = OMP_CLAUSE_DEFAULT_SHARED;
+      if (omp_ctx->outer)
+	omp_cxx_notice_variable (omp_ctx->outer, decl);
+      if (!omp_ctx->default_shared)
+	{
+	  struct cp_genericize_omp_taskreg *octx;
+
+	  for (octx = omp_ctx->outer; octx; octx = octx->outer)
+	    {
+	      n = splay_tree_lookup (octx->variables, (splay_tree_key) decl);
+	      if (n && n->value != OMP_CLAUSE_DEFAULT_SHARED)
+		{
+		  flags = OMP_CLAUSE_DEFAULT_FIRSTPRIVATE;
+		  break;
+		}
+	      if (octx->is_parallel)
+		break;
+	    }
+	  if (octx == NULL
+	      && (TREE_CODE (decl) == PARM_DECL
+		  || (!(TREE_STATIC (decl) || DECL_EXTERNAL (decl))
+		      && DECL_CONTEXT (decl) == current_function_decl)))
+	    flags = OMP_CLAUSE_DEFAULT_FIRSTPRIVATE;
+	  if (flags == OMP_CLAUSE_DEFAULT_FIRSTPRIVATE)
+	    {
+	      /* DECL is implicitly determined firstprivate in
+		 the current task construct.  Ensure copy ctor and
+		 dtor are instantiated, because during gimplification
+		 it will be already too late.  */
+	      tree type = TREE_TYPE (decl);
+	      if (is_invisiref_parm (decl))
+		type = TREE_TYPE (type);
+	      while (TREE_CODE (type) == ARRAY_TYPE)
+		type = TREE_TYPE (type);
+	      get_copy_ctor (type, tf_none);
+	      get_dtor (type, tf_none);
+	    }
+	}
+      splay_tree_insert (omp_ctx->variables, (splay_tree_key) decl, flags);
+    }
+}
+
+/* Genericization context.  */
+
 struct cp_genericize_data
 {
   struct pointer_set_t *p_set;
   VEC (tree, heap) *bind_expr_stack;
+  struct cp_genericize_omp_taskreg *omp_ctx;
 };
 
 /* Perform any pre-gimplification lowering of C++ front end trees to
@@ -747,6 +843,14 @@
   struct cp_genericize_data *wtd = (struct cp_genericize_data *) data;
   struct pointer_set_t *p_set = wtd->p_set;
 
+  /* If in an OpenMP context, note var uses.  */
+  if (__builtin_expect (wtd->omp_ctx != NULL, 0)
+      && (TREE_CODE (stmt) == VAR_DECL
+	  || TREE_CODE (stmt) == PARM_DECL
+	  || TREE_CODE (stmt) == RESULT_DECL)
+      && omp_var_to_track (stmt))
+    omp_cxx_notice_variable (wtd->omp_ctx, stmt);
+
   if (is_invisiref_parm (stmt)
       /* Don't dereference parms in a thunk, pass the references through. */
       && !(DECL_THUNK_P (current_function_decl)
@@ -786,6 +890,10 @@
   if (TREE_CODE (stmt) == ADDR_EXPR
       && is_invisiref_parm (TREE_OPERAND (stmt, 0)))
     {
+      /* If in an OpenMP context, note var uses.  */
+      if (__builtin_expect (wtd->omp_ctx != NULL, 0)
+	  && omp_var_to_track (TREE_OPERAND (stmt, 0)))
+	omp_cxx_notice_variable (wtd->omp_ctx, TREE_OPERAND (stmt, 0));
       *stmt_p = convert (TREE_TYPE (stmt), TREE_OPERAND (stmt, 0));
       *walk_subtrees = 0;
     }
@@ -808,6 +916,22 @@
 	  }
 	break;
       case OMP_CLAUSE_PRIVATE:
+	/* Don't dereference an invisiref in OpenMP clauses.  */
+	if (is_invisiref_parm (OMP_CLAUSE_DECL (stmt)))
+	  *walk_subtrees = 0;
+	else if (wtd->omp_ctx != NULL)
+	  {
+	    /* Private clause doesn't cause any references to the
+	       var in outer contexts, avoid calling
+	       omp_cxx_notice_variable for it.  */
+	    struct cp_genericize_omp_taskreg *old = wtd->omp_ctx;
+	    wtd->omp_ctx = NULL;
+	    cp_walk_tree (&OMP_CLAUSE_DECL (stmt), cp_genericize_r,
+			  data, NULL);
+	    wtd->omp_ctx = old;
+	    *walk_subtrees = 0;
+	  }
+	break;
       case OMP_CLAUSE_SHARED:
       case OMP_CLAUSE_FIRSTPRIVATE:
       case OMP_CLAUSE_COPYIN:
@@ -876,6 +1000,25 @@
 
   else if (TREE_CODE (stmt) == BIND_EXPR)
     {
+      if (__builtin_expect (wtd->omp_ctx != NULL, 0))
+	{
+	  tree decl;
+	  for (decl = BIND_EXPR_VARS (stmt); decl; decl = DECL_CHAIN (decl))
+	    if (TREE_CODE (decl) == VAR_DECL
+		&& !DECL_EXTERNAL (decl)
+		&& omp_var_to_track (decl))
+	      {
+		splay_tree_node n
+		  = splay_tree_lookup (wtd->omp_ctx->variables,
+				       (splay_tree_key) decl);
+		if (n == NULL)
+		  splay_tree_insert (wtd->omp_ctx->variables,
+				     (splay_tree_key) decl,
+				     TREE_STATIC (decl)
+				     ? OMP_CLAUSE_DEFAULT_SHARED
+				     : OMP_CLAUSE_DEFAULT_PRIVATE);
+	      }
+	}
       VEC_safe_push (tree, heap, wtd->bind_expr_stack, stmt);
       cp_walk_tree (&BIND_EXPR_BODY (stmt),
 		    cp_genericize_r, data, NULL);
@@ -922,6 +1065,50 @@
       *stmt_p = build1 (NOP_EXPR, void_type_node, integer_zero_node);
       *walk_subtrees = 0;
     }
+  else if (TREE_CODE (stmt) == OMP_PARALLEL || TREE_CODE (stmt) == OMP_TASK)
+    {
+      struct cp_genericize_omp_taskreg omp_ctx;
+      tree c, decl;
+      splay_tree_node n;
+
+      *walk_subtrees = 0;
+      cp_walk_tree (&OMP_CLAUSES (stmt), cp_genericize_r, data, NULL);
+      omp_ctx.is_parallel = TREE_CODE (stmt) == OMP_PARALLEL;
+      omp_ctx.default_shared = omp_ctx.is_parallel;
+      omp_ctx.outer = wtd->omp_ctx;
+      omp_ctx.variables = splay_tree_new (splay_tree_compare_decl_uid, 0, 0);
+      wtd->omp_ctx = &omp_ctx;
+      for (c = OMP_CLAUSES (stmt); c; c = OMP_CLAUSE_CHAIN (c))
+	switch (OMP_CLAUSE_CODE (c))
+	  {
+	  case OMP_CLAUSE_SHARED:
+	  case OMP_CLAUSE_PRIVATE:
+	  case OMP_CLAUSE_FIRSTPRIVATE:
+	  case OMP_CLAUSE_LASTPRIVATE:
+	    decl = OMP_CLAUSE_DECL (c);
+	    if (decl == error_mark_node || !omp_var_to_track (decl))
+	      break;
+	    n = splay_tree_lookup (omp_ctx.variables, (splay_tree_key) decl);
+	    if (n != NULL)
+	      break;
+	    splay_tree_insert (omp_ctx.variables, (splay_tree_key) decl,
+			       OMP_CLAUSE_CODE (c) == OMP_CLAUSE_SHARED
+			       ? OMP_CLAUSE_DEFAULT_SHARED
+			       : OMP_CLAUSE_DEFAULT_PRIVATE);
+	    if (OMP_CLAUSE_CODE (c) != OMP_CLAUSE_PRIVATE
+		&& omp_ctx.outer)
+	      omp_cxx_notice_variable (omp_ctx.outer, decl);
+	    break;
+	  case OMP_CLAUSE_DEFAULT:
+	    if (OMP_CLAUSE_DEFAULT_KIND (c) == OMP_CLAUSE_DEFAULT_SHARED)
+	      omp_ctx.default_shared = true;
+	  default:
+	    break;
+	  }
+      cp_walk_tree (&OMP_BODY (stmt), cp_genericize_r, data, NULL);
+      wtd->omp_ctx = omp_ctx.outer;
+      splay_tree_delete (omp_ctx.variables);
+    }
 
   pointer_set_insert (p_set, *stmt_p);
 
@@ -985,6 +1172,7 @@
      walk_tree's hash functionality.  */
   wtd.p_set = pointer_set_create ();
   wtd.bind_expr_stack = NULL;
+  wtd.omp_ctx = NULL;
   cp_walk_tree (&DECL_SAVED_TREE (fndecl), cp_genericize_r, &wtd, NULL);
   pointer_set_destroy (wtd.p_set);
   VEC_free (tree, heap, wtd.bind_expr_stack);

=== modified file 'gcc/cp/cp-tree.h'
--- gcc/cp/cp-tree.h	2011-05-06 08:34:10 +0000
+++ gcc/cp/cp-tree.h	2011-05-26 15:02:13 +0000
@@ -4958,6 +4958,7 @@
 extern tree build_new				(VEC(tree,gc) **, tree, tree,
 						 VEC(tree,gc) **, int,
                                                  tsubst_flags_t);
+extern tree get_temp_regvar			(tree, tree);
 extern tree build_vec_init			(tree, tree, tree, bool, int,
                                                  tsubst_flags_t);
 extern tree build_delete			(tree, tree,
@@ -5002,10 +5003,10 @@
 extern tree skip_artificial_parms_for		(const_tree, tree);
 extern int num_artificial_parms_for		(const_tree);
 extern tree make_alias_for			(tree, tree);
-extern tree get_copy_ctor			(tree);
+extern tree get_copy_ctor			(tree, tsubst_flags_t);
 extern tree get_copy_assign			(tree);
 extern tree get_default_ctor			(tree);
-extern tree get_dtor				(tree);
+extern tree get_dtor				(tree, tsubst_flags_t);
 extern tree locate_ctor				(tree);
 
 /* In optimize.c */

=== modified file 'gcc/cp/cvt.c'
--- gcc/cp/cvt.c	2011-04-12 00:20:32 +0000
+++ gcc/cp/cvt.c	2011-05-26 15:02:13 +0000
@@ -1621,6 +1621,9 @@
       int precision = MAX (TYPE_PRECISION (type),
 			   TYPE_PRECISION (integer_type_node));
       tree totype = c_common_type_for_size (precision, 0);
+      if (SCOPED_ENUM_P (type))
+	warning (OPT_Wabi, "scoped enum %qT will not promote to an integral "
+		 "type in a future version of GCC", type);
       if (TREE_CODE (type) == ENUMERAL_TYPE)
 	type = ENUM_UNDERLYING_TYPE (type);
       if (TYPE_UNSIGNED (type)

=== modified file 'gcc/cp/decl.c'
--- gcc/cp/decl.c	2011-04-26 23:42:50 +0000
+++ gcc/cp/decl.c	2011-05-26 15:02:13 +0000
@@ -1686,6 +1686,7 @@
 	  error ("deleted definition of %qD", newdecl);
 	  error ("after previous declaration %q+D", olddecl);
 	}
+      DECL_DELETED_FN (newdecl) |= DECL_DELETED_FN (olddecl);
     }
 
   /* Deal with C++: must preserve virtual function table size.  */
@@ -2807,6 +2808,8 @@
 	error ("invalid exit from OpenMP structured block");
 	return false;
       }
+    else if (b->kind == sk_function_parms)
+      break;
   return true;
 }
 
@@ -2917,6 +2920,28 @@
   free (cs);
 }
 
+/* Convert a case constant VALUE in a switch to the type TYPE of the switch
+   condition.  Note that if TYPE and VALUE are already integral we don't
+   really do the conversion because the language-independent
+   warning/optimization code will work better that way.  */
+
+static tree
+case_conversion (tree type, tree value)
+{
+  if (value == NULL_TREE)
+    return value;
+
+  if (cxx_dialect >= cxx0x
+      && (SCOPED_ENUM_P (type)
+	  || !INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P (TREE_TYPE (value))))
+    {
+      if (INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P (type))
+	type = type_promotes_to (type);
+      value = perform_implicit_conversion (type, value, tf_warning_or_error);
+    }
+  return cxx_constant_value (value);
+}
+
 /* Note that we've seen a definition of a case label, and complain if this
    is a bad place for one.  */
 
@@ -2925,6 +2950,7 @@
 {
   tree cond, r;
   struct cp_binding_level *p;
+  tree type;
 
   if (processing_template_decl)
     {
@@ -2944,13 +2970,12 @@
   if (!check_switch_goto (switch_stack->level))
     return error_mark_node;
 
-  if (low_value)
-    low_value = cxx_constant_value (low_value);
-  if (high_value)
-    high_value = cxx_constant_value (high_value);
-
-  r = c_add_case_label (loc, switch_stack->cases, cond,
-			SWITCH_STMT_TYPE (switch_stack->switch_stmt),
+  type = SWITCH_STMT_TYPE (switch_stack->switch_stmt);
+
+  low_value = case_conversion (type, low_value);
+  high_value = case_conversion (type, high_value);
+
+  r = c_add_case_label (loc, switch_stack->cases, cond, type,
 			low_value, high_value);
 
   /* After labels, make any new cleanups in the function go into their
@@ -5795,13 +5820,7 @@
 	}
     }
 
-  if (TREE_CODE (decl) == FUNCTION_DECL
-      /* For members, defer until finalize_literal_type_property.  */
-      && (!DECL_CLASS_SCOPE_P (decl)
-	  || !TYPE_BEING_DEFINED (DECL_CONTEXT (decl))))
-    validate_constexpr_fundecl (decl);
-
-  else if (!ensure_literal_type_for_constexpr_object (decl))
+  if (!ensure_literal_type_for_constexpr_object (decl))
     DECL_DECLARED_CONSTEXPR_P (decl) = 0;
 
   if (init && TREE_CODE (decl) == FUNCTION_DECL)
@@ -7499,6 +7518,39 @@
   return 0;
 }
 
+/* *expr_p is part of the TYPE_SIZE of a variably-sized array.  If any
+   SAVE_EXPRs in *expr_p wrap expressions with side-effects, break those
+   expressions out into temporary variables so that walk_tree doesn't
+   step into them (c++/15764).  */
+
+static tree
+stabilize_save_expr_r (tree *expr_p, int *walk_subtrees, void *data)
+{
+  struct pointer_set_t *pset = (struct pointer_set_t *)data;
+  tree expr = *expr_p;
+  if (TREE_CODE (expr) == SAVE_EXPR)
+    {
+      tree op = TREE_OPERAND (expr, 0);
+      cp_walk_tree (&op, stabilize_save_expr_r, data, pset);
+      if (TREE_SIDE_EFFECTS (op))
+	TREE_OPERAND (expr, 0) = get_temp_regvar (TREE_TYPE (op), op);
+      *walk_subtrees = 0;
+    }
+  else if (!EXPR_P (expr) || !TREE_SIDE_EFFECTS (expr))
+    *walk_subtrees = 0;
+  return NULL;
+}
+
+/* Entry point for the above.  */
+
+static void
+stabilize_vla_size (tree size)
+{
+  struct pointer_set_t *pset = pointer_set_create ();
+  /* Break out any function calls into temporary variables.  */
+  cp_walk_tree (&size, stabilize_save_expr_r, pset, pset);
+}
+
 /* Given the SIZE (i.e., number of elements) in an array, compute an
    appropriate index type for the array.  If non-NULL, NAME is the
    name of the thing being declared.  */
@@ -8529,12 +8581,6 @@
 	       || thread_p)
 	error ("storage class specifiers invalid in parameter declarations");
 
-      if (type_uses_auto (type))
-	{
-	  error ("parameter declared %<auto%>");
-	  type = error_mark_node;
-	}
-
       /* Function parameters cannot be constexpr.  If we saw one, moan
          and pretend it wasn't there.  */
       if (constexpr_p)
@@ -8951,7 +8997,12 @@
 	      && (decl_context == NORMAL || decl_context == FIELD)
 	      && at_function_scope_p ()
 	      && variably_modified_type_p (type, NULL_TREE))
-	    finish_expr_stmt (TYPE_SIZE (type));
+	    {
+	      /* First break out any side-effects.  */
+	      stabilize_vla_size (TYPE_SIZE (type));
+	      /* And then force evaluation of the SAVE_EXPR.  */
+	      finish_expr_stmt (TYPE_SIZE (type));
+	    }
 
 	  if (declarator->kind == cdk_reference)
 	    {
@@ -8966,13 +9017,18 @@
 		 to create the type "rvalue reference to cv TD' creates the
 		 type TD."
               */
-	      if (!VOID_TYPE_P (type))
+	      if (VOID_TYPE_P (type))
+		/* We already gave an error.  */;
+	      else if (TREE_CODE (type) == REFERENCE_TYPE)
+		{
+		  if (declarator->u.reference.rvalue_ref)
+		    /* Leave type alone.  */;
+		  else
+		    type = cp_build_reference_type (TREE_TYPE (type), false);
+		}
+	      else
 		type = cp_build_reference_type
-		       ((TREE_CODE (type) == REFERENCE_TYPE
-			 ? TREE_TYPE (type) : type),
-			(declarator->u.reference.rvalue_ref
-			 && (TREE_CODE(type) != REFERENCE_TYPE
-			     || TYPE_REF_IS_RVALUE (type))));
+		  (type, declarator->u.reference.rvalue_ref);
 
 	      /* In C++0x, we need this check for direct reference to
 		 reference declarations, which are forbidden by
@@ -9026,6 +9082,14 @@
 	}
     }
 
+  /* We need to stabilize side-effects in VLA sizes for regular array
+     declarations too, not just pointers to arrays.  */
+  if (type != error_mark_node && !TYPE_NAME (type)
+      && (decl_context == NORMAL || decl_context == FIELD)
+      && at_function_scope_p ()
+      && variably_modified_type_p (type, NULL_TREE))
+    stabilize_vla_size (TYPE_SIZE (type));
+
   /* A `constexpr' specifier used in an object declaration declares
      the object as `const'.  */
   if (constexpr_p && innermost_code != cdk_function)
@@ -9267,6 +9331,12 @@
           memfn_quals = TYPE_UNQUALIFIED;
         }
 
+      if (type_uses_auto (type))
+	{
+	  error ("typedef declared %<auto%>");
+	  type = error_mark_node;
+	}
+
       if (decl_context == FIELD)
 	decl = build_lang_decl (TYPE_DECL, unqualified_id, type);
       else
@@ -9507,6 +9577,12 @@
       if (ctype || in_namespace)
 	error ("cannot use %<::%> in parameter declaration");
 
+      if (type_uses_auto (type))
+	{
+	  error ("parameter declared %<auto%>");
+	  type = error_mark_node;
+	}
+
       /* A parameter declared as an array of T is really a pointer to T.
 	 One declared as a function is really a pointer to a function.
 	 One declared as a member is really a pointer to member.  */
@@ -12527,7 +12603,7 @@
 	     not creating the EH_SPEC_BLOCK we save a little memory,
 	     and we avoid spurious warnings about unreachable
 	     code.  */
-	  && !DECL_ARTIFICIAL (fn));
+	  && !DECL_DEFAULTED_FN (fn));
 }
 
 /* Store the parameter declarations into the current function declaration.
@@ -13351,10 +13427,15 @@
 revert_static_member_fn (tree decl)
 {
   tree stype = static_fn_type (decl);
+  cp_cv_quals quals = type_memfn_quals (stype);
 
-  if (type_memfn_quals (stype) != TYPE_UNQUALIFIED)
+  if (quals != TYPE_UNQUALIFIED)
     {
-      error ("static member function %q#D declared with type qualifiers", decl);
+      if (quals == TYPE_QUAL_CONST && DECL_DECLARED_CONSTEXPR_P (decl))
+	/* The const was implicit, don't complain.  */;
+      else
+	error ("static member function %q#D declared with type qualifiers",
+	       decl);
       stype = apply_memfn_quals (stype, TYPE_UNQUALIFIED);
     }
   TREE_TYPE (decl) = stype;

=== modified file 'gcc/cp/error.c'
--- gcc/cp/error.c	2011-02-20 23:18:11 +0000
+++ gcc/cp/error.c	2011-05-26 15:02:13 +0000
@@ -306,13 +306,20 @@
 
   FOR_EACH_VEC_ELT (tree, typenames, i, t)
     {
+      bool dependent = uses_template_parms (args);
       if (need_comma)
 	pp_separate_with_comma (cxx_pp);
       dump_type (t, TFF_PLAIN_IDENTIFIER);
       pp_cxx_whitespace (cxx_pp);
       pp_equal (cxx_pp);
       pp_cxx_whitespace (cxx_pp);
+      push_deferring_access_checks (dk_no_check);
+      if (dependent)
+	++processing_template_decl;
       t = tsubst (t, args, tf_none, NULL_TREE);
+      if (dependent)
+	--processing_template_decl;
+      pop_deferring_access_checks ();
       /* Strip typedefs.  We can't just use TFF_CHASE_TYPEDEF because
 	 pp_simple_type_specifier doesn't know about it.  */
       t = strip_typedefs (t);

=== modified file 'gcc/cp/init.c'
--- gcc/cp/init.c	2011-04-18 23:29:30 +0000
+++ gcc/cp/init.c	2011-05-26 15:02:13 +0000
@@ -45,7 +45,6 @@
 static tree sort_mem_initializers (tree, tree);
 static tree initializing_context (tree);
 static void expand_cleanup_for_base (tree, tree);
-static tree get_temp_regvar (tree, tree);
 static tree dfs_initialize_vtbl_ptrs (tree, void *);
 static tree build_dtor_call (tree, special_function_kind, int);
 static tree build_field_list (tree, tree, int *);
@@ -529,6 +528,8 @@
 	    {
 	      gcc_assert (TREE_CHAIN (init) == NULL_TREE);
 	      init = TREE_VALUE (init);
+	      if (BRACE_ENCLOSED_INITIALIZER_P (init))
+		init = digest_init (type, init);
 	    }
 	  if (init == NULL_TREE
 	      || same_type_ignoring_top_level_qualifiers_p (type,
@@ -1892,6 +1893,7 @@
 {
   tree field;
   int error_count = 0;
+  bool permissive = global_dc->permissive;
 
   if (type_has_user_provided_constructor (type))
     return 0;
@@ -1905,34 +1907,50 @@
 
       field_type = strip_array_types (TREE_TYPE (field));
 
+      if (type_has_user_provided_constructor (field_type))
+	continue;
+
       if (TREE_CODE (field_type) == REFERENCE_TYPE)
 	{
-	  ++ error_count;
 	  if (complain)
 	    {
+	      if (!permissive || !using_new)
+		++ error_count;
+
 	      if (using_new)
-		error ("uninitialized reference member in %q#T "
-		       "using %<new%> without new-initializer", origin);
+		  permerror (input_location,
+			     "uninitialized reference member in %q#T "
+			     "using %<new%> without new-initializer", origin);
 	      else
-		error ("uninitialized reference member in %q#T", origin);
+		  error ("uninitialized reference member in %q#T", origin);
+
 	      inform (DECL_SOURCE_LOCATION (field),
 		      "%qD should be initialized", field);
 	    }
+	  else
+	    ++ error_count;
 	}
 
       if (CP_TYPE_CONST_P (field_type))
 	{
-	  ++ error_count;
 	  if (complain)
 	    {
+	      if (!permissive)
+		++ error_count;
+
 	      if (using_new)
-		error ("uninitialized const member in %q#T "
-		       "using %<new%> without new-initializer", origin);
-	      else
-		error ("uninitialized const member in %q#T", origin);
+		permerror (input_location,
+			   "uninitialized const member in %q#T "
+			   "using %<new%> without new-initializer", origin);
+	      else 
+		permerror (input_location,
+			   "uninitialized const member in %q#T", origin);
+
 	      inform (DECL_SOURCE_LOCATION (field),
 		      "%qD should be initialized", field);
 	    }
+	  else
+	    ++ error_count;
 	}
 
       if (CLASS_TYPE_P (field_type))
@@ -2871,7 +2889,7 @@
    things when it comes time to do final cleanups (which take place
    "outside" the binding contour of the function).  */
 
-static tree
+tree
 get_temp_regvar (tree type, tree init)
 {
   tree decl;

=== modified file 'gcc/cp/method.c'
--- gcc/cp/method.c	2011-03-31 20:33:07 +0000
+++ gcc/cp/method.c	2011-05-26 15:02:13 +0000
@@ -1,7 +1,7 @@
 /* Handle the hair of processing (but not expanding) inline functions.
    Also manage function and variable name overloading.
    Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Contributed by Michael Tiemann ([e-mail])
 
@@ -838,10 +838,10 @@
 /* Locate the dtor of TYPE.  */
 
 tree
-get_dtor (tree type)
+get_dtor (tree type, tsubst_flags_t complain)
 {
   tree fn = locate_fn_flags (type, complete_dtor_identifier, NULL_TREE,
-			     LOOKUP_NORMAL, tf_warning_or_error);
+			     LOOKUP_NORMAL, complain);
   if (fn == error_mark_node)
     return NULL_TREE;
   return fn;
@@ -878,13 +878,13 @@
 /* Locate the copy ctor of TYPE.  */
 
 tree
-get_copy_ctor (tree type)
+get_copy_ctor (tree type, tsubst_flags_t complain)
 {
   int quals = (TYPE_HAS_CONST_COPY_CTOR (type)
 	       ? TYPE_QUAL_CONST : TYPE_UNQUALIFIED);
   tree argtype = build_stub_type (type, quals, false);
   tree fn = locate_fn_flags (type, complete_ctor_identifier, argtype,
-			     LOOKUP_NORMAL, tf_warning_or_error);
+			     LOOKUP_NORMAL, complain);
   if (fn == error_mark_node)
     return NULL_TREE;
   return fn;

=== modified file 'gcc/cp/parser.c'
--- gcc/cp/parser.c	2011-04-27 15:57:06 +0000
+++ gcc/cp/parser.c	2011-05-26 15:02:13 +0000
@@ -2788,7 +2788,7 @@
 		  "%qT is a dependent scope",
 		  parser->scope, id, parser->scope);
       else if (TYPE_P (parser->scope))
-	error_at (location, "%qE in class %qT does not name a type",
+	error_at (location, "%qE in %q#T does not name a type",
 		  id, parser->scope);
       else
 	gcc_unreachable ();
@@ -15031,6 +15031,9 @@
 	      parser->num_template_parameter_lists
 		= saved_num_template_parameter_lists;
 
+	      /* Consume the `)'.  */
+	      cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN);
+
 	      /* If all went well, parse the cv-qualifier-seq and the
 		 exception-specification.  */
 	      if (member_p || cp_parser_parse_definitely (parser))
@@ -15044,8 +15047,6 @@
 		  if (ctor_dtor_or_conv_p)
 		    *ctor_dtor_or_conv_p = *ctor_dtor_or_conv_p < 0;
 		  first = false;
-		  /* Consume the `)'.  */
-		  cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN);
 
 		  /* Parse the cv-qualifier-seq.  */
 		  cv_quals = cp_parser_cv_qualifier_seq_opt (parser);
@@ -16132,6 +16133,7 @@
 	     of some object of type "char" to "int".  */
 	  && !parser->in_type_id_in_expr_p
 	  && cp_parser_uncommitted_to_tentative_parse_p (parser)
+	  && cp_lexer_next_token_is_not (parser->lexer, CPP_OPEN_BRACE)
 	  && cp_lexer_next_token_is_not (parser->lexer, CPP_OPEN_PAREN))
 	cp_parser_commit_to_tentative_parse (parser);
       /* Parse the declarator.  */
@@ -19642,7 +19644,7 @@
   /* If we have a class scope, this is easy; DR 147 says that S::S always
      names the constructor, and no other qualified name could.  */
   if (constructor_p && nested_name_specifier
-      && TYPE_P (nested_name_specifier))
+      && CLASS_TYPE_P (nested_name_specifier))
     {
       tree id = cp_parser_unqualified_id (parser,
 					  /*template_keyword_p=*/false,

=== modified file 'gcc/cp/pt.c'
--- gcc/cp/pt.c	2011-04-25 21:53:57 +0000
+++ gcc/cp/pt.c	2011-05-26 15:02:13 +0000
@@ -8557,6 +8557,9 @@
 	}
     }
 
+  if (CLASSTYPE_LAMBDA_EXPR (type))
+    maybe_add_lambda_conv_op (type);
+
   /* Set the file and line number information to whatever is given for
      the class itself.  This puts error messages involving generated
      implicit functions at a predictable point, and the same point
@@ -8690,7 +8693,12 @@
 		 have the wrong value for a recursive call.  Just make a
 		 dummy decl, since it's only used for its type.  */
 	      arg_pack = tsubst_decl (parm_pack, args, complain);
-	      arg_pack = make_fnparm_pack (arg_pack);
+	      if (arg_pack && FUNCTION_PARAMETER_PACK_P (arg_pack))
+		/* Partial instantiation of the parm_pack, we can't build
+		   up an argument pack yet.  */
+		arg_pack = NULL_TREE;
+	      else
+		arg_pack = make_fnparm_pack (arg_pack);
 	    }
 	}
       else
@@ -9780,14 +9788,14 @@
             if (DECL_TEMPLATE_PARM_P (t))
               SET_DECL_TEMPLATE_PARM_P (r);
 
-	    /* An argument of a function parameter pack is not a parameter
-	       pack.  */
-	    FUNCTION_PARAMETER_PACK_P (r) = false;
-
             if (expanded_types)
               /* We're on the Ith parameter of the function parameter
                  pack.  */
               {
+		/* An argument of a function parameter pack is not a parameter
+		   pack.  */
+		FUNCTION_PARAMETER_PACK_P (r) = false;
+
                 /* Get the Ith type.  */
                 type = TREE_VEC_ELT (expanded_types, i);
 
@@ -13221,7 +13229,8 @@
                 ce->value = tsubst_pack_expansion (ce->value, args, complain,
                                                   in_decl);
 
-		if (ce->value == error_mark_node)
+		if (ce->value == error_mark_node
+		    || PACK_EXPANSION_P (ce->value))
 		  ;
 		else if (TREE_VEC_LENGTH (ce->value) == 1)
                   /* Just move the argument into place.  */
@@ -13742,7 +13751,9 @@
         incomplete = NUM_TMPL_ARGS (explicit_targs) != NUM_TMPL_ARGS (targs);
 
       processing_template_decl += incomplete;
+      push_deferring_access_checks (dk_no_check);
       fntype = tsubst (fntype, converted_args, tf_none, NULL_TREE);
+      pop_deferring_access_checks ();
       processing_template_decl -= incomplete;
 
       if (fntype == error_mark_node)
@@ -13829,7 +13840,10 @@
        substitution results in an invalid type, as described above,
        type deduction fails.  */
     {
-      tree substed = tsubst (TREE_TYPE (fn), targs, tf_none, NULL_TREE);
+      tree substed;
+      push_deferring_access_checks (dk_no_check);
+      substed = tsubst (TREE_TYPE (fn), targs, tf_none, NULL_TREE);
+      pop_deferring_access_checks ();
       if (substed == error_mark_node)
 	return 1;
 
@@ -17209,7 +17223,8 @@
     args = gen_args;
 
   if (TREE_CODE (d) == FUNCTION_DECL)
-    pattern_defined = (DECL_SAVED_TREE (code_pattern) != NULL_TREE);
+    pattern_defined = (DECL_SAVED_TREE (code_pattern) != NULL_TREE
+		       || DECL_DEFAULTED_OUTSIDE_CLASS_P (code_pattern));
   else
     pattern_defined = ! DECL_IN_AGGR_P (code_pattern);
 
@@ -17404,6 +17419,8 @@
       cp_finish_decl (d, init, const_init, NULL_TREE, 0);
       pop_nested_class ();
     }
+  else if (TREE_CODE (d) == FUNCTION_DECL && DECL_DEFAULTED_FN (code_pattern))
+    synthesize_method (d);
   else if (TREE_CODE (d) == FUNCTION_DECL)
     {
       htab_t saved_local_specializations;
@@ -17791,7 +17808,7 @@
     ;
   else
     {
-      int i, save_access_control;
+      int i;
       tree partial_args;
 
       /* Replace the innermost level of the TARGS with NULL_TREEs to
@@ -17806,8 +17823,7 @@
 
       /* Disable access control as this function is used only during
 	 name-mangling.  */
-      save_access_control = flag_access_control;
-      flag_access_control = 0;
+      push_deferring_access_checks (dk_no_check);
 
       ++processing_template_decl;
       /* Now, do the (partial) substitution to figure out the
@@ -17822,7 +17838,7 @@
       TREE_VEC_LENGTH (partial_args)--;
       tparms = tsubst_template_parms (tparms, partial_args, tf_error);
 
-      flag_access_control = save_access_control;
+      pop_deferring_access_checks ();
     }
 
   return fn_type;
@@ -17866,6 +17882,8 @@
     return 0;
   else if (TREE_CODE (type) == TYPENAME_TYPE)
     return 0;
+  else if (TREE_CODE (type) == DECLTYPE_TYPE)
+    return 0;
 
   if (complain & tf_error)
     error ("%q#T is not a valid type for a template constant parameter", type);
@@ -18230,6 +18248,16 @@
 	 type-dependent.  */
       return type_dependent_expression_p (expression);
 
+    case CONSTRUCTOR:
+      {
+	unsigned ix;
+	tree val;
+	FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (expression), ix, val)
+	  if (value_dependent_expression_p (val))
+	    return true;
+	return false;
+      }
+
     default:
       /* A constant expression is value-dependent if any subexpression is
 	 value-dependent.  */
@@ -18484,6 +18512,9 @@
   if (arg == error_mark_node)
     return true;
 
+  if (TREE_CODE (arg) == ARGUMENT_PACK_SELECT)
+    arg = ARGUMENT_PACK_SELECT_ARG (arg);
+
   if (TREE_CODE (arg) == TEMPLATE_DECL
       || TREE_CODE (arg) == TEMPLATE_TEMPLATE_PARM)
     return dependent_template_p (arg);
@@ -18810,10 +18841,6 @@
 {
   tree inner_expr;
 
-  /* Preserve null pointer constants so that the type of things like
-     "p == 0" where "p" is a pointer can be determined.  */
-  if (null_ptr_cst_p (expr))
-    return expr;
   /* Preserve OVERLOADs; the functions must be available to resolve
      types.  */
   inner_expr = expr;
@@ -19037,7 +19064,12 @@
     return type;
   argvec = make_tree_vec (1);
   TREE_VEC_ELT (argvec, 0) = late_return_type;
-  if (processing_template_decl)
+  if (processing_template_parmlist)
+    /* For a late-specified return type in a template type-parameter, we
+       need to add a dummy argument level for its parmlist.  */
+    argvec = add_to_template_args
+      (make_tree_vec (processing_template_parmlist), argvec);
+  if (current_template_parms)
     argvec = add_to_template_args (current_template_args (), argvec);
   return tsubst (type, argvec, tf_warning_or_error, NULL_TREE);
 }

=== modified file 'gcc/cp/semantics.c'
--- gcc/cp/semantics.c	2011-05-06 08:34:10 +0000
+++ gcc/cp/semantics.c	2011-05-26 15:02:13 +0000
@@ -3667,7 +3667,7 @@
       if (need_default_ctor)
 	t = get_default_ctor (type);
       else
-	t = get_copy_ctor (type);
+	t = get_copy_ctor (type, tf_warning_or_error);
 
       if (t && !trivial_fn_p (t))
 	TREE_VEC_ELT (info, 0) = t;
@@ -3675,7 +3675,7 @@
 
   if ((need_default_ctor || need_copy_ctor)
       && TYPE_HAS_NONTRIVIAL_DESTRUCTOR (type))
-    TREE_VEC_ELT (info, 1) = get_dtor (type);
+    TREE_VEC_ELT (info, 1) = get_dtor (type, tf_warning_or_error);
 
   if (need_copy_assignment)
     {
@@ -5327,7 +5327,7 @@
   if (SCALAR_TYPE_P (t))
     return true;
   if (CLASS_TYPE_P (t))
-    return CLASSTYPE_LITERAL_P (t);
+    return CLASSTYPE_LITERAL_P (complete_type (t));
   if (TREE_CODE (t) == ARRAY_TYPE)
     return literal_type_p (strip_array_types (t));
   return false;
@@ -5439,6 +5439,7 @@
 		   rettype, fun);
 	}
 
+      /* Check this again here for cxx_eval_call_expression.  */
       if (DECL_NONSTATIC_MEMBER_FUNCTION_P (fun)
 	  && !CLASSTYPE_LITERAL_P (DECL_CONTEXT (fun)))
 	{
@@ -5459,36 +5460,18 @@
 tree
 validate_constexpr_fundecl (tree fun)
 {
-  constexpr_fundef entry;
-  constexpr_fundef **slot;
-
   if (processing_template_decl || !DECL_DECLARED_CONSTEXPR_P (fun))
     return NULL;
   else if (DECL_CLONED_FUNCTION_P (fun))
     /* We already checked the original function.  */
     return fun;
 
-  if (!is_valid_constexpr_fn (fun, !DECL_TEMPLATE_INSTANTIATION (fun)))
+  if (!is_valid_constexpr_fn (fun, !DECL_TEMPLATE_INFO (fun)))
     {
       DECL_DECLARED_CONSTEXPR_P (fun) = false;
       return NULL;
     }
 
-  /* Create the constexpr function table if necessary.  */
-  if (constexpr_fundef_table == NULL)
-    constexpr_fundef_table = htab_create_ggc (101,
-                                              constexpr_fundef_hash,
-                                              constexpr_fundef_equal,
-                                              ggc_free);
-  entry.decl = fun;
-  entry.body = NULL;
-  slot = (constexpr_fundef **)
-    htab_find_slot (constexpr_fundef_table, &entry, INSERT);
-  if (*slot == NULL)
-    {
-      *slot = ggc_alloc_constexpr_fundef ();
-      **slot = entry;
-    }
   return fun;
 }
 
@@ -5679,8 +5662,8 @@
 tree
 register_constexpr_fundef (tree fun, tree body)
 {
-  constexpr_fundef *fundef = retrieve_constexpr_fundef (fun);
-  gcc_assert (fundef != NULL && fundef->body == NULL);
+  constexpr_fundef entry;
+  constexpr_fundef **slot;
 
   if (DECL_CONSTRUCTOR_P (fun))
     body = build_constexpr_constructor_member_initializers
@@ -5704,14 +5687,29 @@
       body = unshare_expr (TREE_OPERAND (body, 0));
     }
 
-  if (!potential_constant_expression (body))
+  if (!potential_rvalue_constant_expression (body))
     {
       DECL_DECLARED_CONSTEXPR_P (fun) = false;
-      if (!DECL_TEMPLATE_INSTANTIATION (fun))
-	require_potential_constant_expression (body);
+      if (!DECL_TEMPLATE_INFO (fun))
+	require_potential_rvalue_constant_expression (body);
       return NULL;
     }
-  fundef->body = body;
+
+  /* Create the constexpr function table if necessary.  */
+  if (constexpr_fundef_table == NULL)
+    constexpr_fundef_table = htab_create_ggc (101,
+                                              constexpr_fundef_hash,
+                                              constexpr_fundef_equal,
+                                              ggc_free);
+  entry.decl = fun;
+  entry.body = body;
+  slot = (constexpr_fundef **)
+    htab_find_slot (constexpr_fundef_table, &entry, INSERT);
+
+  gcc_assert (*slot == NULL);
+  *slot = ggc_alloc_constexpr_fundef ();
+  **slot = entry;
+
   return fun;
 }
 
@@ -6036,7 +6034,7 @@
       if (!allow_non_constant)
 	{
 	  error_at (loc, "%qD is not a constexpr function", fun);
-	  if (DECL_TEMPLATE_INSTANTIATION (fun)
+	  if (DECL_TEMPLATE_INFO (fun)
 	      && DECL_DECLARED_CONSTEXPR_P (DECL_TEMPLATE_RESULT
 					    (DECL_TI_TEMPLATE (fun))))
 	    is_valid_constexpr_fn (fun, true);
@@ -6255,13 +6253,12 @@
 					   allow_non_constant, addr,
 					   non_constant_p);
   VERIFY_CONSTANT (val);
-  if (val == boolean_true_node)
-    return cxx_eval_constant_expression (call, TREE_OPERAND (t, 1),
+  /* Don't VERIFY_CONSTANT the other operands.  */
+  if (integer_zerop (val))
+    return cxx_eval_constant_expression (call, TREE_OPERAND (t, 2),
 					 allow_non_constant, addr,
 					 non_constant_p);
-  gcc_assert (val == boolean_false_node);
-  /* Don't VERIFY_CONSTANT here.  */
-  return cxx_eval_constant_expression (call, TREE_OPERAND (t, 2),
+  return cxx_eval_constant_expression (call, TREE_OPERAND (t, 1),
 				       allow_non_constant, addr,
 				       non_constant_p);
 }
@@ -6280,6 +6277,7 @@
 					   non_constant_p);
   tree index, oldidx;
   HOST_WIDE_INT i;
+  tree elem_type;
   unsigned len, elem_nchars = 1;
   if (*non_constant_p)
     return t;
@@ -6292,16 +6290,27 @@
     return t;
   else if (addr)
     return build4 (ARRAY_REF, TREE_TYPE (t), ary, index, NULL, NULL);
+  elem_type = TREE_TYPE (TREE_TYPE (ary));
   if (TREE_CODE (ary) == CONSTRUCTOR)
     len = CONSTRUCTOR_NELTS (ary);
   else
     {
-      elem_nchars = (TYPE_PRECISION (TREE_TYPE (TREE_TYPE (ary)))
+      elem_nchars = (TYPE_PRECISION (elem_type)
 		     / TYPE_PRECISION (char_type_node));
       len = (unsigned) TREE_STRING_LENGTH (ary) / elem_nchars;
     }
   if (compare_tree_int (index, len) >= 0)
     {
+      if (tree_int_cst_lt (index, array_type_nelts_top (TREE_TYPE (ary))))
+	{
+	  /* If it's within the array bounds but doesn't have an explicit
+	     initializer, it's value-initialized.  */
+	  tree val = build_value_init (elem_type, tf_warning_or_error);
+	  return cxx_eval_constant_expression (call, val,
+					       allow_non_constant, addr,
+					       non_constant_p);
+	}
+
       if (!allow_non_constant)
 	error ("array subscript out of bound");
       *non_constant_p = true;
@@ -6382,6 +6391,9 @@
 			bool *non_constant_p)
 {
   tree orig_whole = TREE_OPERAND (t, 0);
+  tree retval, fldval, utype, mask;
+  bool fld_seen = false;
+  HOST_WIDE_INT istart, isize;
   tree whole = cxx_eval_constant_expression (call, orig_whole,
 					     allow_non_constant, addr,
 					     non_constant_p);
@@ -6402,12 +6414,47 @@
     return t;
 
   start = TREE_OPERAND (t, 2);
+  istart = tree_low_cst (start, 0);
+  isize = tree_low_cst (TREE_OPERAND (t, 1), 0);
+  utype = TREE_TYPE (t);
+  if (!TYPE_UNSIGNED (utype))
+    utype = build_nonstandard_integer_type (TYPE_PRECISION (utype), 1);
+  retval = build_int_cst (utype, 0);
   FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (whole), i, field, value)
     {
-      if (bit_position (field) == start)
+      tree bitpos = bit_position (field);
+      if (bitpos == start && DECL_SIZE (field) == TREE_OPERAND (t, 1))
 	return value;
+      if (TREE_CODE (TREE_TYPE (field)) == INTEGER_TYPE
+	  && TREE_CODE (value) == INTEGER_CST
+	  && host_integerp (bitpos, 0)
+	  && host_integerp (DECL_SIZE (field), 0))
+	{
+	  HOST_WIDE_INT bit = tree_low_cst (bitpos, 0);
+	  HOST_WIDE_INT sz = tree_low_cst (DECL_SIZE (field), 0);
+	  HOST_WIDE_INT shift;
+	  if (bit >= istart && bit + sz <= istart + isize)
+	    {
+	      fldval = fold_convert (utype, value);
+	      mask = build_int_cst_type (utype, -1);
+	      mask = fold_build2 (LSHIFT_EXPR, utype, mask,
+				  size_int (TYPE_PRECISION (utype) - sz));
+	      mask = fold_build2 (RSHIFT_EXPR, utype, mask,
+				  size_int (TYPE_PRECISION (utype) - sz));
+	      fldval = fold_build2 (BIT_AND_EXPR, utype, fldval, mask);
+	      shift = bit - istart;
+	      if (BYTES_BIG_ENDIAN)
+		shift = TYPE_PRECISION (utype) - shift - sz;
+	      fldval = fold_build2 (LSHIFT_EXPR, utype, fldval,
+				    size_int (shift));
+	      retval = fold_build2 (BIT_IOR_EXPR, utype, retval, fldval);
+	      fld_seen = true;
+	    }
+	}
     }
-  gcc_unreachable();
+  if (fld_seen)
+    return fold_convert (TREE_TYPE (t), retval);
+  gcc_unreachable ();
   return error_mark_node;
 }
 
@@ -7560,7 +7607,16 @@
         tree x = TREE_OPERAND (t, 0);
         STRIP_NOPS (x);
         if (is_this_parameter (x))
-	  return true;
+	  {
+	    if (DECL_CONSTRUCTOR_P (DECL_CONTEXT (x)) && want_rval)
+	      {
+		if (flags & tf_error)
+		  sorry ("use of the value of the object being constructed "
+			 "in a constant expression");
+		return false;
+	      }
+	    return true;
+	  }
 	return potential_constant_expression_1 (x, rval, flags);
       }
 
@@ -7807,12 +7863,12 @@
       tmp = TREE_OPERAND (t, 0);
       if (!potential_constant_expression_1 (tmp, rval, flags))
 	return false;
-      else if (tmp == boolean_true_node)
+      else if (integer_zerop (tmp))
+	return potential_constant_expression_1 (TREE_OPERAND (t, 2),
+						want_rval, flags);
+      else if (TREE_CODE (tmp) == INTEGER_CST)
 	return potential_constant_expression_1 (TREE_OPERAND (t, 1),
 						want_rval, flags);
-      else if (tmp == boolean_false_node)
-	return potential_constant_expression_1 (TREE_OPERAND (t, 2),
-						want_rval, flags);
       for (i = 1; i < 3; ++i)
 	if (potential_constant_expression_1 (TREE_OPERAND (t, i),
 					     want_rval, tf_none))
@@ -8030,7 +8086,8 @@
     type = lambda;
   gcc_assert (LAMBDA_TYPE_P (type));
   /* Don't let debug_tree cause instantiation.  */
-  if (CLASSTYPE_TEMPLATE_INSTANTIATION (type) && !COMPLETE_TYPE_P (type))
+  if (CLASSTYPE_TEMPLATE_INSTANTIATION (type)
+      && !COMPLETE_OR_OPEN_TYPE_P (type))
     return NULL_TREE;
   lambda = lookup_member (type, ansi_opname (CALL_EXPR),
 			  /*protect=*/0, /*want_type=*/false);

=== modified file 'gcc/cp/tree.c'
--- gcc/cp/tree.c	2011-05-06 08:34:10 +0000
+++ gcc/cp/tree.c	2011-05-26 15:02:13 +0000
@@ -3124,7 +3124,8 @@
 
   if (!TREE_SIDE_EFFECTS (exp))
     init_expr = NULL_TREE;
-  else if (!TYPE_NEEDS_CONSTRUCTING (TREE_TYPE (exp))
+  else if ((!TYPE_NEEDS_CONSTRUCTING (TREE_TYPE (exp))
+	    && !TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (exp)))
 	   || !lvalue_or_rvalue_with_address_p (exp))
     {
       init_expr = get_target_expr (exp);

=== modified file 'gcc/cp/typeck.c'
--- gcc/cp/typeck.c	2011-04-20 06:31:51 +0000
+++ gcc/cp/typeck.c	2011-05-26 15:02:13 +0000
@@ -516,7 +516,8 @@
     {
       if (complain & tf_error)
 	composite_pointer_error (DK_PERMERROR, t1, t2, operation);
-
+      else
+	return error_mark_node;
       result_type = void_type_node;
     }
   result_type = cp_build_qualified_type (result_type,
@@ -527,9 +528,13 @@
   if (TYPE_PTR_TO_MEMBER_P (t1))
     {
       if (!same_type_p (TYPE_PTRMEM_CLASS_TYPE (t1),
-			TYPE_PTRMEM_CLASS_TYPE (t2))
-	  && (complain & tf_error))
-	composite_pointer_error (DK_PERMERROR, t1, t2, operation);
+			TYPE_PTRMEM_CLASS_TYPE (t2)))
+	{
+	  if (complain & tf_error)
+	    composite_pointer_error (DK_PERMERROR, t1, t2, operation);
+	  else
+	    return error_mark_node;
+	}
       result_type = build_ptrmem_type (TYPE_PTRMEM_CLASS_TYPE (t1),
 				       result_type);
     }
@@ -986,14 +991,14 @@
   /* First handle noexcept.  */
   if (exact < ce_exact)
     {
-      /* noexcept(false) is compatible with any throwing dynamic-exc-spec
+      /* noexcept(false) is compatible with no exception-specification,
 	 and stricter than any spec.  */
       if (t1 == noexcept_false_spec)
-	return !nothrow_spec_p (t2) || exact == ce_derived;
-      /* Even a derived noexcept(false) is compatible with a throwing
-	 dynamic spec.  */
+	return t2 == NULL_TREE || exact == ce_derived;
+      /* Even a derived noexcept(false) is compatible with no
+	 exception-specification.  */
       if (t2 == noexcept_false_spec)
-	return !nothrow_spec_p (t1);
+	return t1 == NULL_TREE;
 
       /* Otherwise, if we aren't looking for an exact match, noexcept is
 	 equivalent to throw().  */
@@ -6215,14 +6220,29 @@
 
   /* [expr.const.cast]
 
-     An lvalue of type T1 can be explicitly converted to an lvalue of
-     type T2 using the cast const_cast<T2&> (where T1 and T2 are object
-     types) if a pointer to T1 can be explicitly converted to the type
-     pointer to T2 using a const_cast.  */
+     For two object types T1 and T2, if a pointer to T1 can be explicitly
+     converted to the type "pointer to T2" using a const_cast, then the
+     following conversions can also be made:
+
+     -- an lvalue of type T1 can be explicitly converted to an lvalue of
+     type T2 using the cast const_cast<T2&>;
+
+     -- a glvalue of type T1 can be explicitly converted to an xvalue of
+     type T2 using the cast const_cast<T2&&>; and
+
+     -- if T1 is a class type, a prvalue of type T1 can be explicitly
+     converted to an xvalue of type T2 using the cast const_cast<T2&&>.  */
+
   if (TREE_CODE (dst_type) == REFERENCE_TYPE)
     {
       reference_type = dst_type;
-      if (! real_lvalue_p (expr))
+      if (!TYPE_REF_IS_RVALUE (dst_type)
+	  ? real_lvalue_p (expr)
+	  : (CLASS_TYPE_P (TREE_TYPE (dst_type))
+	     ? lvalue_p (expr)
+	     : lvalue_or_rvalue_with_address_p (expr)))
+	/* OK.  */;
+      else
 	{
 	  if (complain)
 	    error ("invalid const_cast of an rvalue of type %qT to type %qT",
@@ -6707,7 +6727,7 @@
 
       /* Allow array assignment in compiler-generated code.  */
       else if (!current_function_decl
-	       || !DECL_ARTIFICIAL (current_function_decl))
+	       || !DECL_DEFAULTED_FN (current_function_decl))
 	{
           /* This routine is used for both initialization and assignment.
              Make sure the diagnostic message differentiates the context.  */

=== modified file 'gcc/cp/typeck2.c'
--- gcc/cp/typeck2.c	2011-01-14 13:08:11 +0000
+++ gcc/cp/typeck2.c	2011-05-26 15:02:13 +0000
@@ -1672,10 +1672,13 @@
 tree
 merge_exception_specifiers (tree list, tree add)
 {
-  if (!list || !add)
-    return NULL_TREE;
+  /* No exception-specifier or noexcept(false) are less strict than
+     anything else.  Prefer the newer variant (LIST).  */
+  if (!list || list == noexcept_false_spec)
+    return list;
+  else if (!add || add == noexcept_false_spec)
+    return add;
   /* For merging noexcept(true) and throw(), take the more recent one (LIST).
-     A throw(type-list) spec takes precedence over a noexcept(false) spec.
      Any other noexcept-spec should only be merged with an equivalent one.
      So the !TREE_VALUE code below is correct for all cases.  */
   else if (!TREE_VALUE (add))

=== modified file 'gcc/cppspec.c'
--- gcc/cppspec.c	2010-08-22 12:19:01 +0000
+++ gcc/cppspec.c	2011-05-26 15:02:13 +0000
@@ -1,5 +1,5 @@
 /* Specific flags and argument handling of the C preprocessor.
-   Copyright (C) 1999, 2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2007, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -158,7 +158,7 @@
 
   new_decoded_options = XNEWVEC (struct cl_decoded_option, new_argc);
 
-  new_decoded_options[0] = new_decoded_options[0];
+  new_decoded_options[0] = decoded_options[0];
   j = 1;
 
   if (need_E)

=== modified file 'gcc/dbxout.c'
--- gcc/dbxout.c	2010-12-22 03:49:00 +0000
+++ gcc/dbxout.c	2011-05-26 15:02:13 +0000
@@ -1,7 +1,7 @@
 /* Output dbx-format symbol table information from GNU compiler.
    Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+   2011 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -91,6 +91,7 @@
 #include "langhooks.h"
 #include "obstack.h"
 #include "expr.h"
+#include "cgraph.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"
@@ -2393,6 +2394,20 @@
 	 disable debug info for these variables.  */
       if (!targetm.have_tls && DECL_THREAD_LOCAL_P (expr))
 	return NULL;
+      if (TREE_STATIC (expr)
+	  && !TREE_ASM_WRITTEN (expr)
+	  && !DECL_HAS_VALUE_EXPR_P (expr)
+	  && !TREE_PUBLIC (expr)
+	  && DECL_RTL_SET_P (expr)
+	  && MEM_P (DECL_RTL (expr)))
+	{
+	  /* If this is a var that might not be actually output,
+	     return NULL, otherwise stabs might reference an undefined
+	     symbol.  */
+	  struct varpool_node *node = varpool_get_node (expr);
+	  if (!node || !node->needed)
+	    return NULL;
+	}
       /* FALLTHRU */
 
     case PARM_DECL:

=== modified file 'gcc/expmed.c'
--- gcc/expmed.c	2011-04-06 20:39:20 +0000
+++ gcc/expmed.c	2011-05-26 15:02:13 +0000
@@ -1875,8 +1875,6 @@
   /* To extract a signed bit-field, first shift its msb to the msb of the word,
      then arithmetic-shift its lsb to the lsb of the word.  */
   op0 = force_reg (mode, op0);
-  if (mode != tmode)
-    target = 0;
 
   /* Find the narrowest integer mode that contains the field.  */
 
@@ -1888,6 +1886,9 @@
 	break;
       }
 
+  if (mode != tmode)
+    target = 0;
+
   if (GET_MODE_BITSIZE (mode) != (bitsize + bitpos))
     {
       tree amount

=== modified file 'gcc/expr.c'
--- gcc/expr.c	2011-05-06 11:28:27 +0000
+++ gcc/expr.c	2011-05-26 15:02:13 +0000
@@ -8134,7 +8134,10 @@
       op1 = gen_label_rtx ();
       jumpifnot_1 (code, treeop0, treeop1, op1, -1);
 
-      emit_move_insn (target, const1_rtx);
+      if (TYPE_PRECISION (type) == 1 && !TYPE_UNSIGNED (type))
+	emit_move_insn (target, constm1_rtx);
+      else
+	emit_move_insn (target, const1_rtx);
 
       emit_label (op1);
       return target;
@@ -10091,7 +10094,8 @@
 
   if ((code == NE || code == EQ)
       && TREE_CODE (arg0) == BIT_AND_EXPR && integer_zerop (arg1)
-      && integer_pow2p (TREE_OPERAND (arg0, 1)))
+      && integer_pow2p (TREE_OPERAND (arg0, 1))
+      && (TYPE_PRECISION (ops->type) != 1 || TYPE_UNSIGNED (ops->type)))
     {
       tree type = lang_hooks.types.type_for_mode (mode, unsignedp);
       return expand_expr (fold_single_bit_test (loc,
@@ -10111,7 +10115,9 @@
 
   /* Try a cstore if possible.  */
   return emit_store_flag_force (target, code, op0, op1,
-			        operand_mode, unsignedp, 1);
+				operand_mode, unsignedp,
+				(TYPE_PRECISION (ops->type) == 1
+				 && !TYPE_UNSIGNED (ops->type)) ? -1 : 1);
 }
 

 

=== modified file 'gcc/fold-const.c'
--- gcc/fold-const.c	2011-04-23 10:18:54 +0000
+++ gcc/fold-const.c	2011-05-26 15:02:13 +0000
@@ -5953,8 +5953,10 @@
     return value ? integer_one_node : integer_zero_node;
   else if (type == boolean_type_node)
     return value ? boolean_true_node : boolean_false_node;
+  else if (type)
+    return build_int_cst_type (type, value);
   else
-    return build_int_cst (type, value);
+    return build_int_cst (NULL_TREE, value);
 }
 
 

=== modified file 'gcc/fortran/ChangeLog'
--- gcc/fortran/ChangeLog	2011-05-04 19:18:01 +0000
+++ gcc/fortran/ChangeLog	2011-05-26 15:02:13 +0000
@@ -1,3 +1,9 @@
[phone]  Tobias Burnus  <[e-mail]>
+
+	PR fortran/48889
+	* expr.c (gfc_is_constant_expr): Use e->value.function.esym
+	instead of e->symtree->n.sym, if available.
+
 2011-05-04  Steven G. Kargl  <[e-mail]>
 
 	PR fortran/48720

=== modified file 'gcc/fortran/expr.c'
--- gcc/fortran/expr.c	2011-04-28 18:47:28 +0000
+++ gcc/fortran/expr.c	2011-05-26 15:02:13 +0000
@@ -894,6 +894,9 @@
     case EXPR_FUNCTION:
     case EXPR_PPC:
     case EXPR_COMPCALL:
+      gcc_assert (e->symtree || e->value.function.esym
+		  || e->value.function.isym);
+
       /* Call to intrinsic with at least one argument.  */
       if (e->value.function.isym && e->value.function.actual)
 	{
@@ -902,13 +905,14 @@
 	      return 0;
 	}
 
-      /* Make sure we have a symbol.  */
-      gcc_assert (e->symtree);
-
-      sym = e->symtree->n.sym;
-    
       /* Specification functions are constant.  */
       /* F95, 7.1.6.2; F2003, 7.1.7  */
+      sym = NULL;
+      if (e->symtree)
+	sym = e->symtree->n.sym;
+      if (e->value.function.esym)
+	sym = e->value.function.esym;
+
       if (sym
 	  && sym->attr.function
 	  && sym->attr.pure

=== modified file 'gcc/gimple-fold.c'
--- gcc/gimple-fold.c	2011-04-18 21:58:03 +0000
+++ gcc/gimple-fold.c	2011-05-26 15:02:13 +0000
@@ -1,5 +1,5 @@
 /* Statement simplification on GIMPLE.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
    Split out from tree-ssa-ccp.c.
 
 This file is part of GCC.
@@ -2183,10 +2183,22 @@
 							code2, op2a, op2b))
 			return NULL_TREE;
 		    }
-		  else if (TREE_CODE (arg) == SSA_NAME)
+		  else if (TREE_CODE (arg) == SSA_NAME
+			   && !SSA_NAME_IS_DEFAULT_DEF (arg))
 		    {
-		      tree temp = and_var_with_comparison (arg, invert,
-							   code2, op2a, op2b);
+		      tree temp;
+		      gimple def_stmt = SSA_NAME_DEF_STMT (arg);
+		      /* In simple cases we can look through PHI nodes,
+			 but we have to be careful with loops.
+			 See PR49073.  */
+		      if (! dom_info_available_p (CDI_DOMINATORS)
+			  || gimple_bb (def_stmt) == gimple_bb (stmt)
+			  || dominated_by_p (CDI_DOMINATORS,
+					     gimple_bb (def_stmt),
+					     gimple_bb (stmt)))
+			return NULL_TREE;
+		      temp = and_var_with_comparison (arg, invert, code2,
+						      op2a, op2b);
 		      if (!temp)
 			return NULL_TREE;
 		      else if (!result)
@@ -2633,10 +2645,22 @@
 							code2, op2a, op2b))
 			return NULL_TREE;
 		    }
-		  else if (TREE_CODE (arg) == SSA_NAME)
+		  else if (TREE_CODE (arg) == SSA_NAME
+			   && !SSA_NAME_IS_DEFAULT_DEF (arg))
 		    {
-		      tree temp = or_var_with_comparison (arg, invert,
-							  code2, op2a, op2b);
+		      tree temp;
+		      gimple def_stmt = SSA_NAME_DEF_STMT (arg);
+		      /* In simple cases we can look through PHI nodes,
+			 but we have to be careful with loops.
+			 See PR49073.  */
+		      if (! dom_info_available_p (CDI_DOMINATORS)
+			  || gimple_bb (def_stmt) == gimple_bb (stmt)
+			  || dominated_by_p (CDI_DOMINATORS,
+					     gimple_bb (def_stmt),
+					     gimple_bb (stmt)))
+			return NULL_TREE;
+		      temp = or_var_with_comparison (arg, invert, code2,
+						     op2a, op2b);
 		      if (!temp)
 			return NULL_TREE;
 		      else if (!result)

=== modified file 'gcc/gimple.c'
--- gcc/gimple.c	2011-04-21 14:18:54 +0000
+++ gcc/gimple.c	2011-05-26 15:02:13 +0000
@@ -2286,6 +2286,10 @@
   if (gimple_has_volatile_ops (s))
     return true;
 
+  if (gimple_code (s) == GIMPLE_ASM
+      && gimple_asm_volatile_p (s))
+    return true;
+
   if (is_gimple_call (s))
     {
       unsigned nargs = gimple_call_num_args (s);
@@ -2299,7 +2303,7 @@
       if (gimple_call_lhs (s)
           && TREE_SIDE_EFFECTS (gimple_call_lhs (s)))
 	{
-	  gcc_assert (gimple_has_volatile_ops (s));
+	  gcc_checking_assert (gimple_has_volatile_ops (s));
 	  return true;
 	}
 
@@ -2309,7 +2313,7 @@
       for (i = 0; i < nargs; i++)
         if (TREE_SIDE_EFFECTS (gimple_call_arg (s, i)))
 	  {
-	    gcc_assert (gimple_has_volatile_ops (s));
+	    gcc_checking_assert (gimple_has_volatile_ops (s));
 	    return true;
 	  }
 
@@ -2318,11 +2322,14 @@
   else
     {
       for (i = 0; i < gimple_num_ops (s); i++)
-	if (TREE_SIDE_EFFECTS (gimple_op (s, i)))
-	  {
-	    gcc_assert (gimple_has_volatile_ops (s));
-	    return true;
-	  }
+	{
+	  tree op = gimple_op (s, i);
+	  if (op && TREE_SIDE_EFFECTS (op))
+	    {
+	      gcc_checking_assert (gimple_has_volatile_ops (s));
+	      return true;
+	    }
+	}
     }
 
   return false;

=== modified file 'gcc/ipa-inline.c'
--- gcc/ipa-inline.c	2011-04-26 12:59:22 +0000
+++ gcc/ipa-inline.c	2011-05-26 15:02:13 +0000
@@ -895,7 +895,7 @@
 	  continue;
 	}
 
-      if (max_count)
+      if (max_count && node->count)
 	{
           if (!cgraph_maybe_hot_edge_p (curr))
 	    {

=== modified file 'gcc/objc/ChangeLog'
--- gcc/objc/ChangeLog	2011-03-25 16:54:16 +0000
+++ gcc/objc/ChangeLog	2011-05-26 15:02:13 +0000
@@ -1,3 +1,12 @@
[phone]  Nicola Pero  <[e-mail]>
+
+	Backport from mainline
+	2011-05-21  Nicola Pero  <[e-mail]>
+
+	* config-lang.in (gtfiles): Updated order of files to fix building
+	when the gcc/cp directory is missing, as in the case of some
+	release tarballs.
+
 2011-03-25  Release Manager
 
 	* GCC 4.6.0 released.

=== modified file 'gcc/objc/config-lang.in'
--- gcc/objc/config-lang.in	2011-02-18 00:07:38 +0000
+++ gcc/objc/config-lang.in	2011-05-26 15:02:13 +0000
@@ -33,4 +33,7 @@
 # Most of the object files for cc1obj actually come from C.
 lang_requires="c"
 
-gtfiles="\$(srcdir)/objc/objc-act.h \$(srcdir)/objc/objc-act.c \$(srcdir)/objc/objc-runtime-shared-support.c \$(srcdir)/objc/objc-gnu-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-02.c \$(srcdir)/c-parser.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-lang.h \$(srcdir)/c-objc-common.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-objc.h \$(srcdir)/c-family/c-cppbuiltin.c \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c"
+# Order is important.  If you change this list, make sure you test
+# building without C++ as well; that is, remove the gcc/cp directory,
+# and build with --enable-languages=c,objc.
+gtfiles="\$(srcdir)/c-family/c-objc.h \$(srcdir)/objc/objc-act.h \$(srcdir)/objc/objc-act.c \$(srcdir)/objc/objc-runtime-shared-support.c \$(srcdir)/objc/objc-gnu-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-02.c \$(srcdir)/c-parser.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-lang.h \$(srcdir)/c-objc-common.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-cppbuiltin.c \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c"

=== modified file 'gcc/po/ChangeLog'
--- gcc/po/ChangeLog	2011-04-26 14:57:30 +0000
+++ gcc/po/ChangeLog	2011-05-26 15:02:13 +0000
@@ -1,3 +1,11 @@
[phone]  Joseph Myers  <[e-mail]>
+
+	* zh_CN.po: Update.
+
[phone]  Joseph Myers  <[e-mail]>
+
+	* zh_CN.po: Update.
+
 2011-04-26  Joseph Myers  <[e-mail]>
 
 	* de.po: Update.

=== modified file 'gcc/po/zh_CN.po'
--- gcc/po/zh_CN.po	2011-04-03 11:30:58 +0000
+++ gcc/po/zh_CN.po	2011-05-26 15:02:13 +0000
@@ -1,14 +1,14 @@
 # Simplified Chinese translation for gcc.
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gcc package.
-# Meng Jie <[e-mail]>, 2005-2010.
+# Meng Jie <[e-mail]>, 2005-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gcc 4.5.0\n"
+"Project-Id-Version: gcc 4.6.0\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2011-03-24 16:45+0000\n"
-"PO-Revision-Date: 2010-04-19 14:57+0800\n"
+"PO-Revision-Date: 2011-05-19 15:04+0800\n"
 "Last-Translator: Meng Jie <[e-mail]>\n"
 "Language-Team: Chinese (simplified) <[e-mail]>\n"
 "Language: zh_CN\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
-"X-Poedit-Basepath: C:\\MSYS\\source\\gcc-4.5.0\\gcc\n"
+"X-Poedit-Basepath: C:\\MSYS\\source\\gcc-4.6.0\\gcc\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: c-decl.c:4660 c-typeck.c:5851 toplev.c:1013 c-family/c-pretty-print.c:423
@@ -112,9 +112,8 @@
 msgstr "需要 %<while%>"
 
 #: c-parser.c:6076
-#, fuzzy
 msgid "expected %<.%>"
-msgstr "需要%<;%>"
+msgstr "需要%<.%>"
 
 #: c-parser.c:6854 c-parser.c:6886 c-parser.c:7109 cp/parser.c:22319
 #: cp/parser.c:22392
@@ -128,9 +127,9 @@
 msgstr "需要 %<>%>"
 
 #: c-parser.c:8836 cp/parser.c:20962
-#, fuzzy, gcc-internal-format
+#, gcc-internal-format
 msgid "expected %<,%> or %<)%>"
-msgstr "需要 %<,%> 或 % <)%>"
+msgstr "需要 %<,%> 或 %<)%>"
 
 #: c-parser.c:9266 c-parser.c:3841 cp/parser.c:20941
 #, gcc-internal-format
@@ -319,14 +318,14 @@
 msgstr "找不到库 lib%s"
 
 #: diagnostic.c:136
-#, fuzzy, c-format
+#, c-format
 msgid "%s: all warnings being treated as errors\n"
-msgstr "所有的警告都当作是错误"
+msgstr "%s：所有的警告都被当作是错误\n"
 
 #: diagnostic.c:141
-#, fuzzy, c-format
+#, c-format
 msgid "%s: some warnings being treated as errors\n"
-msgstr "%s：警告：没有文件‘%s’的读权限\n"
+msgstr "%s：有些警告被当作是错误\n"
 
 #: diagnostic.c:219
 #, c-format
@@ -334,9 +333,9 @@
 msgstr "编译因为 -Wfatal-errors 而中止。\n"
 
 #: diagnostic.c:229
-#, fuzzy, c-format
+#, c-format
 msgid "compilation terminated due to -fmax-errors=%u.\n"
-msgstr "编译因为 -Wfatal-errors 而中止。\n"
+msgstr "编译中止因为 -fmax-errors=%u。\n"
 
 #: diagnostic.c:240
 #, c-format
@@ -873,9 +872,9 @@
 msgstr "  -u, --unconditional-branches    同时显示无条件跳转数\n"
 
 #: gcov.c:431
-#, fuzzy, c-format
+#, c-format
 msgid "  -d, --display-progress          Display progress information\n"
-msgstr "  --help                   显示此帮助说明\n"
+msgstr "  -d, --display-progress          显示进度信息\n"
 
 #: gcov.c:432
 #, c-format
@@ -1112,14 +1111,14 @@
 msgstr "常量/复制传递被禁用"
 
 #: gengtype-state.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d:%d: Invalid state file; %s"
-msgstr "%s:%d:%d：自%qs实例化\n"
+msgstr "%s:%d:%d：状态文件无效；%s"
 
 #: gengtype-state.c:154
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: Invalid state file; %s"
-msgstr "%s：无效的文件名：%s\n"
+msgstr "%s:%d：状态文件无效；%s"
 
 #. Fatal printf-like message while reading state.  This can't be a
 #. function, because there is no way to pass a va_arg to a variant of
@@ -1127,17 +1126,17 @@
 #: gengtype-state.c:165
 #, c-format
 msgid "%s:%d:%d: Invalid state file; "
-msgstr ""
+msgstr "%s:%d:%d：状态文件无效；"
 
 #: gengtype-state.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: Invalid state file; "
-msgstr "%s：无效的文件名：%s\n"
+msgstr "%s:%d：状态文件无效；"
 
 #: gengtype-state.c:695
 #, c-format
 msgid "Option tag unknown"
-msgstr ""
+msgstr "未知的选项标记"
 
 #: gengtype-state.c:750
 #, fuzzy, c-format
@@ -1150,9 +1149,9 @@
 msgstr "cris_print_base 中有非预期的基类型"
 
 #: gengtype-state.c:969
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected type..."
-msgstr "非预期的文件结束"
+msgstr "非预期的类型……"
 
 #: gengtype-state.c:1149
 #, fuzzy, c-format
@@ -1175,9 +1174,9 @@
 msgstr "%s：无法关闭输出文件 %s\n"
 
 #: gengtype-state.c:1213
-#, c-format
+#, fuzzy, c-format
 msgid "failed to rename %s to state file %s [%s]"
-msgstr ""
+msgstr "无法更名模块文件“%s”到“%s”：%s"
 
 #: gengtype-state.c:2395
 #, fuzzy, c-format
@@ -1345,7 +1344,7 @@
 
 #: opts.c:1010
 msgid "[default]"
-msgstr ""
+msgstr "[默认]"
 
 #: opts.c:1021
 msgid "[enabled]"
@@ -1415,9 +1414,8 @@
 msgstr "下列选项与语言相关"
 
 #: opts.c:2010
-#, fuzzy
 msgid "enabled by default"
-msgstr "使“char”类型默认为有符号"
+msgstr "默认启用"
 
 #: plugin.c:780
 msgid "Event"
@@ -1451,7 +1449,6 @@
 msgstr "输出有 VOIDmode"
 
 #: reload1.c:8619
-#, fuzzy
 msgid "failure trying to reload:"
 msgstr "试图重新载入时失败："
 
@@ -1636,12 +1633,11 @@
 
 #: cif-code.def:90
 msgid "indirect function call with a yet undetermined callee"
-msgstr ""
+msgstr "间接函数调用目标未定义"
 
 #: cif-code.def:92
-#, fuzzy
 msgid "function body can be overwriten at linktime"
-msgstr "函数体不可用"
+msgstr "函数体可能在链接时被改写"
 
 #. The remainder are real diagnostic types.
 #: diagnostic.def:33
@@ -1728,11 +1724,11 @@
 
 #: params.def:124
 msgid "Probability that COMDAT function will be shared with different compilatoin unit"
-msgstr ""
+msgstr "与其他编译单元共享 COMDAT 函数的概率"
 
 #: params.def:130
 msgid "Maximum probability of the entry BB of split region (in percent relative to entry BB of the function) to make partial inlining happen"
-msgstr ""
+msgstr "进行部分内联时分离区域入口基本块占函数入口基本块的百分比概率的上限"
 
 #: params.def:137
 msgid "If -fvariable-expansion-in-unroller is used, the maximum number of times that an individual variable will be expanded during loop unrolling"
@@ -1805,11 +1801,11 @@
 
 #: params.def:248
 msgid "Scaling factor in calculation of maximum distance an expression can be moved by GCSE optimizations"
-msgstr ""
+msgstr "计算一个表达式被 GCSE 优化移动的最大距离时的比例因子"
 
 #: params.def:254
 msgid "Cost at which GCSE optimizations will not constraint the distance an expression can travel"
-msgstr ""
+msgstr "指定 GCSE 优化不约束一个表达式能被移动的距离时的代价"
 
 #: params.def:262
 msgid "Maximum depth of search in the dominator tree for expressions to hoist"
@@ -1970,7 +1966,7 @@
 #: params.def:488
 #, fuzzy
 msgid "Bound on the complexity of the expressions in the scalar evolutions analyzer"
-msgstr "用在标量演化分析器中的表达式的大小上限"
+msgstr "捆绑于被使用在标量演化分析器中的表达式的大小"
 
 #: params.def:493
 msgid "Bound on the number of variables in Omega constraint systems"
@@ -2203,17 +2199,15 @@
 
 #: c-family/c-format.c:368
 msgid "format"
-msgstr ""
+msgstr "格式"
 
 #: c-family/c-format.c:369
-#, fuzzy
 msgid "field width specifier"
-msgstr "域宽"
+msgstr "字段宽度限定"
 
 #: c-family/c-format.c:370
-#, fuzzy
 msgid "field precision specifier"
-msgstr "字段精度"
+msgstr "字段精度限定"
 
 #: c-family/c-format.c:484 c-family/c-format.c:508 config/i386/msformat-c.c:49
 msgid "' ' flag"
@@ -2820,7 +2814,6 @@
 #. Can't possibly get a GOT-needing-fixup for a function-call,
 #. right?
 #: config/cris/cris.c:3611
-#, fuzzy
 msgid "unidentifiable call op"
 msgstr "无法识别的 call 操作"
 
@@ -3086,7 +3079,7 @@
 msgstr "对 %%d、%%x 或 %%X 的使用无效"
 
 #: config/lm32/lm32.c:529
-#, fuzzy, c-format
+#, c-format
 msgid "only 0.0 can be loaded as an immediate"
 msgstr "只有 0.0 可以作为立即数装载"
 
@@ -3193,27 +3186,27 @@
 #: config/microblaze/microblaze.c:1747
 #, fuzzy, c-format
 msgid "unknown punctuation '%c'"
-msgstr "未知的 spec 函数‘%s’"
+msgstr "PRINT_OPERAND：未知的标点‘%c’"
 
 #: config/microblaze/microblaze.c:1756
-#, fuzzy, c-format
+#, c-format
 msgid "null pointer"
-msgstr "PRINT_OPERAND 空指针"
+msgstr "空指针"
 
 #: config/microblaze/microblaze.c:1791
 #, fuzzy, c-format
 msgid "PRINT_OPERAND, invalid insn for %%C"
-msgstr "PRINT_OPERAND 空指针"
+msgstr "无效的 Z 寄存器替换"
 
 #: config/microblaze/microblaze.c:1820
 #, fuzzy, c-format
 msgid "PRINT_OPERAND, invalid insn for %%N"
-msgstr "PRINT_OPERAND 空指针"
+msgstr "无效的 Z 寄存器替换"
 
 #: config/microblaze/microblaze.c:1840 config/microblaze/microblaze.c:2001
 #, fuzzy
 msgid "insn contains an invalid address !"
-msgstr "无效地址"
+msgstr "无效的 Z 寄存器替换"
 
 #: config/microblaze/microblaze.c:1854 config/microblaze/microblaze.c:2041
 #: config/xtensa/xtensa.c:2443
@@ -3488,7 +3481,7 @@
 #: config/s390/s390.c:5477
 #, fuzzy, c-format
 msgid "invalid constant for output modifier '%c'"
-msgstr "‘o’修饰符的操作数无效"
+msgstr "CHARACTER 常量的种别 %d 无效，在%C处"
 
 #: config/s390/s390.c:5484
 #, fuzzy, c-format
@@ -3498,7 +3491,7 @@
 #: config/s390/s390.c:5487
 #, fuzzy, c-format
 msgid "invalid expression for output modifier '%c'"
-msgstr "‘o’修饰符的操作数无效"
+msgstr "无效的最小左值表达式"
 
 #: config/score/score7.c:1207
 #, c-format
@@ -3725,9 +3718,8 @@
 msgstr "<返回值>"
 
 #: cp/error.c:970
-#, fuzzy
 msgid "{anonymous}"
-msgstr "{{匿名}}"
+msgstr "{匿名}"
 
 #: cp/error.c:1085
 msgid "<enumerator>"
@@ -3811,7 +3803,7 @@
 #: cp/error.c:2878
 #, fuzzy, c-format
 msgid "%s:%d:%d:   recursively instantiated from %qs\n"
-msgstr "%s:%d:%d：自%qs实例化\n"
+msgstr "    内联自%qs于 %s:%d:%d"
 
 #: cp/error.c:2879
 #, c-format
@@ -3821,7 +3813,7 @@
 #: cp/error.c:2884 cp/error.c:2885
 #, fuzzy, c-format
 msgid "%s:%d:   recursively instantiated from %qs\n"
-msgstr "%s:%d：自%qs实例化\n"
+msgstr "    内联自%qs于 %s:%d:%d"
 
 #: cp/error.c:2893
 #, fuzzy, c-format
@@ -3854,21 +3846,21 @@
 msgstr "%s:%d：[ 跳过 %d 个实例化上下文 ]\n"
 
 #: cp/error.c:3009
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d:%d:   in constexpr expansion of %qs"
-msgstr "%s:%d:%d：自%qs实例化\n"
+msgstr "%s:%d:%d：在%qs的广义常表达式扩展中"
 
 #: cp/error.c:3013
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d:   in constexpr expansion of %qs"
-msgstr "%s:%d：自%qs实例化\n"
+msgstr "%s:%d：在%qs的广义常表达式扩展中"
 
 #: cp/pt.c:1725
 msgid "candidates are:"
 msgstr "备选为："
 
 #: cp/pt.c:16583 cp/call.c:3084
-#, fuzzy, gcc-internal-format
+#, gcc-internal-format
 msgid "candidate is:"
 msgid_plural "candidates are:"
 msgstr[0] "备选是："
@@ -4120,19 +4112,19 @@
 #: fortran/io.c:1524
 #, c-format
 msgid "%s tag"
-msgstr ""
+msgstr "%s 标记"
 
 #: fortran/io.c:2830
 #, fuzzy
 msgid "internal unit in WRITE"
-msgstr "内部函数"
+msgstr "gcc 内部放弃 %s，于 %s:%d"
 
 #. For INQUIRE, all tags except FILE, ID and UNIT are variable definition
 #. contexts.  Thus, use an extended RESOLVE_TAG macro for that.
 #: fortran/io.c:4025
-#, c-format
+#, fuzzy, c-format
 msgid "%s tag with INQUIRE"
-msgstr ""
+msgstr "%s 与%<%%%c%>%s 格式并用"
 
 #: fortran/matchexp.c:28
 #, c-format
@@ -4334,7 +4326,7 @@
 #: fortran/resolve.c:6223
 #, fuzzy
 msgid "iterator variable"
-msgstr "循环变量"
+msgstr "未使用的变量%q+D"
 
 #: fortran/resolve.c:6228
 msgid "Start expression in DO loop"
@@ -4349,26 +4341,29 @@
 msgstr "DO 循环中的步进表达式"
 
 #: fortran/resolve.c:6483 fortran/resolve.c:6485
+#, fuzzy
 msgid "DEALLOCATE object"
-msgstr ""
+msgstr "减小目标文件"
 
 #: fortran/resolve.c:6780 fortran/resolve.c:6782
+#, fuzzy
 msgid "ALLOCATE object"
-msgstr ""
+msgstr "减小目标文件"
 
 #: fortran/resolve.c:6955
 #, fuzzy
 msgid "STAT variable"
-msgstr "循环变量"
+msgstr "未使用的变量%q+D"
 
 #: fortran/resolve.c:6998
 #, fuzzy
 msgid "ERRMSG variable"
-msgstr "循环变量"
+msgstr "未使用的变量%q+D"
 
 #: fortran/resolve.c:8063
+#, fuzzy
 msgid "item in READ"
-msgstr ""
+msgstr "读取链接脚本"
 
 #: fortran/trans-array.c:1138
 #, c-format
@@ -4376,8 +4371,9 @@
 msgstr "数组构造函数中 CHARACTER 长度不同(%ld/%ld)"
 
 #: fortran/trans-array.c:4393
+#, fuzzy
 msgid "Integer overflow when calculating the amount of memory to allocate"
-msgstr ""
+msgstr "试图分配负数大小的内存。可能有整数溢出"
 
 #: fortran/trans-decl.c:4356
 #, c-format
@@ -4447,7 +4443,7 @@
 
 #: fortran/trans.c:639 fortran/trans.c:1039
 msgid "Allocation would exceed memory limit"
-msgstr ""
+msgstr "内存分配将超过内存上限"
 
 #: fortran/trans.c:729
 #, fuzzy, c-format
@@ -4457,7 +4453,7 @@
 #: fortran/trans.c:735
 #, fuzzy
 msgid "Attempting to allocate already allocated variable"
-msgstr "试图分配已经分配的数组"
+msgstr "试图分配已经分配的数组‘%s’"
 
 #: fortran/trans.c:848 fortran/trans.c:928
 #, c-format
@@ -4707,9 +4703,8 @@
 msgstr ""
 
 #: config/i386/nwld.h:34
-#, fuzzy
 msgid "static linking is not supported"
-msgstr "不支持静态链接。"
+msgstr "不支持静态链接"
 
 #: config/pa/pa-hpux10.h:89 config/pa/pa-hpux10.h:92 config/pa/pa-hpux10.h:100
 #: config/pa/pa-hpux10.h:103 config/pa/pa-hpux11.h:108
@@ -4717,7 +4712,7 @@
 #: config/pa/pa64-hpux.h:42 config/pa/pa64-hpux.h:45
 #, fuzzy
 msgid "warning: consider linking with '-static' as system libraries with"
-msgstr "警告：考虑链接时使用‘-static’，因为系统库也使用了此选项"
+msgstr "警告：考虑链接时使用‘-static’因为系统库"
 
 #: config/pa/pa-hpux10.h:90 config/pa/pa-hpux10.h:93 config/pa/pa-hpux10.h:101
 #: config/pa/pa-hpux10.h:104 config/pa/pa-hpux11.h:109
@@ -4739,9 +4734,8 @@
 msgstr "-mbig-endian 和 -mlittle-endian 不能一起使用"
 
 #: config/cris/cris.h:196
-#, fuzzy
 msgid "do not specify both -march=... and -mcpu=..."
-msgstr "不能同时指定 -march=... 和 -mcpu=..."
+msgstr "请勿同时指定 -march=... 和 -mcpu=..."
 
 #: objcp/lang-specs.h:58
 msgid "objc++-cpp-output is deprecated; please use objective-c++-cpp-output instead"
@@ -4944,9 +4938,8 @@
 msgstr "对被截断的字符表达式给出警告"
 
 #: fortran/lang.opt:223
-#, fuzzy
 msgid "Warn about most implicit conversions"
-msgstr "对隐式转换给出警告"
+msgstr "对大多数隐式类型转换给出警告"
 
 #: fortran/lang.opt:227
 msgid "Warn about calls with implicit interface"
@@ -4981,9 +4974,8 @@
 msgstr "如果用户过程有与内建过程相同的名字则警告"
 
 #: fortran/lang.opt:263
-#, fuzzy
 msgid "Warn about unused dummy arguments."
-msgstr "为可能的虚参重叠给出警告"
+msgstr "对未使用的哑元给出警告。"
 
 #: fortran/lang.opt:267
 msgid "Enable preprocessing"
@@ -5181,7 +5173,7 @@
 
 #: fortran/lang.opt:479
 msgid "Reallocate the LHS in assignments"
-msgstr ""
+msgstr "在赋值中重分配左值"
 
 #: fortran/lang.opt:483
 msgid "Use a 4-byte record marker for unformatted files"
@@ -5201,7 +5193,7 @@
 
 #: fortran/lang.opt:499
 msgid "-fcoarray=[...]\tSpecify which coarray parallelization should be used"
-msgstr ""
+msgstr "-fcoarray=[...]\t指定要使用的集合数组并行化"
 
 #: fortran/lang.opt:503
 msgid "-fcheck=[...]\tSpecify which runtime checks are to be performed"
@@ -5528,9 +5520,8 @@
 msgstr "目标为 AM33/2.0 处理器"
 
 #: config/mn10300/mn10300.opt:31
-#, fuzzy
 msgid "Target the AM34 processor"
-msgstr "目标为 AM33 处理器"
+msgstr "目标为 AM34 处理器"
 
 #: config/mn10300/mn10300.opt:35 config/arm/arm.opt:154
 msgid "Tune code for the given processor"
@@ -5549,9 +5540,8 @@
 msgstr "在 a0 和 d0 中返回指针"
 
 #: config/mn10300/mn10300.opt:56
-#, fuzzy
 msgid "Allow gcc to generate LIW instructions"
-msgstr "允许 gcc 使用 repeat/erepeat 指令"
+msgstr "允许 gcc 生成 LIW 指令"
 
 #: config/s390/tpf.opt:23
 msgid "Enable TPF-OS tracing code"
@@ -5786,7 +5776,7 @@
 #: config/ia64/ia64.opt:175
 #, fuzzy
 msgid "Disallow more than 'msched-max-memory-insns' in instruction group. Otherwise, limit is 'soft' (prefer non-memory operations when limit is reached)"
-msgstr "一个指令组中至多有‘msched-max-memory-insns’条指令。否则，限定值是`软的' (当达到限定值时优先选择非内存操作)"
+msgstr "在指令组中不准多于 `msched-max-memory-insns' 。否则，限定值是`软的' (当达到限定值时宁可非内存操作)"
 
 #: config/ia64/ia64.opt:179
 msgid "Don't generate checks for control speculation in selective scheduling"
@@ -6193,9 +6183,8 @@
 msgstr "使用给定的 x86-64 代码模式"
 
 #: config/i386/i386.opt:121
-#, fuzzy
 msgid "%<-mcpu=%> is deprecated; use %<-mtune=%> or %<-march=%> instead"
-msgstr "不建议使用‘-mcpu=’。请改用‘-mtune=’或‘-march=’。"
+msgstr "不建议使用%<-mcpu=%>；请改用%<-mtune=%>或%<-march=%>"
 
 #: config/i386/i386.opt:125
 msgid "Generate sin, cos, sqrt for FPU"
@@ -6222,9 +6211,8 @@
 msgstr "内联 memset/memcpy 字符串操作，但仅为较小的块使用内联版本"
 
 #: config/i386/i386.opt:156
-#, fuzzy
 msgid "%<-mintel-syntax%> and %<-mno-intel-syntax%> are deprecated; use %<-masm=intel%> and %<-masm=att%> instead"
-msgstr "不建议使用‘-mintel-syntax’。请改用‘-masm=intel’。"
+msgstr "不建议使用%<-mintel-syntax%>和 %<-mno-intel-syntax%>；请改用%<-masm=intel%>和%<-masm=att%>"
 
 #: config/i386/i386.opt:161
 msgid "Use native (MS) bitfield layout"
@@ -6297,7 +6285,7 @@
 
 #: config/i386/i386.opt:249
 msgid "Return 8-byte vectors in memory"
-msgstr ""
+msgstr "将 8 字节向量在内存中返回"
 
 #: config/i386/i386.opt:253
 msgid "Generate reciprocals instead of divss and sqrtss."
@@ -6313,11 +6301,11 @@
 
 #: config/i386/i386.opt:266
 msgid "Do dispatch scheduling if processor is bdver1 and Haifa scheduling"
-msgstr ""
+msgstr "进行海法调度，当处理器是 bdver1 时也进行派遣调度"
 
 #: config/i386/i386.opt:271
 msgid "Use 128-bit AVX instructions instead of 256-bit AVX instructions in the auto-vectorizer."
-msgstr ""
+msgstr "自动向量化时使用 128 位 AVX 指令而不是 256 位 AVX 指令"
 
 #: config/i386/i386.opt:277
 msgid "Generate 32bit i386 code"
@@ -6368,9 +6356,8 @@
 msgstr "不支持 SSE4.1 和 SSE4.2 内建函数及代码生成"
 
 #: config/i386/i386.opt:328
-#, fuzzy
 msgid "%<-msse5%> was removed"
-msgstr "‘-msse5’已被移除"
+msgstr "%<-msse5%>已被移除"
 
 #: config/i386/i386.opt:333
 msgid "Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2 and AVX built-in functions and code generation"
@@ -6405,14 +6392,12 @@
 msgstr "支持生成 popcnt 指令。"
 
 #: config/i386/i386.opt:365
-#, fuzzy
 msgid "Support BMI built-in functions and code generation"
-msgstr "支持 FMA4 内建函数及代码生成"
+msgstr "支持 BMI 内建函数及代码生成"
 
 #: config/i386/i386.opt:369
-#, fuzzy
 msgid "Support TBM built-in functions and code generation"
-msgstr "支持 FMA4 内建函数及代码生成"
+msgstr "支持 TBM 内建函数及代码生成"
 
 #: config/i386/i386.opt:373
 msgid "Support code generation of cmpxchg16b instruction."
@@ -6443,19 +6428,16 @@
 msgstr "支持带 VEX 前缀的 SSE 指令"
 
 #: config/i386/i386.opt:401
-#, fuzzy
 msgid "Support FSGSBASE built-in functions and code generation"
-msgstr "支持 SSE5 内建函数及代码生成"
+msgstr "支持 FSGSBASE 内建函数及代码生成"
 
 #: config/i386/i386.opt:405
-#, fuzzy
 msgid "Support RDRND built-in functions and code generation"
-msgstr "支持 AES 内建函数及代码生成"
+msgstr "支持 RDRND 内建函数及代码生成"
 
 #: config/i386/i386.opt:409
-#, fuzzy
 msgid "Support F16C built-in functions and code generation"
-msgstr "支持 FMA4 内建函数及代码生成"
+msgstr "支持 F16C 内建函数及代码生成"
 
 #: config/i386/i386.opt:413
 #, fuzzy
@@ -6464,7 +6446,7 @@
 
 #: config/i386/i386.opt:417
 msgid "Expand 32bit/64bit integer divide into 8bit unsigned integer divide with run-time check"
-msgstr ""
+msgstr "将 32/64 位整数除法扩展为带运行时检查的 8 位无符号整数除法"
 
 #: config/i386/cygming.opt:23
 msgid "Create console application"
@@ -6604,7 +6586,7 @@
 
 #: config/rs6000/rs6000.opt:224
 msgid "Under -ffast-math, generate a FRIZ instruction for (double)(long long) conversions"
-msgstr ""
+msgstr "在 -ffast-math 时，为 (double)(long long) 转换生成 FRIZ 指令"
 
 #: config/rs6000/rs6000.opt:232
 msgid "Use vector/scalar (VSX) instructions"
@@ -6809,7 +6791,7 @@
 
 #: config/rs6000/linux64.opt:28
 msgid "Select code model"
-msgstr ""
+msgstr "选择代码模型"
 
 #: config/rs6000/sysv4.opt:24
 msgid "Select ABI calling convention"
@@ -7532,7 +7514,7 @@
 #: config/avr/avr.opt:60
 #, fuzzy
 msgid "Make the linker relaxation machine assume that a program counter wrap-around occurs."
-msgstr "使链接器松驰机假定会发生程序计数器环绕"
+msgstr "链接器松驰机器假定一个程序计数器环绕发生 。"
 
 #: config/crx/crx.opt:23
 msgid "Support multiply accumulate instructions"
@@ -8185,9 +8167,8 @@
 msgstr "为 TDA 区域合格的数据设置最大尺寸"
 
 #: config/v850/v850.opt:71
-#, fuzzy
 msgid "Do not enforce strict alignment"
-msgstr "强制严格对齐"
+msgstr "不强制严格对齐"
 
 #: config/v850/v850.opt:75
 msgid "Put jump tables for switch statements into the .data section rather than the .code section"
@@ -8206,19 +8187,16 @@
 msgstr "为 v850e1 处理器编译"
 
 #: config/v850/v850.opt:94
-#, fuzzy
 msgid "Compile for the v850es variant of the v850e1"
-msgstr "为 v850e 处理器编译"
+msgstr "为 v850e1 的 v850es 变种编译"
 
 #: config/v850/v850.opt:98
-#, fuzzy
 msgid "Compile for the v850e2 processor"
-msgstr "为 v850e 处理器编译"
+msgstr "为 v850e2 处理器编译"
 
 #: config/v850/v850.opt:102
-#, fuzzy
 msgid "Compile for the v850e2v3 processor"
-msgstr "为 v850e 处理器编译"
+msgstr "为 v850e2v3 处理器编译"
 
 #: config/v850/v850.opt:106
 msgid "Set the max size of data eligible for the ZDA area"
@@ -8410,7 +8388,7 @@
 
 #: config/darwin.opt:111
 msgid "Generate compile-time CFString objects"
-msgstr ""
+msgstr "生成编译时 CFString 对象"
 
 #: config/darwin.opt:205
 msgid "Warn if constant CFString objects contain non-portable characters"
@@ -8418,7 +8396,7 @@
 
 #: config/darwin.opt:210
 msgid "Generate AT&T-style stubs for Mach-O"
-msgstr ""
+msgstr "为 Mach-O 生成 AT&T 风格的占位代码"
 
 #: config/darwin.opt:214
 msgid "Generate code suitable for executables (NOT shared libs)"
@@ -8478,16 +8456,15 @@
 
 #: config/linux.opt:24
 msgid "Use Bionic C library"
-msgstr ""
+msgstr "使用 Bionic C 标准库"
 
 #: config/linux.opt:28
 msgid "Use GNU C library"
-msgstr ""
+msgstr "使用 GNU C 标准库"
 
 #: config/linux.opt:32
-#, fuzzy
 msgid "Use uClibc C library"
-msgstr "使用 uClibc 代替 GNU libc"
+msgstr "使用 uClibc C 标准库"
 
 #: config/mep/mep.opt:21
 msgid "Enable absolute difference instructions"
@@ -8691,9 +8668,8 @@
 msgstr "使用软件浮点单元"
 
 #: config/microblaze/microblaze.opt:44
-#, fuzzy
 msgid "Use hardware floating point instructions"
-msgstr "使用十进制浮点指令"
+msgstr "使用硬件浮点指令"
 
 #: config/microblaze/microblaze.opt:48
 #, fuzzy
@@ -8701,26 +8677,24 @@
 msgstr "在树级别进行循环优化"
 
 #: config/microblaze/microblaze.opt:52
-#, fuzzy
 msgid "-mcpu=PROCESSOR\t\tUse features of and schedule code for given CPU"
-msgstr "-mcpu=\t使用指定 CPU 的特性和调度代码"
+msgstr "-mcpu=处理器\t使用指定 CPU 的特性并为其调度代码"
 
 #: config/microblaze/microblaze.opt:56
-#, fuzzy
 msgid "Don't optimize block moves, use memcpy"
-msgstr "不优化块移动"
+msgstr "不优化块移动，使用 memcpy"
 
 #: config/microblaze/microblaze.opt:60
 msgid "Use the soft multiply emulation (default)"
-msgstr ""
+msgstr "使用软件模拟乘法(默认)"
 
 #: config/microblaze/microblaze.opt:64
 msgid "Use the software emulation for divides (default)"
-msgstr ""
+msgstr "使用软件模拟除法(默认)"
 
 #: config/microblaze/microblaze.opt:68
 msgid "Use the hardware barrel shifter instead of emulation"
-msgstr ""
+msgstr "使用硬件桶型移位器代替仿真"
 
 #: config/microblaze/microblaze.opt:72
 #, fuzzy
@@ -8728,27 +8702,24 @@
 msgstr "使用浮点双精度指令"
 
 #: config/microblaze/microblaze.opt:76
-#, fuzzy
 msgid "Check for stack overflow at runtime"
-msgstr "检查语法错误，然后停止"
+msgstr "在运行时检查栈溢出"
 
 #: config/microblaze/microblaze.opt:84
 msgid "Clear the BSS to zero and place zero initialized in BSS"
-msgstr ""
+msgstr "将 BSS 清空为零并将初始值为零的放入 BSS 中"
 
 #: config/microblaze/microblaze.opt:88
 msgid "Use multiply high instructions for high part of 32x32 multiply"
 msgstr ""
 
 #: config/microblaze/microblaze.opt:92
-#, fuzzy
 msgid "Use hardware floating point conversion instructions"
-msgstr "使用十进制浮点指令"
+msgstr "使用浮点转换指令"
 
 #: config/microblaze/microblaze.opt:96
-#, fuzzy
 msgid "Use hardware floating point square root instruction"
-msgstr "使用十进制浮点指令"
+msgstr "使用浮点平方根指令"
 
 #: config/microblaze/microblaze.opt:100
 msgid "Description for mxl-mode-executable"
@@ -8767,23 +8738,20 @@
 msgstr ""
 
 #: config/linux-android.opt:23
-#, fuzzy
 msgid "Generate code for the Android platform."
-msgstr "为 Android 操作系统生成代码"
+msgstr "为 Android 操作系统生成代码。"
 
 #: config/g.opt:28
 msgid "-G<number>\tPut global and static data smaller than <number> bytes into a special section (on some targets)"
 msgstr "-G<N>\t将小于 N 字节的全局和静态数据放入一个特殊的节中(在某些目标机上)"
 
 #: config/sol2.opt:35
-#, fuzzy
 msgid "Pass -z text to linker"
-msgstr "将 -assert pure-text 传递给链接器"
+msgstr "将 -z text 传递给链接器"
 
 #: config/fused-madd.opt:23
-#, fuzzy
 msgid "%<-mfused-madd%> is deprecated; use %<-ffp-contract=%> instead"
-msgstr "不建议使用此开关；请改用 -Wextra"
+msgstr "不建议使用%<-mfused-madd%>；请改用%<-ffp-contract=%>"
 
 #: c-family/c.opt:44 c-family/c.opt:47 c-family/c.opt:185
 #, c-format
@@ -9021,14 +8989,12 @@
 msgstr "对初始化为自身的变量给出警告。"
 
 #: c-family/c.opt:411
-#, fuzzy
 msgid "Warn about implicit declarations"
 msgstr "对隐式函数声明给出警告"
 
 #: c-family/c.opt:415
-#, fuzzy
 msgid "Warn about implicit conversions from \"float\" to \"double\""
-msgstr "对隐式转换给出警告"
+msgstr "对从“float”到“double”的隐式转换给出警告"
 
 #: c-family/c.opt:419
 msgid "Warn about implicit function declarations"
@@ -9275,7 +9241,6 @@
 msgstr "当一个寄存器变量被声明为 volatile 时给出警告"
 
 #: c-family/c.opt:670
-#, fuzzy
 msgid "In C++, nonzero means warn about deprecated conversion from string literals to 'char *'.  In C, similar warning, except that the conversion is of course not deprecated by the ISO C standard."
 msgstr "在 C++ 中，非零值表示将字面字符串转换为‘char *’时给出警告。在 C 中，给出相似的警告，但这种类型转换是符合 ISO C 标准的。"
 
@@ -9302,9 +9267,8 @@
 
 #: c-family/c.opt:693 c-family/c.opt:799 c-family/c.opt:1018
 #: c-family/c.opt:1022 c-family/c.opt:1038
-#, fuzzy
 msgid "No longer supported"
-msgstr "开关%qs不再被支持"
+msgstr "不再受支持"
 
 #: c-family/c.opt:697
 msgid "Recognize the \"asm\" keyword"
@@ -9415,7 +9379,7 @@
 
 #: c-family/c.opt:819
 msgid "Don't emit dllexported inline functions unless needed"
-msgstr ""
+msgstr "除非必需，不生成 DLL 导出的内联函数"
 
 #: c-family/c.opt:826
 msgid "Allow implicit conversions between vectors with differing numbers of subparts and/or differing element types."
@@ -9487,9 +9451,8 @@
 msgstr "将兼容性错误降格为警告"
 
 #: c-family/c.opt:918
-#, fuzzy
 msgid "Enable Plan 9 language extensions"
-msgstr "启用链接器松弛"
+msgstr "启用九号计划语言扩展"
 
 #: c-family/c.opt:922
 msgid "Treat the input file as already preprocessed"
@@ -9672,9 +9635,8 @@
 msgstr "遵循 ISO 1998 C++ 标准，也支持可能集成在下一个 ISO C++ 标准中的扩展"
 
 #: c-family/c.opt:1147
-#, fuzzy
 msgid "Conform to the ISO 201X C standard draft (experimental and incomplete support)"
-msgstr "遵循 ISO 1990 C 标准于 1994 年修订的版本"
+msgstr "遵循 ISO 201X C 标准草案(试验性质的不完全支持)"
 
 #: c-family/c.opt:1151 c-family/c.opt:1155 c-family/c.opt:1198
 msgid "Conform to the ISO 1990 C standard"
@@ -9697,9 +9659,8 @@
 msgstr "遵循 ISO 1998 C++ 标准，也支持 GNU 扩展和可能集成在下一代 ISO C++ 标准中的扩展"
 
 #: c-family/c.opt:1178
-#, fuzzy
 msgid "Conform to the ISO 201X C standard draft with GNU extensions (experimental and incomplete support)"
-msgstr "遵循 ISO 1998 C++ 标准，也支持 GNU 扩展和可能集成在下一代 ISO C++ 标准中的扩展"
+msgstr "遵循 ISO 201X C 标准草案和 GNU 扩展(试验性质的不完全支持)"
 
 #: c-family/c.opt:1182 c-family/c.opt:1186
 msgid "Conform to the ISO 1990 C standard with GNU extensions"
@@ -9789,7 +9750,7 @@
 
 #: common.opt:436
 msgid "Optimize for speed disregarding exact standards compliance"
-msgstr ""
+msgstr "为速度优化，不严格遵守标准"
 
 #: common.opt:467
 msgid "This switch is deprecated; use -Wextra instead"
@@ -10287,9 +10248,8 @@
 msgstr "启用循环分块转换"
 
 #: common.opt:1140
-#, fuzzy
 msgid "Enable Loop Flattening transformation"
-msgstr "启用循环分块转换"
+msgstr "启用循环扁平化转换"
 
 #: common.opt:1144
 msgid "Force bitfield accesses to match their type width"
@@ -10318,7 +10278,7 @@
 
 #: common.opt:1172
 msgid "Also if-convert conditional jumps containing memory writes"
-msgstr ""
+msgstr "将包含内存写入的条件跳转转换为不带分支的等效形式"
 
 #: common.opt:1180
 msgid "Do not generate .size directives"
@@ -10400,7 +10360,7 @@
 #: common.opt:1265
 #, fuzzy, c-format
 msgid "unknown IRA algorithm %qs"
-msgstr "未知的 IRA 算法“%s”"
+msgstr "未知的 TLS 模型%qs"
 
 #: common.opt:1275
 msgid "-fira-region=[one|all|mixed] Set regions for IRA"
@@ -10409,7 +10369,7 @@
 #: common.opt:1278
 #, fuzzy, c-format
 msgid "unknown IRA region %qs"
-msgstr "未知的 IRA 区域“%s”"
+msgstr "未知的 TLS 模型%qs"
 
 #: common.opt:1291
 msgid "Use IRA based register pressure calculation"
@@ -10481,7 +10441,6 @@
 msgstr "执行内建数学函数后设置 errno"
 
 #: common.opt:1365
-#, fuzzy
 msgid "-fmax-errors=<number>\tMaximum number of errors to report"
 msgstr "-fmax-errors=<n>\t报告错误数量的上限值"
 
@@ -10558,9 +10517,8 @@
 msgstr "优化同级递归和尾递归"
 
 #: common.opt:1444
-#, fuzzy
 msgid "Perform partial inlining"
-msgstr "进行早内联"
+msgstr "进行部分内联"
 
 #: common.opt:1448 common.opt:1452
 msgid "Report on memory allocation before interprocedural optimization"
@@ -10825,7 +10783,7 @@
 #: common.opt:1743
 #, fuzzy
 msgid "Generate discontiguous stack frames"
-msgstr "生成与 APCS 相容的栈帧"
+msgstr "生成与 APCS 相容的堆栈框架"
 
 #: common.opt:1747
 msgid "Split wide types into independent registers"
@@ -10893,9 +10851,9 @@
 msgstr "-ftls-model=[global-dynamic|local-dynamic|initial-exec|local-exec]\t设定默认的线程局部存储代码生成模式"
 
 #: common.opt:1821
-#, fuzzy, c-format
+#, c-format
 msgid "unknown TLS model %qs"
-msgstr "未知的 tls-model“%s”"
+msgstr "未知的 TLS 模型%qs"
 
 #: common.opt:1837
 msgid "Reorder top level functions, variables, and asms"
@@ -10920,7 +10878,7 @@
 #: common.opt:1860
 #, fuzzy
 msgid "Enable SSA-BIT-CCP optimization on trees"
-msgstr "启用树上的 SSA-CCP 优化"
+msgstr "启用树上的 SSA 死代码消除优化"
 
 #: common.opt:1868
 msgid "Enable loop header copying on trees"
@@ -11115,7 +11073,7 @@
 #: common.opt:2091
 #, fuzzy, c-format
 msgid "unrecognized visibility value %qs"
-msgstr "无法识别的可见性值“%s”"
+msgstr "无效的 --param 值%qs"
 
 #: common.opt:2107
 msgid "Use expression value profiles in optimizations"
@@ -11190,9 +11148,8 @@
 msgstr "生成 XCOFF 扩展格式的调试信息"
 
 #: common.opt:2182
-#, fuzzy
 msgid "-iplugindir=<dir>\tSet <dir> to be the default plugin directory"
-msgstr "-imultilib <目录>\t将目录设定为 multilib 的包含子目录"
+msgstr "-iplugindir=<目录>\t将目录设定为默认的插件子目录"
 
 #: common.opt:2204
 msgid "-o <file>\tPlace output into <file>"
@@ -11237,12 +11194,12 @@
 #: go/gofrontend/expressions.cc:882
 #, fuzzy
 msgid "invalid use of type"
-msgstr "错误地使用了%qD"
+msgstr "对未定义类型%<%s %E%>的使用无效"
 
 #: go/gofrontend/expressions.cc:1992 go/gofrontend/expressions.cc:2686
 #, fuzzy
 msgid "floating point constant truncated to integer"
-msgstr "浮点常量向零截断"
+msgstr "大定点常量隐式截断为定点类型"
 
 #: go/gofrontend/expressions.cc:2566 go/gofrontend/expressions.cc:2636
 #: go/gofrontend/expressions.cc:2652
@@ -11251,24 +11208,21 @@
 msgstr "inlined_to pointer 指向自身"
 
 #: go/gofrontend/expressions.cc:4043
-#, fuzzy
 msgid "expected numeric type"
-msgstr "需要表达式类型"
+msgstr "需要数字类型"
 
 #: go/gofrontend/expressions.cc:4050
-#, fuzzy
 msgid "expected integer or boolean type"
-msgstr "需要整数表达式"
+msgstr "需要整数或布尔类型"
 
 #: go/gofrontend/expressions.cc:4055
 #, fuzzy
 msgid "invalid operand for unary %<&%>"
-msgstr "%%R 的操作数无效"
+msgstr "代码‘%c’的操作数无效"
 
 #: go/gofrontend/expressions.cc:4063
-#, fuzzy
 msgid "expected pointer"
-msgstr "需要整数"
+msgstr "需要指针"
 
 #: go/gofrontend/expressions.cc:5456 go/gofrontend/expressions.cc:5707
 #: go/gofrontend/expressions.cc:5723
@@ -11279,7 +11233,7 @@
 #: go/gofrontend/expressions.cc:5736
 #, fuzzy
 msgid "shift of non-integer operand"
-msgstr "数组%qE的大小的类型不是整数"
+msgstr "非整数操作数使用了操作数代码‘%c’"
 
 #: go/gofrontend/expressions.cc:5741
 #, fuzzy
@@ -11287,41 +11241,36 @@
 msgstr "switch 语句中的值不是一个整数"
 
 #: go/gofrontend/expressions.cc:5750
-#, fuzzy
 msgid "negative shift count"
-msgstr "指令长度为负"
+msgstr "移位次数为负"
 
 #: go/gofrontend/expressions.cc:6433
-#, fuzzy
 msgid "object is not a method"
-msgstr "被调用的对象%qE不是一个函数"
+msgstr "对象不是一个方法"
 
 #: go/gofrontend/expressions.cc:6442
-#, fuzzy
 msgid "method type does not match object type"
-msgstr "实参类型为%qT，与%qT不匹配"
+msgstr "方法类型不匹配对象类型"
 
 #: go/gofrontend/expressions.cc:6690 go/gofrontend/expressions.cc:6709
 #: go/gofrontend/expressions.cc:7348 go/gofrontend/expressions.cc:7487
 #: go/gofrontend/expressions.cc:7530 go/gofrontend/expressions.cc:7568
 #: go/gofrontend/expressions.cc:8603 go/gofrontend/expressions.cc:8624
-#, fuzzy
 msgid "not enough arguments"
-msgstr "没有参数"
+msgstr "实参太少"
 
 #: go/gofrontend/expressions.cc:6692 go/gofrontend/expressions.cc:7353
 #: go/gofrontend/expressions.cc:7470 go/gofrontend/expressions.cc:7492
 #: go/gofrontend/expressions.cc:7535 go/gofrontend/expressions.cc:7570
 #: go/gofrontend/expressions.cc:8357 go/gofrontend/expressions.cc:8606
 #: go/gofrontend/expressions.cc:8617
-#, fuzzy
 msgid "too many arguments"
-msgstr "%qE实参太多"
+msgstr "实参太多"
 
 #: go/gofrontend/expressions.cc:7395
 #, fuzzy
 msgid "argument must be array or slice or channel"
-msgstr "实参必须是常数"
+msgstr "右实参必须是一个切片或字符串"
 
 #: go/gofrontend/expressions.cc:7405
 msgid "argument must be string or array or slice or map or channel"
@@ -11330,104 +11279,91 @@
 #: go/gofrontend/expressions.cc:7446
 #, fuzzy
 msgid "unsupported argument type to builtin function"
-msgstr "内建函数实参无效"
+msgstr "%<__builtin_frame_address%>的实参不受支持"
 
 #: go/gofrontend/expressions.cc:7458
-#, fuzzy
 msgid "argument must be channel"
-msgstr "实参必须是常数"
+msgstr "实参必须是通道"
 
 #: go/gofrontend/expressions.cc:7478
 #, fuzzy
 msgid "argument must be a field reference"
-msgstr "最后一个实参必须是一个立即数"
+msgstr "%3$L处内建函数‘%2$s’的实参‘%1$s’必须是 %4$s"
 
 #: go/gofrontend/expressions.cc:7505
-#, fuzzy
 msgid "left argument must be a slice"
-msgstr "最后一个实参必须是一个立即数"
+msgstr "左实参必须是一个切片"
 
 #: go/gofrontend/expressions.cc:7516
-#, fuzzy
 msgid "right argument must be a slice or a string"
-msgstr "实参必须是常数"
+msgstr "右实参必须是一个切片或字符串"
 
 #: go/gofrontend/expressions.cc:7521
 msgid "element types must be the same"
-msgstr ""
+msgstr "元素类型必须一样"
 
 #: go/gofrontend/expressions.cc:7543
-#, fuzzy
 msgid "arguments 1 and 2 have different types"
-msgstr "允许‘?’运算符的参数有不同的类型"
+msgstr "实参 1 和 2 具有不同的类型"
 
 #: go/gofrontend/expressions.cc:7560
-#, fuzzy
 msgid "argument must have complex type"
-msgstr "形参 %u 的类型不完全"
+msgstr "实参必须具有复数类型"
 
 #: go/gofrontend/expressions.cc:7578
-#, fuzzy
 msgid "complex arguments must have identical types"
-msgstr "cleanup 实参不是一个标识符"
+msgstr "复数实参必须具有相同的类型"
 
 #: go/gofrontend/expressions.cc:7580
-#, fuzzy
 msgid "complex arguments must have floating-point type"
-msgstr "不使用硬件浮点单元"
+msgstr "复数实参必须具有浮点类型"
 
 #: go/gofrontend/expressions.cc:8560
-#, fuzzy
 msgid "expected function"
-msgstr "函数%q+D已删除"
+msgstr "需要函数"
 
 #: go/gofrontend/expressions.cc:8571
 msgid "method call without object"
-msgstr ""
+msgstr "方法调用缺少对象"
 
 #: go/gofrontend/expressions.cc:8584
-#, fuzzy
 msgid "incompatible type for receiver"
-msgstr "%2$qE的第 %1$d 个实参类型不兼容"
+msgstr "接收器类型不兼容"
 
 #: go/gofrontend/expressions.cc:8982 go/gofrontend/expressions.cc:8995
-#, fuzzy
 msgid "number of results does not match number of values"
-msgstr "引入边计数不匹配 PHI 参数数目"
+msgstr "返回值的数量不匹配值的数量"
 
 #: go/gofrontend/expressions.cc:9246 go/gofrontend/expressions.cc:9625
-#, fuzzy
 msgid "index must be integer"
-msgstr "%C处 Cray 指针必须是一个整数"
+msgstr "索引必须是整数"
 
 #: go/gofrontend/expressions.cc:9250 go/gofrontend/expressions.cc:9629
-#, fuzzy
 msgid "slice end must be integer"
-msgstr "%C处 Cray 指针必须是一个整数"
+msgstr "切片结尾必须是整数"
 
 #: go/gofrontend/expressions.cc:9305
-#, fuzzy
 msgid "array is not addressable"
-msgstr "内存输入 %d 不可直接寻址"
+msgstr "数组不能被取指"
 
 #: go/gofrontend/expressions.cc:9844
-#, fuzzy
 msgid "incompatible type for map index"
-msgstr "%2$qE的第 %1$d 个实参类型不兼容"
+msgstr "映射索引类型不兼容"
 
 #: go/gofrontend/expressions.cc:10163
+#, fuzzy
 msgid "expected interface or pointer to interface"
-msgstr ""
+msgstr "%<delete%>的参数类型应为指针而非%q#T"
 
 #: go/gofrontend/expressions.cc:10468
 #, fuzzy
 msgid "invalid new of function type"
-msgstr "向函数类型%qT的转换无效"
+msgstr "对 new 而言类型%<void%>无效"
 
 #: go/gofrontend/expressions.cc:10573
 #, fuzzy
 msgid "invalid type for make function"
-msgstr "纯常函数状态无效"
+msgstr "函数%q+#D的抽象返回类型无效"
 
 #: go/gofrontend/expressions.cc:10732
 #, fuzzy
@@ -11446,7 +11382,7 @@
 #: go/gofrontend/expressions.cc:12139 go/gofrontend/expressions.cc:12147
 #, fuzzy
 msgid "invalid unsafe.Pointer conversion"
-msgstr "整点转换中类型无效"
+msgstr "从%<__fpreg%>的转换无效"
 
 #: go/gofrontend/expressions.cc:12152 go/gofrontend/statements.cc:1349
 msgid "type assertion only valid for interface types"
@@ -11457,9 +11393,8 @@
 msgstr ""
 
 #: go/gofrontend/expressions.cc:12320 go/gofrontend/statements.cc:1200
-#, fuzzy
 msgid "expected channel"
-msgstr "需要类名"
+msgstr "需要通道"
 
 #: go/gofrontend/expressions.cc:12325 go/gofrontend/statements.cc:1205
 msgid "invalid receive on send-only channel"
@@ -11468,7 +11403,7 @@
 #: go/gofrontend/expressions.cc:12419
 #, fuzzy
 msgid "incompatible types in send"
-msgstr "PHI 实参 %u 类型不兼容"
+msgstr "指针目标类型在 C++ 中不兼容"
 
 #: go/gofrontend/expressions.cc:12424
 #, fuzzy
@@ -11478,7 +11413,7 @@
 #: go/gofrontend/statements.cc:521
 #, fuzzy
 msgid "invalid left hand side of assignment"
-msgstr "赋值运算的左操作数必须是左值"
+msgstr "在左操作数边转化 SSA_NAME。"
 
 #: go/gofrontend/statements.cc:930
 msgid "expected map index on right hand side"
@@ -11491,27 +11426,24 @@
 
 #: go/gofrontend/statements.cc:1810
 msgid "no object for method call"
-msgstr ""
+msgstr "方法调用没有对象"
 
 #: go/gofrontend/statements.cc:2580
 #, fuzzy
 msgid "return with value in function with no return type"
-msgstr "在无返回值的函数中，%<return%>带返回值"
+msgstr "在有返回值的的函数中，%<return%>不带返回值"
 
 #: go/gofrontend/statements.cc:2593
-#, fuzzy
 msgid "too many values in return statement"
-msgstr "返回语句操作数无效"
+msgstr "返回语句中值太多"
 
 #: go/gofrontend/statements.cc:2622
-#, fuzzy
 msgid "not enough values in return statement"
-msgstr "返回语句操作数无效"
+msgstr "返回语句中值不够"
 
 #: go/gofrontend/statements.cc:2998
-#, fuzzy
 msgid "expected boolean expression"
-msgstr "需要表达式"
+msgstr "需要布尔表达式"
 
 #: go/gofrontend/statements.cc:4612
 msgid "too many variables for range clause with channel"
@@ -11522,64 +11454,62 @@
 msgstr ""
 
 #: go/gofrontend/types.cc:575
-#, fuzzy
 msgid "need explicit conversion"
-msgstr "对隐式转换给出警告"
+msgstr "需要显式转换"
 
 #: go/gofrontend/types.cc:577
 msgid "multiple value function call in single value context"
 msgstr ""
 
 #: go/gofrontend/types.cc:585
-#, fuzzy, c-format
+#, c-format
 msgid "cannot use type %s as type %s"
-msgstr "不能将类型%qT转换为类型%qT"
+msgstr "不能将类型 %s 用作 %s"
 
 #: go/gofrontend/types.cc:2479
-#, fuzzy
 msgid "different receiver types"
-msgstr "无效的接收者类型%qs"
+msgstr "不同的接收器类型"
 
 #: go/gofrontend/types.cc:2499 go/gofrontend/types.cc:2512
 #: go/gofrontend/types.cc:2527
-#, fuzzy
 msgid "different number of parameters"
-msgstr "一个静态控制部分(ScoP)中参数的最大数量"
+msgstr "形参数量不同"
 
 #: go/gofrontend/types.cc:2520
-#, fuzzy
 msgid "different parameter types"
-msgstr "无效的参数类型%qT"
+msgstr "形参类型不同"
 
 #: go/gofrontend/types.cc:2535
 msgid "different varargs"
-msgstr ""
+msgstr "不同的可变参数"
 
 #: go/gofrontend/types.cc:2544 go/gofrontend/types.cc:2557
 #: go/gofrontend/types.cc:2572
+#, fuzzy
 msgid "different number of results"
-msgstr ""
+msgstr "形参数量不同"
 
 #: go/gofrontend/types.cc:2565
+#, fuzzy
 msgid "different result types"
-msgstr ""
+msgstr "不同的接收器类型"
 
 #: go/gofrontend/types.cc:3546
 #, c-format
 msgid "implicit assignment of %s%s%s hidden field %s%s%s"
-msgstr ""
+msgstr "对%s%s%s的隐式赋值隐藏了字段%s%s%s"
 
 #: go/gofrontend/types.cc:4386
 msgid "bad length when making slice"
-msgstr ""
+msgstr "生成切片时长度错误"
 
 #: go/gofrontend/types.cc:4392
 msgid "bad capacity when making slice"
-msgstr ""
+msgstr "生成切片时容量错误"
 
 #: go/gofrontend/types.cc:5090
 msgid "bad size when making map"
-msgstr ""
+msgstr "生成映射时大小错误"
 
 #: go/gofrontend/types.cc:5375
 msgid "bad buffer size when making channel"
@@ -11588,41 +11518,40 @@
 #: go/gofrontend/types.cc:5870
 #, c-format
 msgid "need explicit conversion; missing method %s%s%s"
-msgstr ""
+msgstr "需要显式转换；缺少方法%s%s%s"
 
 #: go/gofrontend/types.cc:5887 go/gofrontend/types.cc:6022
-#, fuzzy, c-format
+#, c-format
 msgid "incompatible type for method %s%s%s"
-msgstr "%2$qE的第 %1$d 个实参类型不兼容"
+msgstr "方法%s%s%s类型不兼容"
 
 #: go/gofrontend/types.cc:5891 go/gofrontend/types.cc:6026
 #, fuzzy, c-format
 msgid "incompatible type for method %s%s%s (%s)"
-msgstr "%2$qE的第 %1$d 个实参类型不兼容"
+msgstr "方法%s%s%s类型不兼容"
 
 #: go/gofrontend/types.cc:5963 go/gofrontend/types.cc:5976
 msgid "pointer to interface type has no methods"
 msgstr ""
 
 #: go/gofrontend/types.cc:5965 go/gofrontend/types.cc:5978
-#, fuzzy
 msgid "type has no methods"
-msgstr "词法分析方法时出错"
+msgstr "类型没有方法"
 
 #: go/gofrontend/types.cc:5999
-#, fuzzy, c-format
+#, c-format
 msgid "ambiguous method %s%s%s"
-msgstr "有歧义的缩写 %s"
+msgstr "有歧义的方法%s%s%s"
 
 #: go/gofrontend/types.cc:6002
-#, fuzzy, c-format
+#, c-format
 msgid "missing method %s%s%s"
-msgstr "“%s”缺少实参"
+msgstr "缺少方法%s%s%s"
 
 #: go/gofrontend/types.cc:6042
 #, c-format
 msgid "method %s%s%s requires a pointer"
-msgstr ""
+msgstr "方法%s%s%s需要一个指针"
 
 #. Warn about and ignore all others for now, but store them.
 #: attribs.c:306 objc/objc-act.c:4799 objc/objc-act.c:6692
@@ -11896,9 +11825,9 @@
 msgstr "未使用的变量%q+D"
 
 #: c-decl.c:1183
-#, fuzzy, gcc-internal-format
+#, gcc-internal-format
 msgid "variable %qD set but not used"
-msgstr "标号%q+D定义后未使用"