Merge lp:~ams-codesourcery/gcc-linaro/merge-from-fsf-20110811-4.5 into lp:gcc-linaro/4.5

[Andrew Stubbs]

Merge from FSF GCC 4.5 branch.

[Linaro Toolchain Builder (cbuild)]

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

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

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

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

cbuild-snapshot: gcc-linaro-4.5+bzr99535~ams-codesourcery~merge-from-fsf-20110811-4.5
cbuild-ancestor: lp:gcc-linaro+bzr99534
cbuild-state: check

[Michael Hope (michaelh1)]

cbuild successfully built this on x86_64-natty-cbuild159-oort1-x86_64r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99535~ams-codesourcery~merge-from-fsf-20110811-4.5/logs/x86_64-natty-cbuild159-oort1-x86_64r1

+PASS: g++.dg/eh/cond5.C (test for excess errors)
+PASS: g++.dg/eh/cond5.C execution test
+PASS: g++.dg/eh/cond6.C (test for excess errors)
+PASS: g++.dg/eh/cond6.C execution test
-PASS: g++.dg/rtti/anon-ns1.C scan-assembler "*N[^"]+1AE"
+PASS: g++.dg/rtti/anon-ns1.C scan-assembler "*N[^"]+1AE
+PASS: g++.dg/torture/pr49039.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O0 execution test
+PASS: g++.dg/torture/pr49039.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O1 execution test
+PASS: g++.dg/torture/pr49039.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 execution test
+PASS: g++.dg/torture/pr49039.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 -flto execution test
+PASS: g++.dg/torture/pr49039.C -O2 -fwhopr (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 -fwhopr execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-loops (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-loops execution test
+PASS: g++.dg/torture/pr49039.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -g execution test
+PASS: g++.dg/torture/pr49039.C -Os (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -Os execution test
+PASS: g++.dg/torture/pr49115.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O0 execution test
+PASS: g++.dg/torture/pr49115.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O1 execution test
+PASS: g++.dg/torture/pr49115.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 execution test
+PASS: g++.dg/torture/pr49115.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 -flto execution test
+PASS: g++.dg/torture/pr49115.C -O2 -fwhopr (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 -fwhopr execution test
+PASS: g++.dg/torture/pr49115.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O3 -fomit-frame-pointer execution test
+PASS: g++.dg/torture/pr49115.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O3 -g execution test
+PASS: g++.dg/torture/pr49115.C -Os (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -Os execution test
+PASS: g++.dg/torture/pr49615.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O2 (test ...

[Michael Hope (michaelh1)]

cbuild successfully built this on i686-natty-cbuild159-oort2-i686r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99535~ams-codesourcery~merge-from-fsf-20110811-4.5/logs/i686-natty-cbuild159-oort2-i686r1

+PASS: g++.dg/eh/cond5.C (test for excess errors)
+PASS: g++.dg/eh/cond5.C execution test
+PASS: g++.dg/eh/cond6.C (test for excess errors)
+PASS: g++.dg/eh/cond6.C execution test
-PASS: g++.dg/rtti/anon-ns1.C scan-assembler "*N[^"]+1AE"
+PASS: g++.dg/rtti/anon-ns1.C scan-assembler "*N[^"]+1AE
+PASS: g++.dg/torture/pr49039.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O0 execution test
+PASS: g++.dg/torture/pr49039.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O1 execution test
+PASS: g++.dg/torture/pr49039.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 execution test
+PASS: g++.dg/torture/pr49039.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 -flto execution test
+PASS: g++.dg/torture/pr49039.C -O2 -fwhopr (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 -fwhopr execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-loops (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-loops execution test
+PASS: g++.dg/torture/pr49039.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -g execution test
+PASS: g++.dg/torture/pr49039.C -Os (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -Os execution test
+PASS: g++.dg/torture/pr49115.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O0 execution test
+PASS: g++.dg/torture/pr49115.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O1 execution test
+PASS: g++.dg/torture/pr49115.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 execution test
+PASS: g++.dg/torture/pr49115.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 -flto execution test
+PASS: g++.dg/torture/pr49115.C -O2 -fwhopr (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 -fwhopr execution test
+PASS: g++.dg/torture/pr49115.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O3 -fomit-frame-pointer execution test
+PASS: g++.dg/torture/pr49115.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O3 -g execution test
+PASS: g++.dg/torture/pr49115.C -Os (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -Os execution test
+PASS: g++.dg/torture/pr49615.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O2 (test for exce...

[Michael Hope (michaelh1)]

cbuild successfully built this on armv7l-natty-cbuild159-ursa4-cortexa9r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99535~ams-codesourcery~merge-from-fsf-20110811-4.5/logs/armv7l-natty-cbuild159-ursa4-cortexa9r1

+PASS: g++.dg/eh/cond5.C (test for excess errors)
+PASS: g++.dg/eh/cond5.C execution test
+PASS: g++.dg/eh/cond6.C (test for excess errors)
+PASS: g++.dg/eh/cond6.C execution test
-FAIL: g++.dg/rtti/anon-ns1.C scan-assembler "*N[^"]+1AE"
+PASS: g++.dg/rtti/anon-ns1.C scan-assembler "*N[^"]+1AE
+PASS: g++.dg/torture/pr49039.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O0 execution test
+PASS: g++.dg/torture/pr49039.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O1 execution test
+PASS: g++.dg/torture/pr49039.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 execution test
+PASS: g++.dg/torture/pr49039.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 -flto execution test
+PASS: g++.dg/torture/pr49039.C -O2 -fwhopr (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O2 -fwhopr execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions execution test
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-loops (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -fomit-frame-pointer -funroll-loops execution test
+PASS: g++.dg/torture/pr49039.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -O3 -g execution test
+PASS: g++.dg/torture/pr49039.C -Os (test for excess errors)
+PASS: g++.dg/torture/pr49039.C -Os execution test
+PASS: g++.dg/torture/pr49115.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O0 execution test
+PASS: g++.dg/torture/pr49115.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O1 execution test
+PASS: g++.dg/torture/pr49115.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 execution test
+PASS: g++.dg/torture/pr49115.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 -flto execution test
+PASS: g++.dg/torture/pr49115.C -O2 -fwhopr (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O2 -fwhopr execution test
+PASS: g++.dg/torture/pr49115.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O3 -fomit-frame-pointer execution test
+PASS: g++.dg/torture/pr49115.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -O3 -g execution test
+PASS: g++.dg/torture/pr49115.C -Os (test for excess errors)
+PASS: g++.dg/torture/pr49115.C -Os execution test
+PASS: g++.dg/torture/pr49615.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O2 (t...

[Ulrich Weigand (uweigand)]

This is OK.

review: Approve

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2011-08-09 12:53:29 +0000
+++ ChangeLog.linaro	2011-08-11 11:29:04 +0000
@@ -1,3 +1,7 @@
[phone]  Andrew Stubbs  <[e-mail]>
+
+	Merge from FSF 4.5 branch r177552 (pre 4.5.4).
+
 2011-08-09  Revital Eres  <[e-mail]>
 
 	gcc/

=== modified file 'boehm-gc/ChangeLog'
--- boehm-gc/ChangeLog	2011-04-28 14:09:54 +0000
+++ boehm-gc/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,12 @@
[phone]  Rainer Orth  <[e-mail]>
+
+	PR boehm-gc/49381
+	Backport from mainline:
+	2011-01-31  Rainer Orth  <[e-mail]>
+
+	* configure.ac (*-*-solaris2*): Add -lrt to THREADLIBS.
+	* configure: Regenerate.
+
 2011-04-28  Release Manager
 
 	* GCC 4.5.3 released.

=== modified file 'boehm-gc/configure'
--- boehm-gc/configure	2010-06-15 12:52:58 +0000
+++ boehm-gc/configure	2011-08-11 11:29:04 +0000
@@ -14910,7 +14910,9 @@
 	# The alternate thread library was only introduced in Solaris 8 and
 	# became the default in Solaris 9, so no need for the special code
 	# above otherwise.
-	THREADLIBS=-lpthread
+	# nanosleep, sched_yield, and sem_* only live in librt before
+	# Solaris 11.
+	THREADLIBS="-lpthread -lrt"
 	;;
      *-*-irix*)
 

=== modified file 'boehm-gc/configure.ac'
--- boehm-gc/configure.ac	2010-06-15 12:52:58 +0000
+++ boehm-gc/configure.ac	2011-08-11 11:29:04 +0000
@@ -193,7 +193,9 @@
 	# The alternate thread library was only introduced in Solaris 8 and
 	# became the default in Solaris 9, so no need for the special code
 	# above otherwise.
-	THREADLIBS=-lpthread
+	# nanosleep, sched_yield, and sem_* only live in librt before
+	# Solaris 11.
+	THREADLIBS="-lpthread -lrt"
 	;;
      *-*-irix*)
 	AC_DEFINE(GC_IRIX_THREADS,1,[support for Irix pthreads])

=== modified file 'gcc/ChangeLog'
--- gcc/ChangeLog	2011-06-28 21:56:48 +0000
+++ gcc/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,212 @@
[phone]  Uros Bizjak  <[e-mail]>
+
+	PR target/50001
+	* config/alpha/alpha.c (alpha_instantiate_decls): New function.
+	(TARGET_INSTANTIATE_DECLS): New define.
+
[phone]  Sebastien Bourdeauducq  <[e-mail]>
+
+	* config/lm32/t-lm32: Add missing multilibs.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	PR target/49920
+	* config/i386/i386.md (strset): Do not expand strset_singleop
+	when %eax or $edi are fixed.
+	(*strsetdi_rex_1): Disable when %eax or %edi are fixed.
+	(*strsetsi_1): Ditto.
+	(*strsetsi_rex_1): Ditto.
+	(*strsethi_1): Ditto.
+	(*strsethi_rex_1): Ditto.
+	(*strsetqi_1): Ditto.
+	(*strsetqi_rex_1): Ditto.
+	(*rep_stosdi_rex64): Disable when %eax, %ecx or %edi are fixed.
+	(*rep_stossi): Ditto.
+	(*rep_stossi_rex64): Ditto.
+	(*rep_stosqi): Ditto.
+	(*rep_stosqi_rex64): Ditto.
+	(*strlenqi_1): Ditto.
+	(*strlenqi_rex_1): Ditto.
+	(cmpstrnsi): Also fail when %ecx is fixed.
+	(*cmpstrnqi_nz_1): Disable when %ecx, %esi or %edi are fixed.
+	(*cmpstrnqi_nz_rex_1): Ditto.
+	(*cmpstrnqi_1): Ditto.
+	(*cmpstrnqi_rex_1): Ditto.
+	(*strmovdi_rex_1): Disable when %esi or %edi are fixed.
+	(*strmovsi_1): Ditto.
+	(*strmovsi_rex_1): Ditto.
+	(*strmovhi_1): Ditto.
+	(*strmovhi_rex_1): Ditto.
+	(*strmovqi_1): Ditto.
+	(*strmovqi_rex_1): Ditto.
+	(*rep_movdi_rex64): Disable when %ecx, %esi or %edi are fixed.
+	(*rep_movsi): Ditto.
+	(*rep_movsi_rex64): Ditto.
+	(*rep_movqi): Ditto.
+	(*rep_movqi_rex64): Ditto.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	PR target/47364
+	* config/i386/i386.md (strlensi): Enable for !TARGET_64BIT only.
+	(strlendi): Enable for TARGET_64BIT only.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	Backport from mainline
+	2011-07-08  Jakub Jelinek  <[e-mail]>
+
+	PR target/49621
+	* config/rs6000/rs6000.c (rs6000_emit_vector_cond_expr): Use
+	CONST0_RTX (dest_mode) instead of const0_rtx as second operand
+	of NE.
+	* config/rs6000/vector.md (vector_select_<mode>,
+	vector_select_<mode>_uns): Change second operand of NE to
+	CONST0_RTX (<MODE>mode) instead of const0_rtx.
+	* config/rs6000/altivec.md (*altivec_vsel<mode>,
+	*altivec_vsel<mode>_uns): Expect second operand of NE to be
+	zero_constant of the corresponding vector mode.
+	* config/rs6000/vsx.md (*vsx_xxsel<mode>, *vsx_xxsel<mode>_uns):
+	Likewise.
+
+	2011-07-07  Jakub Jelinek  <[e-mail]>
+
+	PR c/49644
+	* c-typeck.c (build_binary_op): For MULT_EXPR and TRUNC_DIV_EXPR with
+	one non-complex and one complex argument, call c_save_expr on both
+	operands.
+
+	PR middle-end/49640
+	* gimplify.c (gimplify_compound_lval): For last 2 ARRAY_*REF
+	operands and last COMPONENT_REF operand call gimplify_expr on it
+	if non-NULL.
+
+	2011-07-04  Jakub Jelinek  <[e-mail]>
+
+	PR rtl-optimization/49619
+	* combine.c (combine_simplify_rtx): In PLUS -> IOR simplification
+	pass VOIDmode as op0_mode to recursive call.
+
+	2011-05-27  Jakub Jelinek  <[e-mail]>
+
+	PR c++/49165
+	* c-common.c (c_common_truthvalue_conversion) <case COND_EXPR>: For
+	C++ don't call c_common_truthvalue_conversion on void type arms.
+
+	2011-05-26  Jakub Jelinek  <[e-mail]>
+
+	PR c++/49165
+	* gimplify.c (shortcut_cond_r): Don't special case
+	COND_EXPRs if they have void type on one of their arms.
+
+	PR tree-optimization/49161
+	* tree-vrp.c (struct case_info): New type.
+	(compare_case_labels): Sort case_info structs instead of
+	trees, and not primarily by CASE_LABEL uids but by
+	label_for_block indexes.
+	(find_switch_asserts): Put case labels into struct case_info
+	array instead of TREE_VEC, adjust sorting, compare label_for_block
+	values instead of CASE_LABELs.
+
+	2011-05-23  Jakub Jelinek  <[e-mail]>
+
+	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.
+
+	2011-05-18  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]  John David Anglin  <[e-mail]>
+
+	PR target/49746
+	Revert:
+	2010-12-30  John David Anglin  <[e-mail]>
+
+	* config/pa/pa.md: Add ",*" condition to 64-bit add/subtract boolean
+	patterns.
+
[phone]  John David Anglin  <[e-mail]>
+
+	PR target/49723
+	* config/pa/pa.md (casesi): Use gen_int_mode instead of GEN_INT.
+
[phone]  Andrey Belevantsev  <[e-mail]>
+
+	Backport from mainline
+	2011-05-25  Andrey Belevantsev  <[e-mail]>
+
+	PR rtl-optimization/49014
+	* config/i386/athlon.md (athlon_ssecomi): Change type to ssecomi.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	PR target/49660
+	* config/sparc/sol2.h [TARGET_64BIT_DEFAULT] (TARGET_DEFAULT): Add
+	MASK_V8PLUS, remove commented out flag and reorder.
+
+	Backport from mainline
+	2011-06-28  Rainer Orth  <[e-mail]>
+
+	* config/sparc/sol2-64.h (TARGET_DEFAULT): Remove.
+	(TARGET_64BIT_DEFAULT): Define.
+	* config.gcc (sparc*-*-solaris2*): Move sparc/sol2-64.h to front
+	of tm_file.
+	* config/sparc/sol2.h [TARGET_64BIT_DEFAULT] (TARGET_DEFAULT): Define.
+
[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.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	Backport from mainline
+	2011-05-23  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/49115
+	* tree-ssa-dce.c (mark_aliased_reaching_defs_necessary_1): Likewise.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/49615
+	* tree-cfgcleanup.c (split_bbs_on_noreturn_calls): Fix
+	basic-block index check.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	PR tree-optimization/49572
+	* tree-ssa-dom.c (initialize_hash_element) <GIMPLE_SINGLE_RHS>: Use the
+	type of the RHS instead of that of the LHS for the expression type.
+
[phone]  Jack Howarth  <[e-mail]>
+
+	Backport from mainline
+	2011-02-07 Mike Stump  <[e-mail]>
+
+	PR target/42333
+	Add __ieee_divdc3 entry point.
+	* config/i386/darwin.h (DECLARE_LIBRARY_RENAMES): Retain ___divdc3
+	entry point.
+	(SUBTARGET_INIT_BUILTINS): Call darwin_rename_builtins.
+	* config/i386/i386.c (TARGET_INIT_LIBFUNCS): Likewise.
+	* config/darwin.c (darwin_rename_builtins): Add.
+	* config/darwin-protos.h (darwin_rename_builtins): Add.
+
 2011-06-28  Eric Botcazou  <[e-mail]>
 
 	* tree-ssa-dom.c (initialize_hash_element): Fix oversight.
@@ -15,7 +224,7 @@
 
 2011-06-16  Kaz Kojima  <[e-mail]>
 
-	Backport form main line
+	Backport from mainline
 	2011-06-09  Kaz Kojima  <[e-mail]>
 
 	PR target/49307

=== modified file 'gcc/DATESTAMP'
--- gcc/DATESTAMP	2011-06-30 00:17:21 +0000
+++ gcc/DATESTAMP	2011-08-11 11:29:04 +0000
@@ -1,1 +1,1 @@
-20110630
[phone]

=== modified file 'gcc/ada/ChangeLog'
--- gcc/ada/ChangeLog	2011-04-28 14:11:33 +0000
+++ gcc/ada/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,8 @@
[phone]  John David Anglin  <[e-mail]>
+
+	PR ada/46350
+	* s-taprop-hpux-dce.adb (Abort_Task): Remove unnecessary cast.
+
 2011-04-28  Release Manager
 
 	* GCC 4.5.3 released.

=== modified file 'gcc/ada/s-taprop-hpux-dce.adb'
--- gcc/ada/s-taprop-hpux-dce.adb	2009-11-30 10:45:39 +0000
+++ gcc/ada/s-taprop-hpux-dce.adb	2011-08-11 11:29:04 +0000
@@ -888,8 +888,7 @@
 
       if T.Common.State = Interrupt_Server_Blocked_On_Event_Flag then
          System.Interrupt_Management.Operations.Interrupt_Self_Process
-           (System.Interrupt_Management.Interrupt_ID
-             (PIO.Get_Interrupt_ID (T)));
+           (PIO.Get_Interrupt_ID (T));
       end if;
    end Abort_Task;
 

=== modified file 'gcc/c-common.c'
--- gcc/c-common.c	2011-04-28 16:13:24 +0000
+++ gcc/c-common.c	2011-08-11 11:29:04 +0000
@@ -4031,14 +4031,15 @@
       /* Distribute the conversion into the arms of a COND_EXPR.  */
       if (c_dialect_cxx ())
 	{
+	  tree op1 = TREE_OPERAND (expr, 1);
+	  tree op2 = TREE_OPERAND (expr, 2);
+	  /* In C++ one of the arms might have void type if it is throw.  */
+	  if (!VOID_TYPE_P (TREE_TYPE (op1)))
+	    op1 = c_common_truthvalue_conversion (location, op1);
+	  if (!VOID_TYPE_P (TREE_TYPE (op2)))
+	    op2 = c_common_truthvalue_conversion (location, op2);
 	  expr = fold_build3_loc (location, COND_EXPR, truthvalue_type_node,
-			      TREE_OPERAND (expr, 0),
-			      c_common_truthvalue_conversion (location,
-							      TREE_OPERAND (expr,
-									    1)),
-			      c_common_truthvalue_conversion (location,
-							      TREE_OPERAND (expr,
-									    2)));
+				  TREE_OPERAND (expr, 0), op1, op2);
 	  goto ret;
 	}
       else

=== modified file 'gcc/c-decl.c'
--- gcc/c-decl.c	2010-11-11 20:40:32 +0000
+++ gcc/c-decl.c	2011-08-11 11:29:04 +0000
@@ -3909,7 +3909,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/c-typeck.c'
--- gcc/c-typeck.c	2011-05-05 14:28:53 +0000
+++ gcc/c-typeck.c	2011-08-11 11:29:04 +0000
@@ -9671,6 +9671,7 @@
 		{
 		case MULT_EXPR:
 		case TRUNC_DIV_EXPR:
+		  op1 = c_save_expr (op1);
 		  imag = build2 (resultcode, real_type, imag, op1);
 		  /* Fall through.  */
 		case PLUS_EXPR:
@@ -9691,6 +9692,7 @@
 	      switch (code)
 		{
 		case MULT_EXPR:
+		  op0 = c_save_expr (op0);
 		  imag = build2 (resultcode, real_type, op0, imag);
 		  /* Fall through.  */
 		case PLUS_EXPR:

=== modified file 'gcc/combine.c'
--- gcc/combine.c	2011-04-14 13:58:12 +0000
+++ gcc/combine.c	2011-08-11 11:29:04 +0000
@@ -5313,7 +5313,7 @@
 	{
 	  /* Try to simplify the expression further.  */
 	  rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x, 1));
-	  temp = combine_simplify_rtx (tor, mode, in_dest, 0);
+	  temp = combine_simplify_rtx (tor, VOIDmode, in_dest, 0);
 
 	  /* If we could, great.  If not, do not go ahead with the IOR
 	     replacement, since PLUS appears in many special purpose

=== modified file 'gcc/config.gcc'
--- gcc/config.gcc	2011-04-09 12:46:16 +0000
+++ gcc/config.gcc	2011-08-11 11:29:04 +0000
@@ -2449,7 +2449,7 @@
 	tm_file="${tm_file} sparc/sol2.h"
 	case ${target} in
 	    sparc64-*-* | sparcv9-*-*)
-		tm_file="${tm_file} sparc/sol2-64.h"
+		tm_file="sparc/sol2-64.h ${tm_file}"
 		;;
 	    *)
 		test x$with_cpu != x || with_cpu=v9

=== modified file 'gcc/config/alpha/alpha.c'
--- gcc/config/alpha/alpha.c	2010-08-03 17:44:56 +0000
+++ gcc/config/alpha/alpha.c	2011-08-11 11:29:04 +0000
@@ -4915,6 +4915,13 @@
   return m;
 }
 
+static void
+alpha_instantiate_decls (void)
+{
+  if (cfun->machine->gp_save_rtx != NULL_RTX)
+    instantiate_decl_rtl (cfun->machine->gp_save_rtx);
+}
+
 static int
 alpha_ra_ever_killed (void)
 {
@@ -11125,6 +11132,9 @@
 #undef TARGET_TRAMPOLINE_INIT
 #define TARGET_TRAMPOLINE_INIT alpha_trampoline_init
 
+#undef TARGET_INSTANTIATE_DECLS
+#define TARGET_INSTANTIATE_DECLS alpha_instantiate_decls
+
 #undef TARGET_SECONDARY_RELOAD
 #define TARGET_SECONDARY_RELOAD alpha_secondary_reload
 

=== modified file 'gcc/config/darwin-protos.h'
--- gcc/config/darwin-protos.h	2010-06-24 20:06:37 +0000
+++ gcc/config/darwin-protos.h	2011-08-11 11:29:04 +0000
@@ -93,3 +93,4 @@
 extern bool darwin_kextabi_p (void);
 extern void darwin_override_options (void);
 extern void darwin_patch_builtins (void);
+extern void darwin_rename_builtins (void);

=== modified file 'gcc/config/darwin.c'
--- gcc/config/darwin.c	2010-06-24 20:06:37 +0000
+++ gcc/config/darwin.c	2011-08-11 11:29:04 +0000
@@ -337,6 +337,34 @@
 
 /* Return a hash value for a SLOT in the indirections hash table.  */
 
+void
+darwin_rename_builtins (void)
+{
+  /* The system ___divdc3 routine in libSystem on darwin10 is not
+     accurate to 1ulp, ours is, so we avoid ever using the system name
+     for this routine and instead install a non-conflicting name that
+     is accurate.
+
+     When -ffast-math or -funsafe-math-optimizations is given, we can
+     use the faster version.  */
+  if (!flag_unsafe_math_optimizations)
+    {
+      int dcode = (BUILT_IN_COMPLEX_DIV_MIN
+		   + DCmode - MIN_MODE_COMPLEX_FLOAT);
+      tree fn = built_in_decls[dcode];
+      /* Fortran and c call TARGET_INIT_BUILTINS and
+	 TARGET_INIT_LIBFUNCS at different times, so we have to put a
+	 call into each to ensure that at least one of them is called
+	 after build_common_builtin_nodes.  A better fix is to add a
+	 new hook to run after build_common_builtin_nodes runs.  */
+      if (fn)
+	set_user_assembler_name (fn, "___ieee_divdc3");
+      fn = implicit_built_in_decls[dcode];
+      if (fn)
+	set_user_assembler_name (fn, "___ieee_divdc3");
+    }
+}
+
 static hashval_t
 machopic_indirection_hash (const void *slot)
 {

=== modified file 'gcc/config/i386/athlon.md'
--- gcc/config/i386/athlon.md	2009-04-21 18:03:23 +0000
+++ gcc/config/i386/athlon.md	2011-08-11 11:29:04 +0000
@@ -798,7 +798,7 @@
 			 "athlon-direct,athlon-fploadk8,athlon-fadd")
 (define_insn_reservation "athlon_ssecomi" 4
 			 (and (eq_attr "cpu" "athlon,k8,generic64")
-			      (eq_attr "type" "ssecmp"))
+			      (eq_attr "type" "ssecomi"))
 			 "athlon-vector,athlon-fpsched,athlon-fadd")
 (define_insn_reservation "athlon_ssecomi_amdfam10" 3
 			 (and (eq_attr "cpu" "amdfam10")

=== modified file 'gcc/config/i386/darwin.h'
--- gcc/config/i386/darwin.h	2010-09-10 16:12:46 +0000
+++ gcc/config/i386/darwin.h	2011-08-11 11:29:04 +0000
@@ -302,3 +302,17 @@
 #define MACHO_SYMBOL_FLAG_VARIABLE ((SYMBOL_FLAG_MACH_DEP) << 3)
 
 #define SUBTARGET32_DEFAULT_CPU "i686"
+
+#define SUBTARGET_INIT_BUILTINS					\
+do {								\
+  darwin_rename_builtins ();					\
+} while(0)
+ 
+/* The system ___divdc3 routine in libSystem on darwin10 is not
+   accurate to 1ulp, ours is, so we avoid ever using the system name
+   for this routine and instead install a non-conflicting name that is
+   accurate.  See darwin_rename_builtins.  */
+#ifdef L_divdc3
+#define DECLARE_LIBRARY_RENAMES \
+  asm(".text; ___divdc3: jmp ___ieee_divdc3 ; .globl ___divdc3");
+#endif

=== modified file 'gcc/config/i386/i386.c'
--- gcc/config/i386/i386.c	2011-05-26 14:33:37 +0000
+++ gcc/config/i386/i386.c	2011-08-11 11:29:04 +0000
@@ -30645,6 +30645,11 @@
 #undef TARGET_ASM_CODE_END
 #define TARGET_ASM_CODE_END ix86_code_end
 
+#if TARGET_MACHO
+#undef TARGET_INIT_LIBFUNCS
+#define TARGET_INIT_LIBFUNCS darwin_rename_builtins
+#endif
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 

 #include "gt-i386.h"

=== modified file 'gcc/config/i386/i386.md'
--- gcc/config/i386/i386.md	2011-05-26 14:33:37 +0000
+++ gcc/config/i386/i386.md	2011-08-11 11:29:04 +0000
@@ -17689,7 +17689,8 @@
    (set (match_operand:DI 1 "register_operand" "=S")
 	(plus:DI (match_dup 3)
 		 (const_int 8)))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movsq"
   [(set_attr "type" "str")
    (set_attr "mode" "DI")
@@ -17704,7 +17705,8 @@
    (set (match_operand:SI 1 "register_operand" "=S")
 	(plus:SI (match_dup 3)
 		 (const_int 4)))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movs{l|d}"
   [(set_attr "type" "str")
    (set_attr "mode" "SI")
@@ -17719,7 +17721,8 @@
    (set (match_operand:DI 1 "register_operand" "=S")
 	(plus:DI (match_dup 3)
 		 (const_int 4)))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movs{l|d}"
   [(set_attr "type" "str")
    (set_attr "mode" "SI")
@@ -17734,7 +17737,8 @@
    (set (match_operand:SI 1 "register_operand" "=S")
 	(plus:SI (match_dup 3)
 		 (const_int 2)))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movsw"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
@@ -17749,7 +17753,8 @@
    (set (match_operand:DI 1 "register_operand" "=S")
 	(plus:DI (match_dup 3)
 		 (const_int 2)))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movsw"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
@@ -17764,7 +17769,8 @@
    (set (match_operand:SI 1 "register_operand" "=S")
 	(plus:SI (match_dup 3)
 		 (const_int 1)))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movsb"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
@@ -17779,7 +17785,8 @@
    (set (match_operand:DI 1 "register_operand" "=S")
 	(plus:DI (match_dup 3)
 		 (const_int 1)))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movsb"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
@@ -17810,7 +17817,8 @@
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "rep{%;} movsq"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -17829,7 +17837,8 @@
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "rep{%;} movs{l|d}"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -17848,7 +17857,8 @@
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "rep{%;} movs{l|d}"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -17865,7 +17875,8 @@
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "rep{%;} movsb"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -17882,7 +17893,8 @@
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "rep{%;} movsb"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -17942,7 +17954,9 @@
   operands[3] = gen_rtx_PLUS (Pmode, operands[0],
 			      GEN_INT (GET_MODE_SIZE (GET_MODE
 						      (operands[2]))));
-  if (TARGET_SINGLE_STRINGOP || optimize_insn_for_size_p ())
+  /* Can't use this if the user has appropriated eax or edi.  */
+  if ((TARGET_SINGLE_STRINGOP || optimize_insn_for_size_p ())
+      && !(fixed_regs[AX_REG] || fixed_regs[DI_REG]))
     {
       emit_insn (gen_strset_singleop (operands[0], operands[1], operands[2],
 				      operands[3]));
@@ -17964,7 +17978,8 @@
    (set (match_operand:DI 0 "register_operand" "=D")
 	(plus:DI (match_dup 1)
 		 (const_int 8)))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stosq"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -17976,7 +17991,8 @@
    (set (match_operand:SI 0 "register_operand" "=D")
 	(plus:SI (match_dup 1)
 		 (const_int 4)))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stos{l|d}"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -17988,7 +18004,8 @@
    (set (match_operand:DI 0 "register_operand" "=D")
 	(plus:DI (match_dup 1)
 		 (const_int 4)))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stos{l|d}"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -18000,7 +18017,8 @@
    (set (match_operand:SI 0 "register_operand" "=D")
 	(plus:SI (match_dup 1)
 		 (const_int 2)))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stosw"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -18012,7 +18030,8 @@
    (set (match_operand:DI 0 "register_operand" "=D")
 	(plus:DI (match_dup 1)
 		 (const_int 2)))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stosw"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -18024,7 +18043,8 @@
    (set (match_operand:SI 0 "register_operand" "=D")
 	(plus:SI (match_dup 1)
 		 (const_int 1)))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stosb"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -18036,7 +18056,8 @@
    (set (match_operand:DI 0 "register_operand" "=D")
 	(plus:DI (match_dup 1)
 		 (const_int 1)))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stosb"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -18063,7 +18084,8 @@
 	(const_int 0))
    (use (match_operand:DI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "rep{%;} stosq"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -18080,7 +18102,8 @@
 	(const_int 0))
    (use (match_operand:SI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "rep{%;} stos{l|d}"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -18097,7 +18120,8 @@
 	(const_int 0))
    (use (match_operand:SI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "rep{%;} stos{l|d}"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -18113,7 +18137,8 @@
 	(const_int 0))
    (use (match_operand:QI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "rep{%;} stosb"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -18129,7 +18154,8 @@
 	(const_int 0))
    (use (match_operand:QI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "rep{%;} stosb"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -18150,8 +18176,8 @@
   if (optimize_insn_for_size_p () && !TARGET_INLINE_ALL_STRINGOPS)
     FAIL;
 
-  /* Can't use this if the user has appropriated esi or edi.  */
-  if (fixed_regs[SI_REG] || fixed_regs[DI_REG])
+  /* Can't use this if the user has appropriated ecx, esi or edi.  */
+  if (fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])
     FAIL;
 
   out = operands[0];
@@ -18245,7 +18271,8 @@
    (clobber (match_operand:SI 0 "register_operand" "=S"))
    (clobber (match_operand:SI 1 "register_operand" "=D"))
    (clobber (match_operand:SI 2 "register_operand" "=c"))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "repz{%;} cmpsb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
@@ -18260,7 +18287,8 @@
    (clobber (match_operand:DI 0 "register_operand" "=S"))
    (clobber (match_operand:DI 1 "register_operand" "=D"))
    (clobber (match_operand:DI 2 "register_operand" "=c"))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "repz{%;} cmpsb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
@@ -18296,7 +18324,8 @@
    (clobber (match_operand:SI 0 "register_operand" "=S"))
    (clobber (match_operand:SI 1 "register_operand" "=D"))
    (clobber (match_operand:SI 2 "register_operand" "=c"))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "repz{%;} cmpsb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
@@ -18314,7 +18343,8 @@
    (clobber (match_operand:DI 0 "register_operand" "=S"))
    (clobber (match_operand:DI 1 "register_operand" "=D"))
    (clobber (match_operand:DI 2 "register_operand" "=c"))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "repz{%;} cmpsb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
@@ -18326,7 +18356,7 @@
 	(unspec:SI [(match_operand:BLK 1 "general_operand" "")
 		    (match_operand:QI 2 "immediate_operand" "")
 		    (match_operand 3 "immediate_operand" "")] UNSPEC_SCAS))]
-  ""
+  "!TARGET_64BIT"
 {
  if (ix86_expand_strlen (operands[0], operands[1], operands[2], operands[3]))
    DONE;
@@ -18339,7 +18369,7 @@
 	(unspec:DI [(match_operand:BLK 1 "general_operand" "")
 		    (match_operand:QI 2 "immediate_operand" "")
 		    (match_operand 3 "immediate_operand" "")] UNSPEC_SCAS))]
-  ""
+  "TARGET_64BIT"
 {
  if (ix86_expand_strlen (operands[0], operands[1], operands[2], operands[3]))
    DONE;
@@ -18362,7 +18392,8 @@
 		    (match_operand:SI 4 "register_operand" "0")] UNSPEC_SCAS))
    (clobber (match_operand:SI 1 "register_operand" "=D"))
    (clobber (reg:CC FLAGS_REG))]
-  "!TARGET_64BIT"
+  "!TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "repnz{%;} scasb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
@@ -18376,7 +18407,8 @@
 		    (match_operand:DI 4 "register_operand" "0")] UNSPEC_SCAS))
    (clobber (match_operand:DI 1 "register_operand" "=D"))
    (clobber (reg:CC FLAGS_REG))]
-  "TARGET_64BIT"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "repnz{%;} scasb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")

=== modified file 'gcc/config/lm32/t-lm32'
--- gcc/config/lm32/t-lm32	2010-03-30 09:26:24 +0000
+++ gcc/config/lm32/t-lm32	2011-08-11 11:29:04 +0000
@@ -1,2 +1,2 @@
 # for multilib
-MULTILIB_OPTIONS = mmultiply-enabled mbarrel-shift-enabled
+MULTILIB_OPTIONS = mbarrel-shift-enabled mmultiply-enabled mdivide-enabled msign-extend-enabled

=== modified file 'gcc/config/pa/pa.md'
--- gcc/config/pa/pa.md	2011-04-30 00:15:43 +0000
+++ gcc/config/pa/pa.md	2011-08-11 11:29:04 +0000
@@ -811,7 +811,7 @@
 			 (match_operand:DI 3 "arith11_operand" "rI"))
 		 (match_operand:DI 1 "register_operand" "r")))]
   "TARGET_64BIT"
-  "sub%I3,* %3,%2,%%r0\;add,dc %%r0,%1,%0"
+  "sub%I3 %3,%2,%%r0\;add,dc %%r0,%1,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -833,7 +833,7 @@
 			 (match_operand:DI 3 "register_operand" "r"))
 		 (match_operand:DI 1 "register_operand" "r")))]
   "TARGET_64BIT"
-  "sub,* %2,%3,%%r0\;add,dc %%r0,%1,%0"
+  "sub %2,%3,%%r0\;add,dc %%r0,%1,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -856,7 +856,7 @@
 			 (match_operand:DI 3 "int11_operand" "I"))
 		 (match_operand:DI 1 "register_operand" "r")))]
   "TARGET_64BIT"
-  "addi,* %k3,%2,%%r0\;add,dc %%r0,%1,%0"
+  "addi %k3,%2,%%r0\;add,dc %%r0,%1,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -902,7 +902,7 @@
 		  (gtu:DI (match_operand:DI 2 "register_operand" "r")
 			  (match_operand:DI 3 "arith11_operand" "rI"))))]
   "TARGET_64BIT"
-  "sub%I3,* %3,%2,%%r0\;sub,db %1,%%r0,%0"
+  "sub%I3 %3,%2,%%r0\;sub,db %1,%%r0,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -924,7 +924,7 @@
 				    (match_operand:DI 3 "arith11_operand" "rI")))
 		  (match_operand:DI 4 "register_operand" "r")))]
   "TARGET_64BIT"
-  "sub%I3,* %3,%2,%%r0\;sub,db %1,%4,%0"
+  "sub%I3 %3,%2,%%r0\;sub,db %1,%4,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -946,7 +946,7 @@
 		  (ltu:DI (match_operand:DI 2 "register_operand" "r")
 			  (match_operand:DI 3 "register_operand" "r"))))]
   "TARGET_64BIT"
-  "sub,* %2,%3,%%r0\;sub,db %1,%%r0,%0"
+  "sub %2,%3,%%r0\;sub,db %1,%%r0,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -968,7 +968,7 @@
 				    (match_operand:DI 3 "register_operand" "r")))
 		  (match_operand:DI 4 "register_operand" "r")))]
   "TARGET_64BIT"
-  "sub,* %2,%3,%%r0\;sub,db %1,%4,%0"
+  "sub %2,%3,%%r0\;sub,db %1,%4,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -991,7 +991,7 @@
 		  (leu:DI (match_operand:DI 2 "register_operand" "r")
 			  (match_operand:DI 3 "int11_operand" "I"))))]
   "TARGET_64BIT"
-  "addi,* %k3,%2,%%r0\;sub,db %1,%%r0,%0"
+  "addi %k3,%2,%%r0\;sub,db %1,%%r0,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -1013,7 +1013,7 @@
 				    (match_operand:DI 3 "int11_operand" "I")))
 		  (match_operand:DI 4 "register_operand" "r")))]
   "TARGET_64BIT"
-  "addi,* %k3,%2,%%r0\;sub,db %1,%4,%0"
+  "addi %k3,%2,%%r0\;sub,db %1,%4,%0"
   [(set_attr "type" "binary")
    (set_attr "length" "8")])
 
@@ -7126,7 +7126,7 @@
     {
       rtx index = gen_reg_rtx (SImode);
 
-      operands[1] = GEN_INT (-INTVAL (operands[1]));
+      operands[1] = gen_int_mode (-INTVAL (operands[1]), SImode);
       if (!INT_14_BITS (operands[1]))
 	operands[1] = force_reg (SImode, operands[1]);
       emit_insn (gen_addsi3 (index, operands[0], operands[1]));

=== modified file 'gcc/config/rs6000/altivec.md'
--- gcc/config/rs6000/altivec.md	2011-02-04 16:31:48 +0000
+++ gcc/config/rs6000/altivec.md	2011-08-11 11:29:04 +0000
@@ -497,7 +497,7 @@
   [(set (match_operand:VM 0 "altivec_register_operand" "=v")
 	(if_then_else:VM
 	 (ne:CC (match_operand:VM 1 "altivec_register_operand" "v")
-		(const_int 0))
+		(match_operand:VM 4 "zero_constant" ""))
 	 (match_operand:VM 2 "altivec_register_operand" "v")
 	 (match_operand:VM 3 "altivec_register_operand" "v")))]
   "VECTOR_MEM_ALTIVEC_P (<MODE>mode)"
@@ -508,7 +508,7 @@
   [(set (match_operand:VM 0 "altivec_register_operand" "=v")
 	(if_then_else:VM
 	 (ne:CCUNS (match_operand:VM 1 "altivec_register_operand" "v")
-		   (const_int 0))
+		   (match_operand:VM 4 "zero_constant" ""))
 	 (match_operand:VM 2 "altivec_register_operand" "v")
 	 (match_operand:VM 3 "altivec_register_operand" "v")))]
   "VECTOR_MEM_ALTIVEC_P (<MODE>mode)"

=== modified file 'gcc/config/rs6000/rs6000.c'
--- gcc/config/rs6000/rs6000.c	2011-05-26 14:33:37 +0000
+++ gcc/config/rs6000/rs6000.c	2011-08-11 11:29:04 +0000
@@ -16007,7 +16007,7 @@
       op_false = tmp;
     }
 
-  cond2 = gen_rtx_fmt_ee (NE, cc_mode, mask, const0_rtx);
+  cond2 = gen_rtx_fmt_ee (NE, cc_mode, mask, CONST0_RTX (dest_mode));
   emit_insn (gen_rtx_SET (VOIDmode,
 			  dest,
 			  gen_rtx_IF_THEN_ELSE (dest_mode,

=== modified file 'gcc/config/rs6000/vector.md'
--- gcc/config/rs6000/vector.md	2011-02-04 16:31:48 +0000
+++ gcc/config/rs6000/vector.md	2011-08-11 11:29:04 +0000
@@ -447,21 +447,21 @@
   [(set (match_operand:VEC_L 0 "vlogical_operand" "")
 	(if_then_else:VEC_L
 	 (ne:CC (match_operand:VEC_L 3 "vlogical_operand" "")
-		(const_int 0))
+		(match_dup 4))
 	 (match_operand:VEC_L 2 "vlogical_operand" "")
 	 (match_operand:VEC_L 1 "vlogical_operand" "")))]
   "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)"
-  "")
+  "operands[4] = CONST0_RTX (<MODE>mode);")
 
 (define_expand "vector_select_<mode>_uns"
   [(set (match_operand:VEC_L 0 "vlogical_operand" "")
 	(if_then_else:VEC_L
 	 (ne:CCUNS (match_operand:VEC_L 3 "vlogical_operand" "")
-		   (const_int 0))
+		   (match_dup 4))
 	 (match_operand:VEC_L 2 "vlogical_operand" "")
 	 (match_operand:VEC_L 1 "vlogical_operand" "")))]
   "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)"
-  "")
+  "operands[4] = CONST0_RTX (<MODE>mode);")
 
 ;; Expansions that compare vectors producing a vector result and a predicate,
 ;; setting CR6 to indicate a combined status

=== modified file 'gcc/config/rs6000/vsx.md'
--- gcc/config/rs6000/vsx.md	2011-02-04 16:31:48 +0000
+++ gcc/config/rs6000/vsx.md	2011-08-11 11:29:04 +0000
@@ -844,7 +844,7 @@
   [(set (match_operand:VSX_L 0 "vsx_register_operand" "=<VSr>,?wa")
 	(if_then_else:VSX_L
 	 (ne:CC (match_operand:VSX_L 1 "vsx_register_operand" "<VSr>,wa")
-		(const_int 0))
+		(match_operand:VSX_L 4 "zero_constant" ""))
 	 (match_operand:VSX_L 2 "vsx_register_operand" "<VSr>,wa")
 	 (match_operand:VSX_L 3 "vsx_register_operand" "<VSr>,wa")))]
   "VECTOR_MEM_VSX_P (<MODE>mode)"
@@ -855,7 +855,7 @@
   [(set (match_operand:VSX_L 0 "vsx_register_operand" "=<VSr>,?wa")
 	(if_then_else:VSX_L
 	 (ne:CCUNS (match_operand:VSX_L 1 "vsx_register_operand" "<VSr>,wa")
-		   (const_int 0))
+		   (match_operand:VSX_L 4 "zero_constant" ""))
 	 (match_operand:VSX_L 2 "vsx_register_operand" "<VSr>,wa")
 	 (match_operand:VSX_L 3 "vsx_register_operand" "<VSr>,wa")))]
   "VECTOR_MEM_VSX_P (<MODE>mode)"

=== modified file 'gcc/config/sparc/sol2-64.h'
--- gcc/config/sparc/sol2-64.h	2010-03-02 23:35:12 +0000
+++ gcc/config/sparc/sol2-64.h	2011-08-11 11:29:04 +0000
@@ -1,7 +1,7 @@
 /* Definitions of target machine for GCC, for bi-arch SPARC
    running Solaris 2, defaulting to 64-bit code generation.
 
-   Copyright (C) 1999, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -19,7 +19,4 @@
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-#undef TARGET_DEFAULT
-#define TARGET_DEFAULT \
-  (MASK_V9 + MASK_PTR64 + MASK_64BIT /* + MASK_HARD_QUAD */ + \
-   MASK_STACK_BIAS + MASK_APP_REGS + MASK_FPU + MASK_LONG_DOUBLE_128)
+#define TARGET_64BIT_DEFAULT 1

=== modified file 'gcc/config/sparc/sol2.h'
--- gcc/config/sparc/sol2.h	2010-11-20 22:05:08 +0000
+++ gcc/config/sparc/sol2.h	2011-08-11 11:29:04 +0000
@@ -153,11 +153,18 @@
 #undef SUN_INTEGER_MULTIPLY_64
 #define SUN_INTEGER_MULTIPLY_64 1
 
-/* Solaris allows 64 bit out and global registers in 32 bit mode.
-   sparc_override_options will disable V8+ if not generating V9 code.  */
+/* Solaris allows 64-bit out and global registers to be used in 32-bit mode.
+   sparc_override_options will disable V8+ if either not generating V9 code
+   or generating 64-bit code.  */
 #undef TARGET_DEFAULT
-#define TARGET_DEFAULT (MASK_V8PLUS + MASK_APP_REGS + MASK_FPU \
-			+ MASK_LONG_DOUBLE_128)
+#ifdef TARGET_64BIT_DEFAULT
+#define TARGET_DEFAULT \
+  (MASK_V9 + MASK_64BIT + MASK_PTR64 + MASK_STACK_BIAS + \
+   MASK_V8PLUS + MASK_APP_REGS + MASK_FPU + MASK_LONG_DOUBLE_128)
+#else
+#define TARGET_DEFAULT \
+  (MASK_V8PLUS + MASK_APP_REGS + MASK_FPU + MASK_LONG_DOUBLE_128)
+#endif
 
 /* Solaris-specific #pragmas are implemented on top of attributes.  Hook in
    the bits from config/sol2.c.  */

=== modified file 'gcc/cp/ChangeLog'
--- gcc/cp/ChangeLog	2011-06-27 01:13:33 +0000
+++ gcc/cp/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,13 @@
[phone]  Jakub Jelinek  <[e-mail]>
+
+	Backport from mainline
+	2011-07-07  Jakub Jelinek  <[e-mail]>
+
+	PR c/49644
+	* typeck.c (cp_build_binary_op): For MULT_EXPR and TRUNC_DIV_EXPR with
+	one non-complex and one complex argument, call save_expr on both
+	operands.
+
 2011-06-23  Jason Merrill  <[e-mail]>
 
 	PR c++/49440

=== modified file 'gcc/cp/typeck.c'
--- gcc/cp/typeck.c	2011-04-28 16:13:24 +0000
+++ gcc/cp/typeck.c	2011-08-11 11:29:04 +0000
@@ -4305,6 +4305,7 @@
 		{
 		case MULT_EXPR:
 		case TRUNC_DIV_EXPR:
+		  op1 = save_expr (op1);
 		  imag = build2 (resultcode, real_type, imag, op1);
 		  /* Fall through.  */
 		case PLUS_EXPR:
@@ -4323,6 +4324,7 @@
 	      switch (code)
 		{
 		case MULT_EXPR:
+		  op0 = save_expr (op0);
 		  imag = build2 (resultcode, real_type, op0, imag);
 		  /* Fall through.  */
 		case PLUS_EXPR:

=== modified file 'gcc/expr.c'
--- gcc/expr.c	2011-07-14 11:52:06 +0000
+++ gcc/expr.c	2011-08-11 11:29:04 +0000
@@ -8070,7 +8070,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;
@@ -10006,7 +10009,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,
@@ -10026,7 +10030,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/fortran/ChangeLog'
--- gcc/fortran/ChangeLog	2011-06-02 09:09:53 +0000
+++ gcc/fortran/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,8 @@
[phone]  Janus Weil  <[e-mail]>
+
+	PR fortran/49708
+	* resolve.c (resolve_allocate_expr): Fix diagnostics for pointers.
+
 2011-06-02  Thomas Koenig  <[e-mail]>
 
 	Backport from trunk

=== modified file 'gcc/fortran/resolve.c'
--- gcc/fortran/resolve.c	2011-01-25 17:01:06 +0000
+++ gcc/fortran/resolve.c	2011-08-11 11:29:04 +0000
@@ -6402,7 +6402,7 @@
 	}
     }
 
-  if (pointer || dimension == 0)
+  if (dimension == 0)
     return SUCCESS;
 
   /* Make sure the next-to-last reference node is an array specification.  */

=== modified file 'gcc/gimplify.c'
--- gcc/gimplify.c	2011-07-13 13:36:36 +0000
+++ gcc/gimplify.c	2011-08-11 11:29:04 +0000
@@ -1953,8 +1953,14 @@
 		  ret = MIN (ret, tret);
 		}
 	    }
+	  else
+	    {
+	      tret = gimplify_expr (&TREE_OPERAND (t, 2), pre_p, post_p,
+				    is_gimple_reg, fb_rvalue);
+	      ret = MIN (ret, tret);
+	    }
 
-	  if (!TREE_OPERAND (t, 3))
+	  if (TREE_OPERAND (t, 3) == NULL_TREE)
 	    {
 	      tree elmt_type = TREE_TYPE (TREE_TYPE (TREE_OPERAND (t, 0)));
 	      tree elmt_size = unshare_expr (array_ref_element_size (t));
@@ -1973,11 +1979,17 @@
 		  ret = MIN (ret, tret);
 		}
 	    }
+	  else
+	    {
+	      tret = gimplify_expr (&TREE_OPERAND (t, 3), pre_p, post_p,
+				    is_gimple_reg, fb_rvalue);
+	      ret = MIN (ret, tret);
+	    }
 	}
       else if (TREE_CODE (t) == COMPONENT_REF)
 	{
 	  /* Set the field offset into T and gimplify it.  */
-	  if (!TREE_OPERAND (t, 2))
+	  if (TREE_OPERAND (t, 2) == NULL_TREE)
 	    {
 	      tree offset = unshare_expr (component_ref_field_offset (t));
 	      tree field = TREE_OPERAND (t, 1);
@@ -1996,6 +2008,12 @@
 		  ret = MIN (ret, tret);
 		}
 	    }
+	  else
+	    {
+	      tret = gimplify_expr (&TREE_OPERAND (t, 2), pre_p, post_p,
+				    is_gimple_reg, fb_rvalue);
+	      ret = MIN (ret, tret);
+	    }
 	}
     }
 
@@ -2496,7 +2514,9 @@
 			   new_locus);
       append_to_statement_list (t, &expr);
     }
-  else if (TREE_CODE (pred) == COND_EXPR)
+  else if (TREE_CODE (pred) == COND_EXPR
+	   && !VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (pred, 1)))
+	   && !VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (pred, 2))))
     {
       location_t new_locus;
 
@@ -2504,7 +2524,10 @@
 	 if (a)
 	   if (b) goto yes; else goto no;
 	 else
-	   if (c) goto yes; else goto no;  */
+	   if (c) goto yes; else goto no;
+
+	 Don't do this if one of the arms has void type, which can happen
+	 in C++ when the arm is throw.  */
 
       /* Keep the original source location on the first 'if'.  Set the source
 	 location of the ? on the second 'if'.  */

=== modified file 'gcc/testsuite/ChangeLog'
--- gcc/testsuite/ChangeLog	2011-06-28 21:56:48 +0000
+++ gcc/testsuite/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,138 @@
[phone]  Uros Bizjak  <[e-mail]>
+
+	PR target/49920
+	* gcc.target/i386/pr49920.c: New test.
+
[phone]  Tobias Burnus  <[e-mail]>
+
+	Backported from mainline
+	2011-07-23  Tobias Burnus  <[e-mail]>
+
+	PR fortran/49791
+	* gfortran.dg/namelist_72.f: New.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	* gcc.target/i386/avx-os-support.h: New.
+	* gcc.target/i386/avx-check.h: Include avx-os-support.h
+	(main): Check avx_os_support before the test is run.
+	* gcc.target/i386/aes-avx-check.h: Ditto.
+	* gcc.target/i386/pclmul-avx-check.h: Ditto.
+
[phone]  Janus Weil  <[e-mail]>
+
+	PR fortran/49708
+	* gfortran.dg/allocate_error_3.f90: New.
+
[phone]  Rainer Orth  <[e-mail]>
+
+	PR debug/47393
+	* g++.dg/debug/dwarf2/icf.C: XFAIL some scan-assembler on
+	mips-sgi-irix*.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	* lib/target-supports.exp (check_avx_os_support_available): New.
+	(check_effective_target_avx_runtime): Use it.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	Backport from mainline
+	2011-07-08  Jakub Jelinek  <[e-mail]>
+
+	PR target/49621
+	* gcc.target/powerpc/altivec-34.c: New test.
+
+	2011-07-07  Jakub Jelinek  <[e-mail]>
+
+	PR c/49644
+	* g++.dg/torture/pr49644.C: New test.
+
+	PR c/49644
+	* gcc.c-torture/execute/pr49644.c: New test.
+
+	PR middle-end/49640
+	* gcc.dg/gomp/pr49640.c: New test.
+
+	2011-07-04  Jakub Jelinek  <[e-mail]>
+
+	PR rtl-optimization/49619
+	* gcc.dg/pr49619.c: New test.
+
+	2011-05-27  Jakub Jelinek  <[e-mail]>
+
+	PR c++/49165
+	* g++.dg/eh/cond6.C: New test.
+
+	2011-05-26  Jakub Jelinek  <[e-mail]>
+
+	PR c++/49165
+	* g++.dg/eh/cond5.C: New test.
+
+	PR tree-optimization/49161
+	* gcc.c-torture/execute/pr49161.c: New test.
+
+	2011-05-23  Jakub Jelinek  <[e-mail]>
+
+	PR c/49120
+	* c-decl.c (start_decl): Convert expr to void_type_node.
+
+	PR middle-end/48973
+	* gcc.c-torture/execute/pr48973-1.c: New test.
+	* gcc.c-torture/execute/pr48973-2.c: New test.
+
+	2011-05-18  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/49039
+	* gcc.c-torture/execute/pr49039.c: New test.
+	* gcc.dg/tree-ssa/pr49039.c: New test.
+	* g++.dg/torture/pr49039.C: New test.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR testsuite/49643
+	* g++.dg/rtti/anon-ns1.C: Allow for null-termination.
+
[phone]  Rainer Orth  <[e-mail]>
+
+	* gcc.target/sparc/cas64.c: New test.
+
[phone]  Rainer Orth  <[e-mail]>
+
+	* ada/acats/run_acats (which): Extract last field from type -p,
+	type output only if command succeeded.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	Backport from mainline
+	2011-05-02  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/48822
+	* gcc.dg/torture/pr48822.c: New testcase.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	Backport from mainline
+	2011-05-23  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/49115
+	* g++.dg/torture/pr49115.C: New testcase.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/49615
+	* g++.dg/torture/pr49615.C: New testcase.
+
[phone]  Rainer Orth  <[e-mail]>
+
+	PR ada/49511
+	* ada/acats/run_acats (which): Use last field of type -p output.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/38752
+	* gcc.c-torture/compile/pr38752.c: New testcase.
+
 2011-06-28  Eric Botcazou  <[e-mail]>
 
 	* gnat.dg/opt17.ad[sb]: New test.

=== modified file 'gcc/testsuite/ada/acats/run_acats'
--- gcc/testsuite/ada/acats/run_acats	2010-12-06 16:11:05 +0000
+++ gcc/testsuite/ada/acats/run_acats	2011-08-11 11:29:04 +0000
@@ -10,12 +10,12 @@
 # type -p is missing from Solaris 2 /bin/sh and /bin/ksh (ksh88), but both
 # ksh93 and bash have it.
 # type output format differs between ksh88 and ksh93, so avoid it if
-# type -p is present.
+# type -p is present.  Unfortunately, HP-UX /bin/sh ignores -p with type.
 # Fall back to whence which ksh88 and ksh93 provide, but bash does not.
 
 which () {
-    path=`type -p $* 2>/dev/null` && { echo $path; return 0; }
-    path=`type $* 2>/dev/null | awk '{print $NF}'` && { echo $path; return 0; }
+    path=`type -p $* 2>/dev/null` && { echo $path | awk '{print $NF}'; return 0; }
+    path=`type $* 2>/dev/null` && { echo $path | awk '{print $NF}'; return 0; }
     path=`whence $* 2>/dev/null` && { echo $path; return 0; }
     return 1
 }

=== modified file 'gcc/testsuite/g++.dg/debug/dwarf2/icf.C'
--- gcc/testsuite/g++.dg/debug/dwarf2/icf.C	2009-10-08 20:00:04 +0000
+++ gcc/testsuite/g++.dg/debug/dwarf2/icf.C	2011-08-11 11:29:04 +0000
@@ -40,11 +40,11 @@
 
 // Verify that we get .debug_dcall and .debug_vcall tables generated
 // and that we see entries for both virtual calls. 
-// { dg-final { scan-assembler "\\.section.*\.debug_dcall" } }
+// { dg-final { scan-assembler "\\.section.*\.debug_dcall" { xfail mips-sgi-irix* } } }
 // { dg-final { scan-assembler "\\.section.*\.debug_vcall" } }
-// { dg-final { scan-assembler "New caller" } }
-// { dg-final { scan-assembler "Caller DIE offset" } }
+// { dg-final { scan-assembler "New caller" { xfail mips-sgi-irix* } } }
+// { dg-final { scan-assembler "Caller DIE offset" { xfail mips-sgi-irix* } } }
 // { dg-final { scan-assembler "Point of call" } }
-// { dg-final { scan-assembler "Callee DIE offset" } }
+// { dg-final { scan-assembler "Callee DIE offset" { xfail mips-sgi-irix* } } }
 // { dg-final { scan-assembler "0x0.*Vtable slot" } }
 // { dg-final { scan-assembler "0x1.*Vtable slot" } }

=== added file 'gcc/testsuite/g++.dg/eh/cond5.C'
--- gcc/testsuite/g++.dg/eh/cond5.C	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/g++.dg/eh/cond5.C	2011-08-11 11:29:04 +0000
@@ -0,0 +1,43 @@
+// PR c++/49165
+// { dg-do run }
+
+extern "C" void abort ();
+
+int
+foo (bool x, int y)
+{
+  if (y < 10 && (x ? true : throw 1))
+    y++;
+  if (y > 20 || (x ? true : throw 2))
+    y++;
+  return y;
+}
+
+int
+main ()
+{
+  if (foo (true, 0) != 2
+      || foo (true, 10) != 11
+      || foo (false, 30) != 31)
+    abort ();
+  try
+    {
+      foo (false, 0);
+      abort ();
+    }
+  catch (int i)
+    {
+      if (i != 1)
+	abort ();
+    }
+  try
+    {
+      foo (false, 10);
+      abort ();
+    }
+  catch (int i)
+    {
+      if (i != 2)
+	abort ();
+    }
+}

=== added file 'gcc/testsuite/g++.dg/eh/cond6.C'
--- gcc/testsuite/g++.dg/eh/cond6.C	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/g++.dg/eh/cond6.C	2011-08-11 11:29:04 +0000
@@ -0,0 +1,43 @@
+// PR c++/49165
+// { dg-do run }
+
+extern "C" void abort ();
+
+int
+foo (bool x, int y)
+{
+  if (y < 10 && (x ? 1 : throw 1))
+    y++;
+  if (y > 20 || (x ? 1 : throw 2))
+    y++;
+  return y;
+}
+
+int
+main ()
+{
+  if (foo (true, 0) != 2
+      || foo (true, 10) != 11
+      || foo (false, 30) != 31)
+    abort ();
+  try
+    {
+      foo (false, 0);
+      abort ();
+    }
+  catch (int i)
+    {
+      if (i != 1)
+	abort ();
+    }
+  try
+    {
+      foo (false, 10);
+      abort ();
+    }
+  catch (int i)
+    {
+      if (i != 2)
+	abort ();
+    }
+}

=== modified file 'gcc/testsuite/g++.dg/rtti/anon-ns1.C'
--- gcc/testsuite/g++.dg/rtti/anon-ns1.C	2011-06-27 01:13:33 +0000
+++ gcc/testsuite/g++.dg/rtti/anon-ns1.C	2011-08-11 11:29:04 +0000
@@ -2,7 +2,7 @@
 // The typeinfo name for A should start with * so we compare
 // it by address rather than contents.
 
-// { dg-final { scan-assembler "\"\*N\[^\"\]+1AE\"" } }
+// { dg-final { scan-assembler "\"\*N\[^\"\]+1AE" } }
 
 namespace
 {

=== added file 'gcc/testsuite/g++.dg/torture/pr49039.C'
--- gcc/testsuite/g++.dg/torture/pr49039.C	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/g++.dg/torture/pr49039.C	2011-08-11 11:29:04 +0000
@@ -0,0 +1,76 @@
+// PR tree-optimization/49039
+// { dg-do run }
+
+template <class T1, class T2>
+struct pair
+{
+  T1 first;
+  T2 second;
+  pair (const T1 & a, const T2 & b):first (a), second (b) {}
+};
+
+template <class T1, class T2>
+inline pair <T1, T2>
+make_pair (T1 x, T2 y)
+{
+  return pair <T1, T2> (x, y);
+}
+
+typedef __SIZE_TYPE__ size_t;
+struct S
+{
+  const char *Data;
+  size_t Length;
+  static size_t min (size_t a, size_t b) { return a < b ? a : b; }
+  static size_t max (size_t a, size_t b) { return a > b ? a : b; }
+  S () :Data (0), Length (0) { }
+  S (const char *Str) : Data (Str), Length (__builtin_strlen (Str)) {}
+  S (const char *data, size_t length) : Data (data), Length (length) {}
+  bool empty () const { return Length == 0; }
+  size_t size () const { return Length; }
+  S slice (size_t Start, size_t End) const
+  {
+    Start = min (Start, Length);
+    End = min (max (Start, End), Length);
+    return S (Data + Start, End - Start);
+  }
+  pair <S, S> split (char Separator) const
+  {
+    size_t Idx = find (Separator);
+    if (Idx == ~size_t (0))
+      return make_pair (*this, S ());
+    return make_pair (slice (0, Idx), slice (Idx + 1, ~size_t (0)));
+  }
+  size_t find (char C, size_t From = 0) const
+  {
+    for (size_t i = min (From, Length), e = Length; i != e; ++i)
+      if (Data[i] == C)
+	return i;
+    return ~size_t (0);
+  }
+};
+
+void
+Test (const char *arg)
+{
+  S Desc (arg);
+  while (!Desc.empty ())
+    {
+      pair <S, S> Split = Desc.split ('-');
+      S Token = Split.first;
+      Desc = Split.second;
+      if (Token.empty ())
+	continue;
+      Split = Token.split (':');
+      S Specifier = Split.first;
+      if (Specifier.empty ())
+	__builtin_abort ();
+    }
+}
+
+int
+main ()
+{
+  Test ("-");
+  return 0;
+}

=== added file 'gcc/testsuite/g++.dg/torture/pr49115.C'
--- gcc/testsuite/g++.dg/torture/pr49115.C	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/g++.dg/torture/pr49115.C	2011-08-11 11:29:04 +0000
@@ -0,0 +1,25 @@
+// { dg-do run }
+
+extern "C" void abort (void);
+struct MyException {};
+struct Data {
+    int nr;
+    Data() : nr(66) {}
+};
+Data __attribute__((noinline,noclone)) getData(int i)
+{
+  if (i) throw MyException();
+  Data data;
+  data.nr = i;
+  return data;
+}
+int main(int, char **)
+{
+  Data data;
+  try {
+      data = getData(1);
+  } catch (MyException& e) {
+      if (data.nr != 66)
+	abort ();
+  }
+}

=== added file 'gcc/testsuite/g++.dg/torture/pr49615.C'
--- gcc/testsuite/g++.dg/torture/pr49615.C	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/g++.dg/torture/pr49615.C	2011-08-11 11:29:04 +0000
@@ -0,0 +1,29 @@
+/* { dg-do compile } */
+/* { dg-options "-g" } */
+
+template <class T>
+static inline bool Dispatch (T* obj, void (T::*func) ())
+{
+  (obj->*func) ();
+}
+class C
+{
+  bool f (int);
+  void g ();
+};
+bool C::f (int n)
+{
+  bool b;
+  switch (n)
+    {
+      case 0:
+	  b = Dispatch (this, &C::g);
+      case 1:
+	  b = Dispatch (this, &C::g);
+    }
+}
+void C::g ()
+{
+  for (;;) { }
+}
+

=== added file 'gcc/testsuite/g++.dg/torture/pr49644.C'
--- gcc/testsuite/g++.dg/torture/pr49644.C	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/g++.dg/torture/pr49644.C	2011-08-11 11:29:04 +0000
@@ -0,0 +1,17 @@
+// PR c/49644
+// { dg-do run }
+
+extern "C" void abort ();
+
+int
+main ()
+{
+  _Complex double a[12], *c = a, s = 3.0 + 1.0i;
+  double b[12] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }, *d = b;
+  int i;
+  for (i = 0; i < 6; i++)
+    *c++ = *d++ * s;
+  if (c != a + 6 || d != b + 6)
+    abort ();
+  return 0;
+}

=== added file 'gcc/testsuite/gcc.c-torture/compile/pr38752.c'
--- gcc/testsuite/gcc.c-torture/compile/pr38752.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.c-torture/compile/pr38752.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,25 @@
+typedef struct
+{
+  int             baddr;
+} mstruct_t;
+
+static struct
+{
+  unsigned int    mapnum;
+  mstruct_t       unused;
+} mtab;
+
+static mstruct_t *mactab = &mtab.unused;
+
+int
+main(void)
+{
+  int i;
+  int addr;
+
+  for (i=1; i <= mtab.mapnum; i++)
+    if (addr < mactab[i].baddr)
+      break;
+  return 0;
+}
+

=== added file 'gcc/testsuite/gcc.c-torture/execute/pr48973-1.c'
--- gcc/testsuite/gcc.c-torture/execute/pr48973-1.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.c-torture/execute/pr48973-1.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,20 @@
+/* PR middle-end/48973 */
+
+extern void abort (void);
+struct S { int f : 1; } s;
+int v = -1;
+
+void
+foo (unsigned int x)
+{
+  if (x != -1U)
+    abort ();
+}
+
+int
+main ()
+{
+  s.f = (v & 1) > 0;
+  foo (s.f);
+  return 0;
+}

=== added file 'gcc/testsuite/gcc.c-torture/execute/pr48973-2.c'
--- gcc/testsuite/gcc.c-torture/execute/pr48973-2.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.c-torture/execute/pr48973-2.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,14 @@
+/* PR middle-end/48973 */
+
+extern void abort (void);
+struct S { int f : 1; } s;
+int v = -1;
+
+int
+main ()
+{
+  s.f = v < 0;
+  if ((unsigned int) s.f != -1U)
+    abort ();
+  return 0;
+}

=== added file 'gcc/testsuite/gcc.c-torture/execute/pr49039.c'
--- gcc/testsuite/gcc.c-torture/execute/pr49039.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.c-torture/execute/pr49039.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,26 @@
+/* PR tree-optimization/49039 */
+extern void abort (void);
+int cnt;
+
+__attribute__((noinline, noclone)) void
+foo (unsigned int x, unsigned int y)
+{
+  unsigned int minv, maxv;
+  if (x == 1 || y == -2U)
+    return;
+  minv = x < y ? x : y;
+  maxv = x > y ? x : y;
+  if (minv == 1)
+    ++cnt;
+  if (maxv == -2U)
+    ++cnt;
+}
+
+int
+main ()
+{
+  foo (-2U, 1);
+  if (cnt != 2)
+    abort ();
+  return 0;
+}

=== added file 'gcc/testsuite/gcc.c-torture/execute/pr49161.c'
--- gcc/testsuite/gcc.c-torture/execute/pr49161.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.c-torture/execute/pr49161.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,46 @@
+/* PR tree-optimization/49161 */
+
+extern void abort (void);
+
+int c;
+
+__attribute__((noinline, noclone)) void
+bar (int x)
+{
+  if (x != c++)
+    abort ();
+}
+
+__attribute__((noinline, noclone)) void
+foo (int x)
+{
+  switch (x)
+    {
+    case 3: goto l1;
+    case 4: goto l2;
+    case 6: goto l3;
+    default: return;
+    }
+l1:
+  goto l4;
+l2:
+  goto l4;
+l3:
+  bar (-1);
+l4:
+  bar (0);
+  if (x != 4)
+    bar (1);
+  if (x != 3)
+    bar (-1);
+  bar (2);
+}
+
+int
+main ()
+{
+  foo (3);
+  if (c != 3)
+    abort ();
+  return 0;
+}

=== added file 'gcc/testsuite/gcc.c-torture/execute/pr49644.c'
--- gcc/testsuite/gcc.c-torture/execute/pr49644.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.c-torture/execute/pr49644.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,16 @@
+/* PR c/49644 */
+
+extern void abort (void);
+
+int
+main ()
+{
+  _Complex double a[12], *c = a, s = 3.0 + 1.0i;
+  double b[12] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }, *d = b;
+  int i;
+  for (i = 0; i < 6; i++)
+    *c++ = *d++ * s;
+  if (c != a + 6 || d != b + 6)
+    abort ();
+  return 0;
+}

=== added file 'gcc/testsuite/gcc.dg/gomp/pr49640.c'
--- gcc/testsuite/gcc.dg/gomp/pr49640.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.dg/gomp/pr49640.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,29 @@
+/* PR middle-end/49640 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -std=gnu99 -fopenmp" } */
+
+void
+foo (int N, int M, int K, int P, int Q, int R, int i, int j, int k,
+     unsigned char x[P][Q][R], int y[N][M][K])
+{
+  int ii, jj, kk;
+
+#pragma omp parallel for private(ii,jj,kk)
+  for (ii = 0; ii < P; ++ii)
+    for (jj = 0; jj < Q; ++jj)
+      for (kk = 0; kk < R; ++kk)
+	y[i + ii][j + jj][k + kk] = x[ii][jj][kk];
+}
+
+void
+bar (int N, int M, int K, int P, int Q, int R, int i, int j, int k,
+     unsigned char x[P][Q][R], float y[N][M][K], float factor, float zero)
+{
+  int ii, jj, kk;
+
+#pragma omp parallel for private(ii,jj,kk)
+  for (ii = 0; ii < P; ++ii)
+    for (jj = 0; jj < Q; ++jj)
+      for (kk = 0; kk < R; ++kk)
+	y[i + ii][j + jj][k + kk] = factor * x[ii][jj][kk] + zero;
+}

=== added file 'gcc/testsuite/gcc.dg/pr49120.c'
--- gcc/testsuite/gcc.dg/pr49120.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.dg/pr49120.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,11 @@
+/* PR c/49120 */
+/* { dg-do compile } */
+/* { dg-options "-Wall" } */
+
+int
+main ()
+{
+  int a = 1;
+  int c = ({ char b[a + 1]; b[0] = 0; b[0]; });
+  return c;
+}

=== added file 'gcc/testsuite/gcc.dg/pr49619.c'
--- gcc/testsuite/gcc.dg/pr49619.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.dg/pr49619.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,13 @@
+/* PR rtl-optimization/49619 */
+/* { dg-do compile } */
+/* { dg-options "-O -fno-tree-fre" } */
+
+extern int a, b;
+
+void
+foo (int x)
+{
+  a = 2;
+  b = 0;
+  b = (a && ((a = 1, 0 >= b) || (short) (x + (b & x))));
+}

=== added file 'gcc/testsuite/gcc.dg/torture/pr48822.c'
--- gcc/testsuite/gcc.dg/torture/pr48822.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.dg/torture/pr48822.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+
+void foo (int *, int *);
+int bar ()
+{
+  int a = 0;
+  int b = 0;
+  if (b != 0)
+    {
+      int ax = a;
+      int bx = b;
+      while (bx != 0)
+	{
+	  int tem = ax % bx;
+	  ax = bx;
+	  bx = tem;
+	}
+    }
+  foo (&a, &b);
+}

=== added file 'gcc/testsuite/gcc.dg/tree-ssa/pr49039.c'
--- gcc/testsuite/gcc.dg/tree-ssa/pr49039.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.dg/tree-ssa/pr49039.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,31 @@
+/* PR tree-optimization/49039 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-vrp1" } */
+
+extern void bar (void);
+
+void
+foo (unsigned int x, unsigned int y)
+{
+  unsigned int minv, maxv;
+  if (x >= 3 && x <= 6)
+    return;
+  if (y >= 5 && y <= 8)
+    return;
+  minv = x < y ? x : y;
+  maxv = x > y ? x : y;
+  if (minv == 5)
+    bar ();
+  if (minv == 6)
+    bar ();
+  if (maxv == 5)
+    bar ();
+  if (maxv == 6)
+    bar ();
+}
+
+/* { dg-final { scan-tree-dump "Folding predicate minv_\[0-9\]* == 5 to 0" "vrp1" } } */
+/* { dg-final { scan-tree-dump "Folding predicate minv_\[0-9\]* == 6 to 0" "vrp1" } } */
+/* { dg-final { scan-tree-dump "Folding predicate maxv_\[0-9\]* == 5 to 0" "vrp1" } } */
+/* { dg-final { scan-tree-dump "Folding predicate maxv_\[0-9\]* == 6 to 0" "vrp1" } } */
+/* { dg-final { cleanup-tree-dump "vrp1" } } */

=== modified file 'gcc/testsuite/gcc.target/i386/aes-avx-check.h'
--- gcc/testsuite/gcc.target/i386/aes-avx-check.h	2010-06-07 10:08:46 +0000
+++ gcc/testsuite/gcc.target/i386/aes-avx-check.h	2011-08-11 11:29:04 +0000
@@ -3,6 +3,7 @@
 #endif
 #include <stdlib.h>
 #include "cpuid.h"
+#include "avx-os-support.h"
 
 static void aes_avx_test (void);
 
@@ -22,7 +23,9 @@
     return 0;
 
   /* Run AES + AVX test only if host has AES + AVX support.  */
-  if ((ecx & (bit_AVX | bit_AES)) == (bit_AVX | bit_AES))
+  if (((ecx & (bit_AVX | bit_OSXSAVE | bit_AES))
+       == (bit_AVX | bit_OSXSAVE | bit_AES))
+      && avx_os_support ())
     {
       do_test ();
 #ifdef DEBUG

=== modified file 'gcc/testsuite/gcc.target/i386/avx-check.h'
--- gcc/testsuite/gcc.target/i386/avx-check.h	2011-02-07 13:15:14 +0000
+++ gcc/testsuite/gcc.target/i386/avx-check.h	2011-08-11 11:29:04 +0000
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "cpuid.h"
 #include "m256-check.h"
+#include "avx-os-support.h"
 
 static void avx_test (void);
 
@@ -20,7 +21,8 @@
     return 0;
 
   /* Run AVX test only if host has AVX support.  */
-  if ((ecx & (bit_AVX | bit_OSXSAVE)) == (bit_AVX | bit_OSXSAVE))
+  if (((ecx & (bit_AVX | bit_OSXSAVE)) == (bit_AVX | bit_OSXSAVE))
+      && avx_os_support ())
     {
       do_test ();
 #ifdef DEBUG

=== added file 'gcc/testsuite/gcc.target/i386/avx-os-support.h'
--- gcc/testsuite/gcc.target/i386/avx-os-support.h	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.target/i386/avx-os-support.h	2011-08-11 11:29:04 +0000
@@ -0,0 +1,10 @@
+/* Check if the OS supports executing AVX instructions.  */
+
+static int
+avx_os_support (void)
+{
+  unsigned int eax, edx;
+
+  __asm__ ("xgetbv" : "=a" (eax), "=d" (edx) : "c" (0));
+  return (eax & 6) == 6;
+}

=== modified file 'gcc/testsuite/gcc.target/i386/pclmul-avx-check.h'
--- gcc/testsuite/gcc.target/i386/pclmul-avx-check.h	2010-06-07 10:08:46 +0000
+++ gcc/testsuite/gcc.target/i386/pclmul-avx-check.h	2011-08-11 11:29:04 +0000
@@ -3,6 +3,7 @@
 #endif
 #include <stdlib.h>
 #include "cpuid.h"
+#include "avx-os-support.h"
 
 static void pclmul_avx_test (void);
 
@@ -22,7 +23,9 @@
     return 0;
 
   /* Run PCLMUL + AVX test only if host has PCLMUL + AVX support.  */
-  if ((ecx & (bit_AVX | bit_PCLMUL)) == (bit_AVX | bit_PCLMUL))
+  if (((ecx & (bit_AVX | bit_OSXSAVE | bit_PCLMUL))
+       == (bit_AVX | bit_OSXSAVE | bit_PCLMUL))
+      && avx_os_support ())
     {
       do_test ();
 #ifdef DEBUG

=== added file 'gcc/testsuite/gcc.target/i386/pr49920.c'
--- gcc/testsuite/gcc.target/i386/pr49920.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.target/i386/pr49920.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,23 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+/* { dg-require-effective-target ilp32 } */
+
+typedef __SIZE_TYPE__ size_t;
+extern void *malloc (size_t);
+
+register unsigned int MR_mr0 asm ("esi");
+register unsigned int MR_mr1 asm ("edi");
+
+void ml_backend__ml_closure_gen_module11 (void)
+{
+  unsigned int MR_tempr1, MR_tempr2, MR_tempr3;
+
+  MR_tempr1 = (unsigned int)((char *) malloc (sizeof (unsigned int)) + 4);
+  MR_tempr3 = ((unsigned int *) MR_mr0)[0];
+
+  ((unsigned int *) (MR_tempr1 - 4))[0] = MR_tempr3;
+
+  MR_tempr2 = (unsigned int)((char *) malloc (2 * sizeof (unsigned int)));
+
+  ((unsigned int *) MR_tempr2)[1] = MR_tempr1;
+}

=== added file 'gcc/testsuite/gcc.target/powerpc/altivec-34.c'
--- gcc/testsuite/gcc.target/powerpc/altivec-34.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.target/powerpc/altivec-34.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,24 @@
+/* PR target/49621 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -maltivec" } */
+
+#include <altivec.h>
+
+int
+foo (void)
+{
+  vector unsigned a, b, c;
+  unsigned k = 1;
+
+  a = (vector unsigned) { 0, 0, 0, 1 };
+  b = c = (vector unsigned) { 0, 0, 0, 0 };
+
+  a = vec_add (a, vec_splats (k));
+  b = vec_add (b, a);
+  c = vec_sel (c, a, b);
+
+  if (vec_any_eq (b, c))
+    return 1;
+
+  return 0;
+}

=== added file 'gcc/testsuite/gcc.target/sparc/cas64.c'
--- gcc/testsuite/gcc.target/sparc/cas64.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.target/sparc/cas64.c	2011-08-11 11:29:04 +0000
@@ -0,0 +1,15 @@
+/* PR target/49660 */
+
+/* { dg-do compile { target sparc*-*-solaris2.* } } */
+
+#include <stdint.h>
+
+extern int64_t *val, old, new;
+
+int
+cas64 (void)
+{
+  return __sync_bool_compare_and_swap (val, old, new);
+}
+
+/* { dg-final { scan-assembler-not "compare_and_swap_8" } } */

=== added file 'gcc/testsuite/gfortran.dg/allocate_error_3.f90'
--- gcc/testsuite/gfortran.dg/allocate_error_3.f90	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gfortran.dg/allocate_error_3.f90	2011-08-11 11:29:04 +0000
@@ -0,0 +1,9 @@
+! { dg-do compile }
+!
+! PR 49708: [4.5/4.6/4.7 Regression] ICE with allocate and no dimensions
+!
+! Contributed by <[e-mail]>
+
+  real, pointer :: x(:)
+  allocate(x)            ! { dg-error "Array specification required" }
+end 

=== added file 'gcc/testsuite/gfortran.dg/namelist_72.f'
--- gcc/testsuite/gfortran.dg/namelist_72.f	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gfortran.dg/namelist_72.f	2011-08-11 11:29:04 +0000
@@ -0,0 +1,33 @@
+! { dg-do run }
+!
+! PR fortran/49791
+!
+! Contributed by Elliott Sales de Andrade
+!
+      program namelist_test
+
+      dimension xpos(5000), ypos(5000)
+      namelist /geometry/ xpos, ypos
+
+      xpos = -huge(xpos)
+      ypos = -huge(ypos)
+
+      open(unit=4,file='geometry.in')
+      write(4,'(a)') '$geometry'
+      write(4,'(a)') ' xpos(1)= 0.00, 0.10, 0.20, 0.30, 0.40,'
+      write(4,'(a)') ' ypos(1)= 0.50, 0.60, 0.70, 0.80, 0.90,'
+      write(4,'(a)') '$end'
+
+      close(4)
+
+      open (unit=4,file='geometry.in',status='old',form='formatted')
+      read (4,geometry)
+      close(4, status='delete')
+
+      !print *, 'xpos', xpos(1:10), 'ypos', ypos(1:10)
+
+      if (any (xpos(1:5) /= [0.00, 0.10, 0.20, 0.30, 0.40]))call abort()
+      if (any (ypos(1:5) /= [0.50, 0.60, 0.70, 0.80, 0.90]))call abort()
+      if (any (xpos(6:) /= -huge(xpos))) call abort ()
+      if (any (ypos(6:) /= -huge(ypos))) call abort ()
+      end

=== modified file 'gcc/testsuite/lib/target-supports.exp'
--- gcc/testsuite/lib/target-supports.exp	2011-04-28 16:13:24 +0000
+++ gcc/testsuite/lib/target-supports.exp	2011-08-11 11:29:04 +0000
@@ -960,8 +960,8 @@
 	    check_runtime_nocache sse_os_support_available {
 		int main ()
 		{
-		    __asm__ volatile ("movss %xmm2,%xmm1");
-		    return 0;
+		  asm volatile ("movss %xmm2,%xmm1");
+		  return 0;
 		}
 	    } "-msse"
 	} else {
@@ -970,6 +970,29 @@
     }]
 }
 
+# Return 1 if the target OS supports running AVX executables, 0
+# otherwise.  Cache the result.
+
+proc check_avx_os_support_available { } {
+    return [check_cached_effective_target avx_os_support_available {
+	# If this is not the right target then we can skip the test.
+	if { !([istarget x86_64-*-*] || [istarget i?86-*-*]) } {
+	    expr 0
+	} else {
+	    # Check that OS has AVX and SSE saving enabled.
+	    check_runtime_nocache avx_os_support_available {
+		int main ()
+		{
+		  unsigned int eax, edx;
+
+		  asm ("xgetbv" : "=a" (eax), "=d" (edx) : "c" (0));
+		  return (eax & 6) != 6;
+		}
+	    } ""
+	}
+    }]
+}
+
 # Return 1 if the target supports executing SSE instructions, 0
 # otherwise.  Cache the result.
 
@@ -1064,7 +1087,8 @@
 
 proc check_effective_target_avx_runtime { } {
     if { [check_effective_target_avx]
-	 && [check_avx_hw_available] } {
+	 && [check_avx_hw_available]
+	 && [check_avx_os_support_available] } {
 	return 1
     }
     return 0

=== modified file 'gcc/tree-cfgcleanup.c'
--- gcc/tree-cfgcleanup.c	2010-05-21 08:27:30 +0000
+++ gcc/tree-cfgcleanup.c	2011-08-11 11:29:04 +0000
@@ -560,7 +560,7 @@
 	   BB is present in the cfg.  */
 	if (bb == NULL
 	    || bb->index < NUM_FIXED_BLOCKS
-	    || bb->index >= n_basic_blocks
+	    || bb->index >= last_basic_block
 	    || BASIC_BLOCK (bb->index) != bb
 	    || last_stmt (bb) == stmt
 	    || !gimple_call_noreturn_p (stmt))

=== modified file 'gcc/tree-ssa-dce.c'
--- gcc/tree-ssa-dce.c	2010-11-17 10:46:36 +0000
+++ gcc/tree-ssa-dce.c	2011-08-11 11:29:04 +0000
@@ -509,7 +509,14 @@
 
   /* If the stmt lhs kills ref, then we can stop walking.  */
   if (gimple_has_lhs (def_stmt)
-      && TREE_CODE (gimple_get_lhs (def_stmt)) != SSA_NAME)
+      && TREE_CODE (gimple_get_lhs (def_stmt)) != SSA_NAME
+      /* The assignment is not necessarily carried out if it can throw
+         and we can catch it in the current function where we could inspect
+	 the previous value.
+         ???  We only need to care about the RHS throwing.  For aggregate
+	 assignments or similar calls and non-call exceptions the LHS
+	 might throw as well.  */
+      && !stmt_can_throw_internal (def_stmt))
     {
       tree base, lhs = gimple_get_lhs (def_stmt);
       HOST_WIDE_INT size, offset, max_size;

=== modified file 'gcc/tree-ssa-dom.c'
--- gcc/tree-ssa-dom.c	2011-07-01 09:27:50 +0000
+++ gcc/tree-ssa-dom.c	2011-08-11 11:29:04 +0000
@@ -211,13 +211,11 @@
     {
       enum tree_code subcode = gimple_assign_rhs_code (stmt);
 
-      expr->type = NULL_TREE;
-
       switch (get_gimple_rhs_class (subcode))
         {
         case GIMPLE_SINGLE_RHS:
           expr->kind = EXPR_SINGLE;
-	  expr->type = TREE_TYPE (gimple_assign_lhs (stmt));
+	  expr->type = TREE_TYPE (gimple_assign_rhs1 (stmt));
           expr->ops.single.rhs = gimple_assign_rhs1 (stmt);
           break;
         case GIMPLE_UNARY_RHS:

=== modified file 'gcc/tree-ssa-sccvn.c'
--- gcc/tree-ssa-sccvn.c	2011-04-06 12:29:08 +0000
+++ gcc/tree-ssa-sccvn.c	2011-08-11 11:29:04 +0000
@@ -1805,12 +1805,26 @@
 static inline bool
 set_ssa_val_to (tree from, tree to)
 {
-  tree currval;
+  tree currval = SSA_VAL (from);
 
-  if (from != to
-      && TREE_CODE (to) == SSA_NAME
-      && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (to))
-    to = from;
+  if (from != to)
+    {
+      if (currval == from)
+	{
+	  if (dump_file && (dump_flags & TDF_DETAILS))
+	    {
+	      fprintf (dump_file, "Not changing value number of ");
+	      print_generic_expr (dump_file, from, 0);
+	      fprintf (dump_file, " from VARYING to ");
+	      print_generic_expr (dump_file, to, 0);
+	      fprintf (dump_file, "\n");
+	    }
+	  return false;
+	}
+      else if (TREE_CODE (to) == SSA_NAME
+	       && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (to))
+	to = from;
+    }
 
   /* The only thing we allow as value numbers are VN_TOP, ssa_names
      and invariants.  So assert that here.  */
@@ -1827,8 +1841,6 @@
       print_generic_expr (dump_file, to, 0);
     }
 
-  currval = SSA_VAL (from);
-
   if (currval != to  && !operand_equal_p (currval, to, OEP_PURE_SAME))
     {
       VN_INFO (from)->valnum = to;

=== modified file 'gcc/tree-vrp.c'
--- gcc/tree-vrp.c	2011-02-22 11:38:56 +0000
+++ gcc/tree-vrp.c	2011-08-11 11:29:04 +0000
@@ -1,5 +1,5 @@
 /* Support routines for Value Range Propagation (VRP).
-   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Contributed by Diego Novillo <[e-mail]>.
 
@@ -2261,17 +2261,27 @@
 	 op0 + op1 == 0, so we cannot claim that the sum is in ~[0,0].
 	 Note that we are guaranteed to have vr0.type == vr1.type at
 	 this point.  */
-      if (code == PLUS_EXPR && vr0.type == VR_ANTI_RANGE)
-	{
-	  set_value_range_to_varying (vr);
-	  return;
-	}
-
-      /* For operations that make the resulting range directly
-	 proportional to the original ranges, apply the operation to
-	 the same end of each range.  */
-      min = vrp_int_const_binop (code, vr0.min, vr1.min);
-      max = vrp_int_const_binop (code, vr0.max, vr1.max);
+      if (vr0.type == VR_ANTI_RANGE)
+	{
+	  if (code == PLUS_EXPR)
+	    {
+	      set_value_range_to_varying (vr);
+	      return;
+	    }
+	  /* For MIN_EXPR and MAX_EXPR with two VR_ANTI_RANGEs,
+	     the resulting VR_ANTI_RANGE is the same - intersection
+	     of the two ranges.  */
+	  min = vrp_int_const_binop (MAX_EXPR, vr0.min, vr1.min);
+	  max = vrp_int_const_binop (MIN_EXPR, vr0.max, vr1.max);
+	}
+      else
+	{
+	  /* For operations that make the resulting range directly
+	     proportional to the original ranges, apply the operation to
+	     the same end of each range.  */
+	  min = vrp_int_const_binop (code, vr0.min, vr1.min);
+	  max = vrp_int_const_binop (code, vr0.max, vr1.max);
+	}
 
       /* If both additions overflowed the range kind is still correct.
 	 This happens regularly with subtracting something in unsigned
@@ -4509,28 +4519,35 @@
   return need_assert;
 }
 
-/* Compare two case labels sorting first by the destination label uid
+struct case_info
+{
+  tree expr;
+  basic_block bb;
+};
+
+/* Compare two case labels sorting first by the destination bb index
    and then by the case value.  */
 
 static int
 compare_case_labels (const void *p1, const void *p2)
 {
-  const_tree const case1 = *(const_tree const*)p1;
-  const_tree const case2 = *(const_tree const*)p2;
-  unsigned int uid1 = DECL_UID (CASE_LABEL (case1));
-  unsigned int uid2 = DECL_UID (CASE_LABEL (case2));
+  const struct case_info *ci1 = (const struct case_info *) p1;
+  const struct case_info *ci2 = (const struct case_info *) p2;
+  int idx1 = ci1->bb->index;
+  int idx2 = ci2->bb->index;
 
-  if (uid1 < uid2)
+  if (idx1 < idx2)
     return -1;
-  else if (uid1 == uid2)
+  else if (idx1 == idx2)
     {
       /* Make sure the default label is first in a group.  */
-      if (!CASE_LOW (case1))
+      if (!CASE_LOW (ci1->expr))
 	return -1;
-      else if (!CASE_LOW (case2))
+      else if (!CASE_LOW (ci2->expr))
 	return 1;
       else
-        return tree_int_cst_compare (CASE_LOW (case1), CASE_LOW (case2));
+	return tree_int_cst_compare (CASE_LOW (ci1->expr),
+				     CASE_LOW (ci2->expr));
     }
   else
     return 1;
@@ -4551,8 +4568,8 @@
   gimple_stmt_iterator bsi;
   tree op;
   edge e;
-  tree vec2;
-  size_t n = gimple_switch_num_labels(last);
+  struct case_info *ci;
+  size_t n = gimple_switch_num_labels (last);
 #if GCC_VERSION >= 4000
   unsigned int idx;
 #else
@@ -4567,36 +4584,38 @@
     return false;
 
   /* Build a vector of case labels sorted by destination label.  */
-  vec2 = make_tree_vec (n);
+  ci = XNEWVEC (struct case_info, n);
   for (idx = 0; idx < n; ++idx)
-    TREE_VEC_ELT (vec2, idx) = gimple_switch_label (last, idx);
-  qsort (&TREE_VEC_ELT (vec2, 0), n, sizeof (tree), compare_case_labels);
+    {
+      ci[idx].expr = gimple_switch_label (last, idx);
+      ci[idx].bb = label_to_block (CASE_LABEL (ci[idx].expr));
+    }
+  qsort (ci, n, sizeof (struct case_info), compare_case_labels);
 
   for (idx = 0; idx < n; ++idx)
     {
       tree min, max;
-      tree cl = TREE_VEC_ELT (vec2, idx);
+      tree cl = ci[idx].expr;
+      basic_block cbb = ci[idx].bb;
 
       min = CASE_LOW (cl);
       max = CASE_HIGH (cl);
 
       /* If there are multiple case labels with the same destination
 	 we need to combine them to a single value range for the edge.  */
-      if (idx + 1 < n
-	  && CASE_LABEL (cl) == CASE_LABEL (TREE_VEC_ELT (vec2, idx + 1)))
+      if (idx + 1 < n && cbb == ci[idx + 1].bb)
 	{
 	  /* Skip labels until the last of the group.  */
 	  do {
 	    ++idx;
-	  } while (idx < n
-		   && CASE_LABEL (cl) == CASE_LABEL (TREE_VEC_ELT (vec2, idx)));
+	  } while (idx < n && cbb == ci[idx].bb);
 	  --idx;
 
 	  /* Pick up the maximum of the case label range.  */
-	  if (CASE_HIGH (TREE_VEC_ELT (vec2, idx)))
-	    max = CASE_HIGH (TREE_VEC_ELT (vec2, idx));
+	  if (CASE_HIGH (ci[idx].expr))
+	    max = CASE_HIGH (ci[idx].expr);
 	  else
-	    max = CASE_LOW (TREE_VEC_ELT (vec2, idx));
+	    max = CASE_LOW (ci[idx].expr);
 	}
 
       /* Nothing to do if the range includes the default label until we
@@ -4605,7 +4624,7 @@
 	continue;
 
       /* Find the edge to register the assert expr on.  */
-      e = find_edge (bb, label_to_block (CASE_LABEL (cl)));
+      e = find_edge (bb, cbb);
 
       /* Register the necessary assertions for the operand in the
 	 SWITCH_EXPR.  */
@@ -4623,6 +4642,7 @@
 	}
     }
 
+  XDELETEVEC (ci);
   return need_assert;
 }
 

=== modified file 'libgfortran/ChangeLog'
--- libgfortran/ChangeLog	2011-04-28 14:09:02 +0000
+++ libgfortran/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,12 @@
[phone]  Tobias Burnus  <[e-mail]>
+
+	Backport from mainline
+	2011-07-23  Tobias Burnus  <[e-mail]>
+
+	PR fortran/49791
+	* io/list_read.c (nml_parse_qualifier): Remove check to
+	enabled extended read for another case.
+
 2011-04-28  Release Manager
 
 	* GCC 4.5.3 released.

=== modified file 'libgfortran/io/list_read.c'
--- libgfortran/io/list_read.c	2011-03-07 02:06:27 +0000
+++ libgfortran/io/list_read.c	2011-08-11 11:29:04 +0000
@@ -2078,7 +2078,6 @@
 		      do not allow excess data to be processed.  */
 		  if (is_array_section == 1
 		      || !(compile_options.allow_std & GFC_STD_GNU)
-		      || !dtp->u.p.ionml->touched
 		      || dtp->u.p.ionml->type == GFC_DTYPE_DERIVED)
 		    ls[dim].end = ls[dim].start;
 		  else

=== modified file 'libiberty/ChangeLog'
--- libiberty/ChangeLog	2011-04-28 14:10:57 +0000
+++ libiberty/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,7 @@
[phone]  Uros Bizjak  <[e-mail]>
+
+	* testsuite/test-expandargv.c (writeout_test): Check result of fwrite.
+
 2011-04-28  Release Manager
 
 	* GCC 4.5.3 released.
@@ -284,7 +288,7 @@
 
 2009-04-29  Julian Brown  <[e-mail]>
 
-	* pex-win32.c (pex_win32_pipe): Add _O_NOINHERIT.    
+	* pex-win32.c (pex_win32_pipe): Add _O_NOINHERIT.
 	(pex_win32_exec_child): Ensure each process has only one handle open
 	on pipe endpoints. Close standard input after creating child for
 	symmetry with standard output/standard error.
@@ -302,7 +306,7 @@
 	section, so that the native build does detect them at configure
 	time.
 	* configure: Regenerated.
-	
+
 2009-04-13  Ozkan Sezer  <[e-mail]>
 
         PR target/39397
@@ -402,7 +406,7 @@
 2008-10-08  David Edelsohn  <[e-mail]>
 
 	* xstrdup.c: Include <sys/types.h> after "config.h"
- 
+
 2008-10-07  Jan Kratochvil  <[e-mail]>
 
 	* configure.ac: Call AC_SYS_LARGEFILE.

=== modified file 'libiberty/testsuite/test-expandargv.c'
--- libiberty/testsuite/test-expandargv.c	2009-10-08 14:14:41 +0000
+++ libiberty/testsuite/test-expandargv.c	2011-08-11 11:29:04 +0000
@@ -189,7 +189,7 @@
 {
   char filename[256];
   FILE *fd;
-  size_t len;
+  size_t len, sys_fwrite;
   char * parse;
 
   /* Unique filename per test */
@@ -208,7 +208,10 @@
   /* Run all possible replaces */
   run_replaces (parse);
 
-  fwrite (parse, len, sizeof (char), fd);
+  sys_fwrite = fwrite (parse, sizeof (char), len, fd);
+  if (sys_fwrite != len)
+    fatal_error (__LINE__, "Failed to write to test file.", errno);
+
   free (parse);
   fclose (fd);
 }

=== modified file 'libjava/ChangeLog'
--- libjava/ChangeLog	2011-04-28 14:10:19 +0000
+++ libjava/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,9 @@
[phone]  Jack Howarth <[e-mail]>
+
+	PR target/49461
+	* libjava/configure.ac (SYSTEMSPEC): Pass -no_pie for darwin11.
+	* libjava/configure: Regenerate.
+
 2011-04-28  Release Manager
 
 	* GCC 4.5.3 released.

=== modified file 'libjava/configure'
--- libjava/configure	2010-07-15 11:05:56 +0000
+++ libjava/configure	2011-08-11 11:29:04 +0000
@@ -19754,8 +19754,13 @@
         SYSTEMSPEC="-lunicows $SYSTEMSPEC"
       fi
     ;;
-    *-*-darwin[912]*)
-      SYSTEMSPEC="-allow_stack_execute"
+    *-*-darwin9*)
+      SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
+    ;;
+    *-*-darwin[12]*)
+      # Something is incompatible with pie, would be nice to fix it and
+      # remove -no_pie.  PR49461
+      SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
     ;;
     *)
       SYSTEMSPEC=

=== modified file 'libjava/configure.ac'
--- libjava/configure.ac	2010-07-15 11:05:56 +0000
+++ libjava/configure.ac	2011-08-11 11:29:04 +0000
@@ -882,8 +882,13 @@
         SYSTEMSPEC="-lunicows $SYSTEMSPEC"
       fi
     ;;
-    *-*-darwin[[912]]*)
-      SYSTEMSPEC="-allow_stack_execute"
+    *-*-darwin9*)
+      SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
+    ;;
+    *-*-darwin[[12]]*)
+      # Something is incompatible with pie, would be nice to fix it and
+      # remove -no_pie.  PR49461
+      SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
     ;;
     *)
       SYSTEMSPEC=

=== modified file 'libstdc++-v3/ChangeLog'
--- libstdc++-v3/ChangeLog	2011-04-28 14:09:18 +0000
+++ libstdc++-v3/ChangeLog	2011-08-11 11:29:04 +0000
@@ -1,3 +1,13 @@
[phone]  Uros Bizjak  <[e-mail]>
+
+	Backport from mainline
+	2011-06-07  Paolo Carlini  <[e-mail]>
+
+	PR libstdc++/49293
+	* testsuite/22_locale/time_get/get_weekday/char/38081-1.cc: Tweak
+	for glibc 2.14.
+	* testsuite/22_locale/time_get/get_weekday/char/38081-2.cc: Likewise.
+
 2011-04-28  Release Manager
 
 	* GCC 4.5.3 released.

=== modified file 'libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc'
--- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc	2010-01-05 20:05:20 +0000
+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc	2011-08-11 11:29:04 +0000
@@ -1,6 +1,6 @@
 // { dg-require-namedlocale "" }
 
-// Copyright (C) 2010 Free Software Foundation
+// Copyright (C) 2010, 2011 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -49,7 +49,11 @@
   // get_weekday(iter_type, iter_type, ios_base&, 
   //             ios_base::iostate&, tm*) const
 
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
+  iss.str("\xbf\xdd\x2e");
+#else
   iss.str("\xbf\xdd\xd4");
+#endif
   iterator_type is_it01(iss);
   tm time01;
   memset(&time01, -1, sizeof(tm));
@@ -67,7 +71,11 @@
   VERIFY( time02.tm_wday == 1 );
   VERIFY( errorstate == ios_base::eofbit );
 
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
+  iss.str("\xbf\xdd\x2e\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda");
+#else
   iss.str("\xbf\xdd\xd4\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda");
+#endif
   iterator_type is_it03(iss);
   tm time03;
   memset(&time03, -1, sizeof(tm));

=== modified file 'libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc'
--- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc	2010-01-25 18:02:41 +0000
+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc	2011-08-11 11:29:04 +0000
@@ -2,7 +2,7 @@
 
 // 2010-01-05  Paolo Carlini  <[e-mail]>
 
-// Copyright (C) 2010 Free Software Foundation
+// Copyright (C) 2010, 2011 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -50,6 +50,15 @@
   // get_weekday(iter_type, iter_type, ios_base&, 
   //             ios_base::iostate&, tm*) const
 
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
+  const char* awdays[7] = { "\u0412\u0441\u002E",
+			    "\u041F\u043D\u002E",
+			    "\u0412\u0442\u002E",
+			    "\u0421\u0440\u002E",
+			    "\u0427\u0442\u002E",
+			    "\u041F\u0442\u002E",
+			    "\u0421\u0431\u002E" };
+#else
   const char* awdays[7] = { "\u0412\u0441\u043A",
 			    "\u041F\u043D\u0434",
 			    "\u0412\u0442\u0440",
@@ -57,6 +66,7 @@
 			    "\u0427\u0442\u0432",
 			    "\u041F\u0442\u043D",
 			    "\u0421\u0431\u0442" };
+#endif
 
   for (int i = 0; i < 7; ++i)
     {