Merge lp:~michaelh1/gcc-linaro/merge-from-fsf-r177703-4.6 into lp:gcc-linaro/4.6

[Michael Hope]

Merge from FSF GCC 4.6.1 (svn branches/gcc-4_6-branch r177703)

[Linaro Toolchain Builder (cbuild)]

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

The snapshot is available at:
 http://ex.seabright.co.nz/snapshots/gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6.tar.xdelta3.xz

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

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

cbuild-snapshot: gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6
cbuild-ancestor: lp:gcc-linaro/4.6+bzr106786
cbuild-state: check

[Michael Hope (michaelh1)]

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

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6/logs/x86_64-natty-cbuild161-oort1-x86_64r1

+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 44)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 45)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 49)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 50)
+PASS: g++.dg/cpp0x/constexpr-48089.C (test for errors, line 36)
+PASS: g++.dg/cpp0x/constexpr-48089.C (test for warnings, line 31)
+PASS: g++.dg/cpp0x/constexpr-array4.C (test for excess errors)
+PASS: g++.dg/cpp0x/constexpr-non-const-arg3.C (test for excess errors)
+PASS: g++.dg/cpp0x/constexpr-non-const-arg3.C execution test
+PASS: g++.dg/cpp0x/decltype31.C (test for errors, line 11)
+PASS: g++.dg/cpp0x/decltype31.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-defarg2.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-ref2.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-ref2.C execution test
+PASS: g++.dg/cpp0x/lambda/lambda-variadic1.C (test for excess errors)
+PASS: g++.dg/cpp0x/regress/regress5.C (test for excess errors)
+PASS: g++.dg/cpp0x/union5.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic114.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic115.C (test for excess errors)
+PASS: g++.dg/diagnostic/aka1.C (test for errors, line 15)
+PASS: g++.dg/diagnostic/aka1.C (test for errors, line 9)
+PASS: g++.dg/diagnostic/aka1.C (test for excess errors)
-UNSUPPORTED: g++.dg/ext/attr-ifunc-1.C
-UNSUPPORTED: g++.dg/ext/attr-ifunc-2.C
-UNSUPPORTED: g++.dg/ext/attr-ifunc-3.C
-UNSUPPORTED: g++.dg/ext/attr-ifunc-4.C
+PASS: g++.dg/ext/attr-ifunc-1.C (test for excess errors)
+PASS: g++.dg/ext/attr-ifunc-1.C execution test
+PASS: g++.dg/ext/attr-ifunc-2.C (test for excess errors)
+PASS: g++.dg/ext/attr-ifunc-2.C execution test
+PASS: g++.dg/ext/attr-ifunc-3.C (test for excess errors)
+PASS: g++.dg/ext/attr-ifunc-3.C execution test
+PASS: g++.dg/ext/attr-ifunc-4.C (test for excess errors)
+PASS: g++.dg/ext/attr-ifunc-4.C execution test
+PASS: g++.dg/init/array28.C (test for errors, line 5)
+PASS: g++.dg/init/array28.C (test for excess errors)
-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/template/template-id-4.C (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 -flto -flto-partition=none (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -Os (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O0 (t...

[Michael Hope (michaelh1)]

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

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6/logs/i686-natty-cbuild161-oort2-i686r1

+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 44)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 45)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 49)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 50)
+PASS: g++.dg/cpp0x/constexpr-48089.C (test for errors, line 36)
+PASS: g++.dg/cpp0x/constexpr-48089.C (test for warnings, line 31)
+PASS: g++.dg/cpp0x/constexpr-array4.C (test for excess errors)
+PASS: g++.dg/cpp0x/constexpr-non-const-arg3.C (test for excess errors)
+PASS: g++.dg/cpp0x/constexpr-non-const-arg3.C execution test
+PASS: g++.dg/cpp0x/decltype31.C (test for errors, line 11)
+PASS: g++.dg/cpp0x/decltype31.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-defarg2.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-ref2.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-ref2.C execution test
+PASS: g++.dg/cpp0x/lambda/lambda-variadic1.C (test for excess errors)
+PASS: g++.dg/cpp0x/regress/regress5.C (test for excess errors)
+PASS: g++.dg/cpp0x/union5.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic114.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic115.C (test for excess errors)
+PASS: g++.dg/diagnostic/aka1.C (test for errors, line 15)
+PASS: g++.dg/diagnostic/aka1.C (test for errors, line 9)
+PASS: g++.dg/diagnostic/aka1.C (test for excess errors)
-UNSUPPORTED: g++.dg/ext/attr-ifunc-1.C
-UNSUPPORTED: g++.dg/ext/attr-ifunc-2.C
-UNSUPPORTED: g++.dg/ext/attr-ifunc-3.C
-UNSUPPORTED: g++.dg/ext/attr-ifunc-4.C
+PASS: g++.dg/ext/attr-ifunc-1.C (test for excess errors)
+PASS: g++.dg/ext/attr-ifunc-1.C execution test
+PASS: g++.dg/ext/attr-ifunc-2.C (test for excess errors)
+PASS: g++.dg/ext/attr-ifunc-2.C execution test
+PASS: g++.dg/ext/attr-ifunc-3.C (test for excess errors)
+PASS: g++.dg/ext/attr-ifunc-3.C execution test
+PASS: g++.dg/ext/attr-ifunc-4.C (test for excess errors)
+PASS: g++.dg/ext/attr-ifunc-4.C execution test
+PASS: g++.dg/init/array28.C (test for errors, line 5)
+PASS: g++.dg/init/array28.C (test for excess errors)
-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/template/template-id-4.C (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 -flto -flto-partition=none (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -Os (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O0 (test for ...

[Michael Hope (michaelh1)]

cbuild successfully built this on armv7l-natty-cbuild161-ursa2-cortexa9r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6/logs/armv7l-natty-cbuild161-ursa2-cortexa9r1

+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 44)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 45)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 49)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 50)
+PASS: g++.dg/cpp0x/constexpr-48089.C (test for errors, line 36)
+PASS: g++.dg/cpp0x/constexpr-48089.C (test for warnings, line 31)
+PASS: g++.dg/cpp0x/constexpr-array4.C (test for excess errors)
+PASS: g++.dg/cpp0x/constexpr-non-const-arg3.C (test for excess errors)
+PASS: g++.dg/cpp0x/constexpr-non-const-arg3.C execution test
+PASS: g++.dg/cpp0x/decltype31.C (test for errors, line 11)
+PASS: g++.dg/cpp0x/decltype31.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-defarg2.C (test for excess errors)
-FAIL: g++.dg/cpp0x/lambda/lambda-eh2.C execution test
+PASS: g++.dg/cpp0x/lambda/lambda-eh2.C execution test
+PASS: g++.dg/cpp0x/lambda/lambda-ref2.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-ref2.C execution test
+PASS: g++.dg/cpp0x/lambda/lambda-variadic1.C (test for excess errors)
+PASS: g++.dg/cpp0x/regress/regress5.C (test for excess errors)
+PASS: g++.dg/cpp0x/union5.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic114.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic115.C (test for excess errors)
+PASS: g++.dg/diagnostic/aka1.C (test for errors, line 15)
+PASS: g++.dg/diagnostic/aka1.C (test for errors, line 9)
+PASS: g++.dg/diagnostic/aka1.C (test for excess errors)
+PASS: g++.dg/init/array28.C (test for errors, line 5)
+PASS: g++.dg/init/array28.C (test for excess errors)
-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/template/template-id-4.C (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 -flto -flto-partition=none (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -Os (test for excess errors)
+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 excess errors)
+PASS: g++.dg/torture/pr49615.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O2 -flto -flto-partition=none (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O3 -fomit-frame-pointer -funroll-all-loops -finl...

[Michael Hope (michaelh1)]

cbuild successfully built this on armv7l-natty-cbuild161-ursa4-armv5r2.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6/logs/armv7l-natty-cbuild161-ursa4-armv5r2

+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 44)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 45)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 49)
+XFAIL: g++.dg/cpp0x/constexpr-48089.C (test for bogus messages, line 50)
+PASS: g++.dg/cpp0x/constexpr-48089.C (test for errors, line 36)
+PASS: g++.dg/cpp0x/constexpr-48089.C (test for warnings, line 31)
+PASS: g++.dg/cpp0x/constexpr-array4.C (test for excess errors)
+PASS: g++.dg/cpp0x/constexpr-non-const-arg3.C (test for excess errors)
+PASS: g++.dg/cpp0x/constexpr-non-const-arg3.C execution test
+PASS: g++.dg/cpp0x/decltype31.C (test for errors, line 11)
+PASS: g++.dg/cpp0x/decltype31.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-defarg2.C (test for excess errors)
-FAIL: g++.dg/cpp0x/lambda/lambda-eh2.C execution test
+PASS: g++.dg/cpp0x/lambda/lambda-eh2.C execution test
+PASS: g++.dg/cpp0x/lambda/lambda-ref2.C (test for excess errors)
+PASS: g++.dg/cpp0x/lambda/lambda-ref2.C execution test
+PASS: g++.dg/cpp0x/lambda/lambda-variadic1.C (test for excess errors)
+PASS: g++.dg/cpp0x/regress/regress5.C (test for excess errors)
+PASS: g++.dg/cpp0x/union5.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic114.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic115.C (test for excess errors)
+PASS: g++.dg/diagnostic/aka1.C (test for errors, line 15)
+PASS: g++.dg/diagnostic/aka1.C (test for errors, line 9)
+PASS: g++.dg/diagnostic/aka1.C (test for excess errors)
+PASS: g++.dg/init/array28.C (test for errors, line 5)
+PASS: g++.dg/init/array28.C (test for excess errors)
-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/template/template-id-4.C (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O2 -flto -flto-partition=none (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -O3 -g (test for excess errors)
+PASS: g++.dg/torture/pr49309.C -Os (test for excess errors)
+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 excess errors)
+PASS: g++.dg/torture/pr49615.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O2 -flto -flto-partition=none (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O3 -fomit-frame-pointer (test for excess errors)
+PASS: g++.dg/torture/pr49615.C -O3 -fomit-frame-pointer -funroll-all-loops -finline-fu...

[Michael Hope (michaelh1)]

I've checked the x86_64 and i686 differences at:
 http://builds.linaro.org/toolchain/gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6/logs/x86_64-natty-cbuild161-oort1-x86_64r1/testsuite-diff.txt

and:
 http://builds.linaro.org/toolchain/gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6/logs/i686-natty-cbuild161-oort2-i686r1/testsuite-diff.txt

All are new passes, new xfails, or changes in the pattern being checked.

[Michael Hope (michaelh1)]

I've checked the cortexa9 differences at:
 http://builds.linaro.org/toolchain/gcc-linaro-4.6+bzr106790~michaelh1~merge-from-fsf-r177703-4.6/logs/armv7l-natty-cbuild161-ursa2-cortexa9r1/testsuite-diff.txt

The new fails are:

-PASS: gcc.dg/ipa/ipa-sra-2.c scan-tree-dump eipa_sra "About to replace expr calf_.*D.->green with ISRA"
-PASS: gcc.dg/ipa/ipa-sra-2.c scan-tree-dump eipa_sra "About to replace expr calf_.*D.->red with \*ISRA"
-PASS: gcc.dg/ipa/ipa-sra-2.c scan-tree-dump eipa_sra "About to replace expr cow_.*D.->green with ISRA"
-PASS: gcc.dg/ipa/ipa-sra-2.c scan-tree-dump eipa_sra "About to replace expr cow_.*D.->red with \*ISRA"
+FAIL: gcc.dg/ipa/ipa-sra-2.c scan-tree-dump eipa_sra "About to replace expr calf_.*D.->green with ISRA"
+FAIL: gcc.dg/ipa/ipa-sra-2.c scan-tree-dump eipa_sra "About to replace expr calf_.*D.->red with \*ISRA"
+FAIL: gcc.dg/ipa/ipa-sra-2.c scan-tree-dump eipa_sra "About to replace expr cow_.*D.->green with ISRA"
+FAIL: gcc.dg/ipa/ipa-sra-2.c scan-tree-dump eipa_sra "About to replace expr cow_.*D.->red with \*ISRA"
-PASS: gcc.dg/ipa/ipa-sra-6.c scan-tree-dump-times eipa_sra "foo " 1
+FAIL: gcc.dg/ipa/ipa-sra-6.c scan-tree-dump-times eipa_sra "foo " 1

These faults also exist in trunk. See:
 http://ex.seabright.co.nz/helpers/testlog/gcc-4.6+svn177688/logs/armv7l-natty-cbuild161-ursa2-cortexa9r1/gcc-testsuite.txt

...so it's not specific to us.

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2011-08-10 23:03:03 +0000
+++ ChangeLog.linaro	2011-08-13 08:58:15 +0000
@@ -1,3 +1,7 @@
[phone]  Michael Hope  <[e-mail]>
+
+	Merge from FSF GCC 4.6.1 (svn branches/gcc-4_6-branch 177703).
+
 2011-08-11  Ramana Radhakrishnan  <[e-mail]>
 
 	gcc/

=== modified file 'gcc/ChangeLog'
--- gcc/ChangeLog	2011-07-01 09:19:21 +0000
+++ gcc/ChangeLog	2011-08-13 08:58:15 +0000
@@ -1,9 +1,451 @@
[phone]  Nick Clifton  <[e-mail]>
+
+	* builtins.c (expand_builtin_memcmp): Do not use cmpstrnsi
+	pattern.
+	* doc/md.texi (cmpstrn): Note that the comparison stops if both
+	fetched bytes are zero.
+	(cmpstr): Likewise.
+	(cmpmem): Note that the comparison does not stop if both of the
+	fetched bytes are zero.
+
[phone]   Kazuhiro Inaoka  <[e-mail]>
+
+	* config/rx/rx.md (movsicc): Allow register to register
+	transfers.
+	(*movsicc): Likewise.
+	(*stcc): Restrict this pattern to EQ and NE compares.
+	(*stcc_reg): New pattern.  Works for any comparison but only for
+	register transfers.
+
[phone]  DJ Delorie  <[e-mail]>
+
+	* expr.c (expand_expr_addr_expr_1): Detect a user request for
+	a local frame in a naked function, and produce a suitable
+	error for that specific case.
+
[phone]  Martin Jambor  <[e-mail]>
+
+	PR middle-end/49923
+	* tree-sra.c (access_precludes_ipa_sra_p): Also check access
+	memory alignment.
+
[phone]  Nick Clifton  <[e-mail]>
+
+	* config/rx/rx.md: Disable extender peepholes at -O3.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	PR target/50001
+	* config/alpha/alpha.c (alpha_instantiate_decls): New function.
+	(TARGET_INSTANTIATE_DECLS): New define.
+
[phone]  H.J. Lu  <[e-mail]>
+
+	Backport from mainline
+	2011-08-05  H.J. Lu  <[e-mail]>
+
+	* config/i386/i386.c (processor_alias_table): Add core-avx-i.
+
+	* doc/invoke.texi: Document core-avx-i.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/49948
+	* gimple.c (walk_stmt_load_store_addr_ops): Walk CONSTRUCTOR elements.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	* doc/md.texi (stack_protect_set): The pattern moves ptr_mode value.
+	(stack_protect_test): The pattern compares ptr_mode value.
+
[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.
+	(*strsethi_1): Ditto.
+	(*strsetqi_1): Ditto.
+	(*rep_stosdi_rex64): Disable when %eax, %ecx or %edi are fixed.
+	(*rep_stossi): Ditto.
+	(*rep_stosqi): Ditto.
+	(*strlenqi_1): Ditto.
+	(cmpstrnsi): Also fail when %ecx is fixed.
+	(*cmpstrnqi_nz_1): Disable when %ecx, %esi or %edi are fixed.
+	(*cmpstrnqi_1): Ditto.
+	(*strmovdi_rex_1): Disable when %esi or %edi are fixed.
+	(*strmovsi_1): Ditto.
+	(*strmovhi_1): Ditto.
+	(*strmovqi_1): Ditto.
+	(*rep_movdi_rex64): Disable when %ecx, %esi or %edi are fixed.
+	(*rep_movsi): Ditto.
+	(*rep_movqi): Ditto.
+
[phone]  Mikael Pettersson  <[e-mail]>
+
+	PR target/47908
+	* config/m68k/m68k.c (m68k_override_options_after_change): New function.
+	Disable instruction scheduling for non-ColdFire targets.
+	(TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE): Define.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR middle-end/49897
+	PR middle-end/49898
+	* omp-low.c (use_pointer_for_field): If disallowing copy-in/out
+	in nested parallel and outer is a gimple_reg, mark it as addressable
+	and set its bit in task_shared_vars bitmap too.
+
[phone]  Wei Guozhi  <[e-mail]>
+
+	Backport from mainline
+	2011-07-29  Wei Guozhi  <[e-mail]>
+
+	PR rtl-optimization/49799
+	* combine.c (make_compound_operation): Check if the bit field is valid
+	before change it to bit field extraction.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR debug/49871
+	* dwarf2out.c (size_of_die, value_format, output_die): Use
+	DW_FORM_udata instead of DW_FORM_data[48] for
+	dw_val_class_unsigned_const DW_AT_data_member_location for DWARF 3.
+
[phone]  H.J. Lu  <[e-mail]>
+
+	Backport from mainline
+	2011-07-28  H.J. Lu  <[e-mail]>
+
+	PR target/47364
+	* config/i386/i386.md (strlen<mode>): Replace SWI48x with P.
+
[phone]  Ulrich Weigand  <[e-mail]>
+
+	Backport from mainline:
+	2011-07-26  Martin Jambor  <[e-mail]>
+
+	* tree-sra.c (tree_non_mode_aligned_mem_p): Strip conversions and
+	return false for invariants.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR target/49866
+	* config/i386/i386.md (*call_pop_1_vzeroupper, *call_pop_1,
+	*sibcall_pop_1_vzeroupper, *sibcall_pop_1, *call_1_vzeroupper,
+	*call_1, *sibcall_1_vzeroupper, *sibcall_1, *call_1_rex64_vzeroupper,
+	*call_1_rex64, *call_1_rex64_ms_sysv_vzeroupper,
+	*call_1_rex64_ms_sysv, *sibcall_1_rex64_vzeroupper,
+	*sibcall_1_rex64, *call_value_pop_1_vzeroupper,
+	*call_value_pop_1, *sibcall_value_pop_1_vzeroupper,
+	*sibcall_value_pop_1, *call_value_1_vzeroupper,
+	*call_value_1, *sibcall_value_1_vzeroupper,
+	*sibcall_value_1, *call_value_1_rex64_vzeroupper,
+	*call_value_1_rex64, *call_value_1_rex64_ms_sysv_vzeroupper,
+	*call_value_1_rex64_ms_sysv, *sibcall_value_1_rex64_vzeroupper,
+	*sibcall_value_1_rex64): Use z constraint instead of s constraint.
+
+	Backport from mainline
+	2011-05-16  Uros Bizjak  <[e-mail]>
+        
+        * config/i386/constraints.md (z): New constraint.
+
[phone]  Andrew Pinski  <[e-mail]>
+
+	PR tree-opt/49671
+	* tree-inline.c (remap_gimple_op_r): Copy TREE_THIS_VOLATILE and
+	TREE_THIS_NOTRAP into the inner most MEM_REF.
+	Always copy TREE_THIS_VOLATILE.
+	* tree-sra.c (ptr_parm_has_direct_uses): Check that the lhs, rhs and
+	arguments are not volatile references.
+
[phone]  Georg-Johann Lay  <[e-mail]>
+	
+	PR target/39386
+	Backport from mainline r176756
+	2011-07-25  Georg-Johann Lay
+	* config/avr/avr.c (out_shift_with_cnt): Use tmp_reg as
+	shift counter for x << x and x >> x shifts.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	* config.gcc (x86_64-*-linux*): Set
+	default_gnu_indirect_function to yes.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/45819
+	* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Properly
+	preserve volatile and notrap flags.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	Backport from mainline
+	2011-07-04  Uros Bizjak  <[e-mail]>
+
+	PR target/49600
+	* config/i386/i386.md (SSE2 int->float split): Push operand 1 in
+	general register to memory for !TARGET_INTER_UNIT_MOVES.
+
[phone]  Andreas Krebbel  <[e-mail]>
+
+	* config/s390/s390.c (s390_class_max_nregs): Fix return type.
+	* config/s390/s390-protos.h (s390_class_max_nregs): Likewise.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/49768
+	* tree-ssa-ccp.c (fold_nonarray_ctor_reference): Return NULL
+	if offset is smaller than bitoffset, but offset+size is bigger
+	than bitoffset.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR middle-end/49675
+	* tree.c (build_common_builtin_nodes): Register
+	__builtin_return_address, __cyg_profile_func_enter
+	and __cyg_profile_func_exit.
+
[phone]  Rainer Orth  <[e-mail]>
+
+	* config.gcc: Obsolete i[3456x]86-*-netware*.
+
[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]  Eric Botcazou  <[e-mail]>
+
+	PR middle-end/49732
+	* tree.c (walk_tree_1) <DECL_EXPR>: Do not walk a pointed-to type.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	PR tree-optimization/49725
+	Backport from mainline
+	2011-03-31  Eric Botcazou  <[e-mail]>
+
+	* tree-ssa-pre.c (create_component_ref_by_pieces_1) <ARRAY_REF>: Drop
+	a zero minimum index only if it is redundant.
+
[phone]  John David Anglin  <[e-mail]>
+
+	PR target/49723
+	* config/pa/pa.md (casesi): Use gen_int_mode instead of GEN_INT.
+
[phone]  Ulrich Weigand  <[e-mail]>
+
+	Backport from mainline:
+	2011-07-13  Ulrich Weigand  <[e-mail]>
+
+	* config/spu/spu.c (TARGET_ASM_FILE_START): Do not define.
+	(asm_file_start): Remove.
+	(spu_machine_dependent_reorg): Call compute_bb_for_insn and
+	free_bb_for_insn around code that modifies insns before
+	restarting df analysis.
+
[phone]  Rainer Orth  <[e-mail]>
+
+	Backport from mainline:
+	2011-07-13  Rainer Orth  <[e-mail]>
+
+	PR target/49541
+	* config/sol2.h (LIB_SPEC): Simplify.
+	Move LIB_THREAD_LDFLAGS_SPEC ...
+	(LINK_SPEC): ... here.
+
[phone]  James Greenhalgh  <[e-mail]>
+
+	* config/arm/arm.h (TARGET_CPU_CPP_BUILTINS): Add __ARM_FEATURE_DSP.
+
[phone]  Andrew Pinski  <[e-mail]>
+
+	PR tree-opt/49309
+	* tree-mudflap.c (mf_xform_derefs_1 <case MEM_REF>):
+	Use fold_build2_loc instead of build2.
+	Use the correct type for the new tree.
+
[phone]  Georg-Johann Lay  <[e-mail]>
+	
+	PR target/49487
+	Backport from mainline r176276
+	2011-07-14  Georg-Johann Lay
+	* config/avr/avr.md (rotl<mode>3): Generate SCRATCH instead
+	of REG.
+	(*rotw<mode>): Use const_int_operand for operand2.
+	Use match_scatch for operand3.
+	(*rotb<mode>): Ditto
+	* config/avr/avr.c (avr_rotate_bytes): Treat SCRATCH.
+
[phone]  Richard Guenther  <[e-mail]>
+
+	PR tree-optimization/49651
+	* tree-ssa-structalias.c (get_constraint_for_1): Properly
+	handle dereferences with subvariables.
+
[phone]  Martin Jambor  <[e-mail]>
+
+	PR tree-optimization/49094
+	* tree-sra.c (tree_non_mode_aligned_mem_p): New function.
+	(build_accesses_from_assign): Use it.
+
[phone]  Georg-Johann Lay  <[e-mail]>
+	
+	PR target/39633
+	Backport from mainline r176141
+	2011-07-11  Georg-Johann Lay
+	* config/avr/avr.c (notice_update_cc): For ashiftrt:QI, only
+	offsets 1..5 set cc0 in a usable way.
+
[phone]  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.
+
[phone]  Georg-Johann Lay  <[e-mail]>
+	
+	PR target/46779
+	Backport from mainline SVN 176053.
+	2011-07-08  Georg-Johann Lay  <[e-mail]>
+	* config/avr/avr.c (avr_hard_regno_mode_ok): Rewrite.
+	In particular, allow 8-bit values in r28 and r29.
+	(avr_hard_regno_scratch_ok): Disallow any register that might be
+	part of the frame pointer.
+	(avr_hard_regno_rename_ok): Same.
+	(avr_legitimate_address_p): Don't allow SUBREGs.
+
[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]  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 debug/49522
+	* df-problems.c (dead_debug_reset): Remove dead_debug_uses
+	referencing debug insns that have been reset.
+	(dead_debug_insert_before): Don't assert reg is non-NULL,
+	instead return immediately if it is NULL.
+
+	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.
+
[phone]  Ramana Radhakrishnan  <[e-mail]>
+
+	Backport from mainline.
+	2011-06-24  Ramana Radhakrishnan  <[e-mail]>
+
+	PR target/49335
+	* config/arm/predicates.md (add_operator): New.
+	* config/arm/arm.md ("*arith_shiftsi"): Fix for SP reg usage
+	in Thumb2.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR tree-optimization/49618
+	* tree-eh.c (tree_could_trap_p) <case FUNCTION_DECL, case VAR_DECL>:
+	For DECL_WEAK decls return true.
+
[phone]  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.
+
+	PR rtl-optimization/49472
+	* simplify-rtx.c (simplify_unary_operation_1) <case NEG>: When
+	negating MULT, negate the second operand instead of first.
+	(simplify_binary_operation_1) <case MULT>: If one operand is
+	a NEG and the other is MULT, don't attempt to optimize by
+	negation of the MULT operand if it only moves the NEG operation
+	around.
+
+	Backported from mainline
+	2011-06-06  Jakub Jelinek  <[e-mail]>
+
+	PR debug/49262
+	* dwarf2out.c (native_encode_initializer): Decrement count in each
+	iteration.
+
[phone]  Georg-Johann Lay  <[e-mail]>
+
+	Backport from mainline
+	2011-07-04  Georg-Johann Lay  <[e-mail]>
+	
+	PR target/44643
+	* config/avr/avr.c (avr_insert_attributes): Use TYPE_READONLY
+	instead of TREE_READONLY.
+
[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]  Georg-Johann Lay  <[e-mail]>
+
+	Backport from mainline
+	PR target/34734
+	(avr_section_type_flags): For data in ".progmem.data", remove
+	section flag SECTION_WRITE.
+
[phone]  Georg-Johann Lay  <[e-mail]>
+
+	Backport from mainline
+	PR target/34734
+	* config/avr/avr.c (avr_handle_progmem_attribute): Move warning
+	about uninitialized data attributed 'progmem' from here...
+	(avr_encode_section_info): ...to this new function.
+	(TARGET_ENCODE_SECTION_INFO): New define.
+
 2011-06-29  Changpeng Fang  <[e-mail]>
+
 	Backport from mainline
 	2011-06-29  Changpeng Fang  <[e-mail]>
 
-	* config/i386/i386.opt (mprefer-avx128): Redefine the flag as a Mask option.
-	* config/i386/i386.h (ix86_tune_indices): Add X86_TUNE_AVX128_OPTIMAL entry.
+	* config/i386/i386.opt (mprefer-avx128): Redefine the flag as a Mask
+	option.
+	* config/i386/i386.h (ix86_tune_indices): Add X86_TUNE_AVX128_OPTIMAL
+	entry.
 	(TARGET_AVX128_OPTIMAL): New definition.
 	* config/i386/i386.c (initial_ix86_tune_features): Initialize
 	X86_TUNE_AVX128_OPTIMAL entry.

=== modified file 'gcc/DATESTAMP'
--- gcc/DATESTAMP	2011-06-30 00:17:44 +0000
+++ gcc/DATESTAMP	2011-08-13 08:58:15 +0000
@@ -1,1 +1,1 @@
-20110630
[phone]

=== modified file 'gcc/ada/ChangeLog'
--- gcc/ada/ChangeLog	2011-06-27 10:03:04 +0000
+++ gcc/ada/ChangeLog	2011-08-13 08:58:15 +0000
@@ -1,3 +1,32 @@
[phone]  Eric Botcazou  <[e-mail]>
+
+	Backport from mainline
+	2011-07-23  Arnaud Charlet  <[e-mail]>
+
+	PR ada/49819
+	* gcc-interface/Makefile.in (powerpc-linux): Remove reference to
+	g-trasym-dwarf.adb.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	PR ada/48711
+	* g-socthi-mingw.adb (Fill): Fix formatting.
+
[phone]  John David Anglin  <[e-mail]>
+
+	PR ada/46350
+	* s-taprop-hpux-dce.adb (Abort_Task): Remove unnecessary cast.
+
[phone]  Florian Weimer  <[e-mail]>
+
+	PR ada/48711
+	* g-socthi-mingw.adb (Fill): Guard against invalid MSG_WAITALL.
+
[phone]  Eric Botcazou  <[e-mail]>
+
+	* gcc-interface/Make-lang.in (gnat1): Prepend '+' to the command.
+	(gnatbind): Likewise.
+
 2011-06-27  Release Manager
 
 	* GCC 4.6.1 released.

=== modified file 'gcc/ada/g-socthi-mingw.adb'
--- gcc/ada/g-socthi-mingw.adb	2010-06-22 08:46:58 +0000
+++ gcc/ada/g-socthi-mingw.adb	2011-08-13 08:58:15 +0000
@@ -277,7 +277,8 @@
       use type C.size_t;
 
       Fill  : constant Boolean :=
-                (C.unsigned (Flags) and SOSC.MSG_WAITALL) /= 0;
+        SOSC.MSG_WAITALL /= -1
+          and then (C.unsigned (Flags) and SOSC.MSG_WAITALL) /= 0;
       --  Is the MSG_WAITALL flag set? If so we need to fully fill all vectors
 
       Res   : C.int;

=== modified file 'gcc/ada/gcc-interface/Make-lang.in'
--- gcc/ada/gcc-interface/Make-lang.in	2011-04-17 22:29:13 +0000
+++ gcc/ada/gcc-interface/Make-lang.in	2011-08-13 08:58:15 +0000
@@ -481,11 +481,11 @@
 # Since the RTL should be built with the latest compiler, remove the
 #  stamp target in the parent directory whenever gnat1 is rebuilt
 gnat1$(exeext): $(TARGET_ADA_SRCS) $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBDEPS)
-	$(GCC_LINK) -o $@ $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBS) $(SYSLIBS) $(BACKENDLIBS) $(CFLAGS)
+	+$(GCC_LINK) -o $@ $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBS) $(SYSLIBS) $(BACKENDLIBS) $(CFLAGS)
 	$(RM) stamp-gnatlib2-rts stamp-tools
 
 gnatbind$(exeext): ada/b_gnatb.o $(CONFIG_H) $(GNATBIND_OBJS)
-	$(GCC_LINK) -o $@ ada/b_gnatb.o $(GNATBIND_OBJS) $(LIBS) $(SYSLIBS) $(CFLAGS)
+	+$(GCC_LINK) -o $@ ada/b_gnatb.o $(GNATBIND_OBJS) $(LIBS) $(SYSLIBS) $(CFLAGS)
 
 # use cross-gcc
 gnat-cross: force

=== modified file 'gcc/ada/gcc-interface/Makefile.in'
--- gcc/ada/gcc-interface/Makefile.in	2011-02-08 22:55:57 +0000
+++ gcc/ada/gcc-interface/Makefile.in	2011-08-13 08:58:15 +0000
@@ -1792,7 +1792,6 @@
   s-osinte.adb<s-osinte-posix.adb \
   s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
   g-sercom.adb<g-sercom-linux.adb \
-  g-trasym.adb<g-trasym-dwarf.adb \
   $(ATOMICS_TARGET_PAIRS)
 
   ifeq ($(strip $(filter-out xenomai,$(THREAD_KIND))),)

=== 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-13 08:58:15 +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/builtins.c'
--- gcc/builtins.c	2011-07-04 09:52:27 +0000
+++ gcc/builtins.c	2011-08-13 08:58:15 +0000
@@ -4138,9 +4138,9 @@
 }
 
 /* Expand expression EXP, which is a call to the memcmp built-in function.
-   Return NULL_RTX if we failed and the
-   caller should emit a normal call, otherwise try to get the result in
-   TARGET, if convenient (and in mode MODE, if that's convenient).  */
+   Return NULL_RTX if we failed and the caller should emit a normal call,
+   otherwise try to get the result in TARGET, if convenient (and in mode
+   MODE, if that's convenient).  */
 
 static rtx
 expand_builtin_memcmp (tree exp, ATTRIBUTE_UNUSED rtx target,
@@ -4152,7 +4152,10 @@
  			 POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE))
     return NULL_RTX;
 
-#if defined HAVE_cmpmemsi || defined HAVE_cmpstrnsi
+  /* Note: The cmpstrnsi pattern, if it exists, is not suitable for
+     implementing memcmp because it will stop if it encounters two
+     zero bytes.  */
+#if defined HAVE_cmpmemsi
   {
     rtx arg1_rtx, arg2_rtx, arg3_rtx;
     rtx result;
@@ -4167,16 +4170,9 @@
       = get_pointer_alignment (arg2, BIGGEST_ALIGNMENT) / BITS_PER_UNIT;
     enum machine_mode insn_mode;
 
-#ifdef HAVE_cmpmemsi
     if (HAVE_cmpmemsi)
       insn_mode = insn_data[(int) CODE_FOR_cmpmemsi].operand[0].mode;
     else
-#endif
-#ifdef HAVE_cmpstrnsi
-    if (HAVE_cmpstrnsi)
-      insn_mode = insn_data[(int) CODE_FOR_cmpstrnsi].operand[0].mode;
-    else
-#endif
       return NULL_RTX;
 
     /* If we don't have POINTER_TYPE, call the function.  */
@@ -4201,18 +4197,10 @@
 	set_mem_size (arg2_rtx, arg3_rtx);
       }
 
-#ifdef HAVE_cmpmemsi
     if (HAVE_cmpmemsi)
       insn = gen_cmpmemsi (result, arg1_rtx, arg2_rtx, arg3_rtx,
 			   GEN_INT (MIN (arg1_align, arg2_align)));
     else
-#endif
-#ifdef HAVE_cmpstrnsi
-    if (HAVE_cmpstrnsi)
-      insn = gen_cmpstrnsi (result, arg1_rtx, arg2_rtx, arg3_rtx,
-			    GEN_INT (MIN (arg1_align, arg2_align)));
-    else
-#endif
       gcc_unreachable ();
 
     if (insn)
@@ -4238,7 +4226,7 @@
     else
       return convert_to_mode (mode, result, 0);
   }
-#endif
+#endif /* HAVE_cmpmemsi.  */
 
   return NULL_RTX;
 }

=== modified file 'gcc/c-typeck.c'
--- gcc/c-typeck.c	2011-04-27 07:05:54 +0000
+++ gcc/c-typeck.c	2011-08-13 08:58:15 +0000
@@ -10033,6 +10033,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:
@@ -10053,6 +10054,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-07-11 03:52:31 +0000
+++ gcc/combine.c	2011-08-13 08:58:15 +0000
@@ -5633,7 +5633,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
@@ -7749,6 +7749,7 @@
 	  && GET_CODE (lhs) == ASHIFT
 	  && CONST_INT_P (XEXP (lhs, 1))
 	  && INTVAL (rhs) >= INTVAL (XEXP (lhs, 1))
+	  && INTVAL (XEXP (lhs, 1)) >= 0
 	  && INTVAL (rhs) < mode_width)
 	{
 	  new_rtx = make_compound_operation (XEXP (lhs, 0), next_code);

=== modified file 'gcc/config.gcc'
--- gcc/config.gcc	2011-05-22 20:03:43 +0000
+++ gcc/config.gcc	2011-08-13 08:58:15 +0000
@@ -240,6 +240,7 @@
  | crx-*				\
  | i[34567]86-*-interix3*		\
  | i[34567]86-*-netbsd*			\
+ | i[3456x]86-*-netware*		\
  | i[34567]86-*-pe			\
  | m68hc11-*-*				\
  | m6811-*-*				\
@@ -1281,10 +1282,17 @@
 			tm_file="${tm_file} i386/linux.h"
 		fi
 		;;
-	i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/linux.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
-	i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} i386/linux.h kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
-	i[34567]86-*-kopensolaris*-gnu) tm_file="${tm_file} i386/linux.h kopensolaris-gnu.h i386/kopensolaris-gnu.h" ;;
-	i[34567]86-*-gnu*) tm_file="$tm_file i386/linux.h gnu.h i386/gnu.h";;
+	i[34567]86-*-knetbsd*-gnu)
+		tm_file="${tm_file} i386/linux.h knetbsd-gnu.h i386/knetbsd-gnu.h"
+		;;
+	i[34567]86-*-kfreebsd*-gnu)
+		tm_file="${tm_file} i386/linux.h kfreebsd-gnu.h i386/kfreebsd-gnu.h"
+		;;
+	i[34567]86-*-kopensolaris*-gnu)
+		tm_file="${tm_file} i386/linux.h kopensolaris-gnu.h i386/kopensolaris-gnu.h"
+		;;
+	i[34567]86-*-gnu*)
+		tm_file="$tm_file i386/linux.h gnu.h i386/gnu.h";;
 	esac
 	tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
 	;;
@@ -1293,9 +1301,14 @@
 		 i386/x86-64.h i386/linux64.h"
 	case ${target} in
 	x86_64-*-linux*)
-	  default_gnu_indirect_function=glibc-2011 ;;
-	x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
-	x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;;
+		default_gnu_indirect_function=yes
+		;;
+	x86_64-*-kfreebsd*-gnu)
+		tm_file="${tm_file} kfreebsd-gnu.h"
+		;;
+	x86_64-*-knetbsd*-gnu)
+		tm_file="${tm_file} knetbsd-gnu.h"
+		;;
 	esac
 	tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
 	;;
@@ -2571,7 +2584,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	2011-03-29 18:24:02 +0000
+++ gcc/config/alpha/alpha.c	2011-08-13 08:58:15 +0000
@@ -4918,6 +4918,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)
 {
@@ -11110,6 +11117,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/arm/arm.h'
--- gcc/config/arm/arm.h	2011-06-14 14:53:07 +0000
+++ gcc/config/arm/arm.h	2011-08-13 08:58:15 +0000
@@ -45,6 +45,8 @@
 #define TARGET_CPU_CPP_BUILTINS()			\
   do							\
     {							\
+	if (TARGET_DSP_MULTIPLY)			\
+	   builtin_define ("__ARM_FEATURE_DSP");	\
 	/* Define __arm__ even when in thumb mode, for	\
 	   consistency with armcc.  */			\
 	builtin_define ("__arm__");			\

=== modified file 'gcc/config/arm/predicates.md'
--- gcc/config/arm/predicates.md	2011-07-04 14:03:49 +0000
+++ gcc/config/arm/predicates.md	2011-08-13 08:58:15 +0000
@@ -709,4 +709,4 @@
        (match_test "TARGET_32BIT && neon_vector_mem_operand (op, 2)")))
 
 (define_special_predicate "add_operator"
-  (match_code "plus"))
+			 (match_code "plus"))

=== modified file 'gcc/config/avr/avr.c'
--- gcc/config/avr/avr.c	2011-06-14 19:12:53 +0000
+++ gcc/config/avr/avr.c	2011-08-13 08:58:15 +0000
@@ -78,7 +78,7 @@
 static void avr_insert_attributes (tree, tree *);
 static void avr_asm_init_sections (void);
 static unsigned int avr_section_type_flags (tree, const char *, int);
-
+static void avr_encode_section_info (tree, rtx, int);
 static void avr_reorg (void);
 static void avr_asm_out_ctor (rtx, int);
 static void avr_asm_out_dtor (rtx, int);
@@ -176,6 +176,8 @@
 #define TARGET_INSERT_ATTRIBUTES avr_insert_attributes
 #undef TARGET_SECTION_TYPE_FLAGS
 #define TARGET_SECTION_TYPE_FLAGS avr_section_type_flags
+#undef TARGET_ENCODE_SECTION_INFO
+#define TARGET_ENCODE_SECTION_INFO avr_encode_section_info
 #undef TARGET_REGISTER_MOVE_COST
 #define TARGET_REGISTER_MOVE_COST avr_register_move_cost
 #undef TARGET_MEMORY_MOVE_COST
@@ -1133,8 +1135,7 @@
 		 true_regnum (XEXP (x, 0)));
       debug_rtx (x);
     }
-  if (!strict && GET_CODE (x) == SUBREG)
-	x = SUBREG_REG (x);
+  
   if (REG_P (x) && (strict ? REG_OK_FOR_BASE_STRICT_P (x)
                     : REG_OK_FOR_BASE_NOSTRICT_P (x)))
     r = POINTER_REGS;
@@ -1476,9 +1477,8 @@
 	    {
 	      rtx x = XEXP (src, 1);
 
-	      if (GET_CODE (x) == CONST_INT
-		  && INTVAL (x) > 0
-		  && INTVAL (x) != 6)
+	      if (CONST_INT_P (x)
+		  && IN_RANGE (INTVAL (x), 1, 5))
 		{
 		  cc_status.value1 = SET_DEST (set);
 		  cc_status.flags |= CC_OVERFLOW_UNUSABLE;
@@ -3107,8 +3107,11 @@
     }
   else if (register_operand (operands[2], QImode))
     {
-      if (reg_unused_after (insn, operands[2]))
-	op[3] = op[2];
+      if (reg_unused_after (insn, operands[2])
+          && !reg_overlap_mentioned_p (operands[0], operands[2]))
+        {
+          op[3] = op[2];
+        }
       else
 	{
 	  op[3] = tmp_reg_rtx;
@@ -4395,7 +4398,9 @@
     if (mode == DImode)
       move_mode = QImode;
     /* Make scratch smaller if needed.  */
-    if (GET_MODE (scratch) == HImode && move_mode == QImode)
+    if (SCRATCH != GET_CODE (scratch)
+        && HImode == GET_MODE (scratch)
+        && QImode == move_mode)
       scratch = simplify_gen_subreg (move_mode, scratch, HImode, 0); 
 
     move_size = GET_MODE_SIZE (move_mode);
@@ -4491,6 +4496,8 @@
 		   When this move occurs, it will break chain deadlock.
 		   The scratch register is substituted for real move.  */
 
+		gcc_assert (SCRATCH != GET_CODE (scratch));
+
 		move[size].src = move[blocked].dst;
 		move[size].dst =  scratch;
 		/* Scratch move is never blocked.  */
@@ -4961,12 +4968,7 @@
 	}
       else if (TREE_STATIC (*node) || DECL_EXTERNAL (*node))
 	{
-	  if (DECL_INITIAL (*node) == NULL_TREE && !DECL_EXTERNAL (*node))
-	    {
-	      warning (0, "only initialized variables can be placed into "
-		       "program memory area");
-	      *no_add_attrs = true;
-	    }
+          *no_add_attrs = false;
 	}
       else
 	{
@@ -5052,7 +5054,19 @@
       && (TREE_STATIC (node) || DECL_EXTERNAL (node))
       && avr_progmem_p (node, *attributes))
     {
-      if (TREE_READONLY (node)) 
+      tree node0 = node;
+
+      /* For C++, we have to peel arrays in order to get correct
+         determination of readonlyness.  */
+      
+      do
+        node0 = TREE_TYPE (node0);
+      while (TREE_CODE (node0) == ARRAY_TYPE);
+
+      if (error_mark_node == node0)
+        return;
+      
+      if (TYPE_READONLY (node0))
         {
           static const char dsec[] = ".progmem.data";
 
@@ -5107,9 +5121,36 @@
 		 ".noinit section");
     }
 
+  if (0 == strncmp (name, ".progmem.data", strlen (".progmem.data")))
+    flags &= ~SECTION_WRITE;
+  
   return flags;
 }
 
+
+/* Implement `TARGET_ENCODE_SECTION_INFO'.  */
+
+static void
+avr_encode_section_info (tree decl, rtx rtl, int new_decl_p)
+{
+  /* In avr_handle_progmem_attribute, DECL_INITIAL is not yet
+     readily available, see PR34734.  So we postpone the warning
+     about uninitialized data in program memory section until here.  */
+   
+  if (new_decl_p
+      && decl && DECL_P (decl)
+      && NULL_TREE == DECL_INITIAL (decl)
+      && avr_progmem_p (decl, DECL_ATTRIBUTES (decl)))
+    {
+      warning (OPT_Wuninitialized,
+               "uninitialized variable %q+D put into "
+               "program memory area", decl);
+    }
+
+  default_encode_section_info (decl, rtl, new_decl_p);
+}
+
+
 /* Outputs some appropriate text to go at the start of an assembler
    file.  */
 
@@ -6048,26 +6089,30 @@
 int
 avr_hard_regno_mode_ok (int regno, enum machine_mode mode)
 {
-  /* Disallow QImode in stack pointer regs.  */
-  if ((regno == REG_SP || regno == (REG_SP + 1)) && mode == QImode)
-    return 0;
-
-  /* The only thing that can go into registers r28:r29 is a Pmode.  */
-  if (regno == REG_Y && mode == Pmode)
-    return 1;
-
-  /* Otherwise disallow all regno/mode combinations that span r28:r29.  */
-  if (regno <= (REG_Y + 1) && (regno + GET_MODE_SIZE (mode)) >= (REG_Y + 1))
-    return 0;
-
-  if (mode == QImode)
-    return 1;
-
-  /* Modes larger than QImode occupy consecutive registers.  */
-  if (regno + GET_MODE_SIZE (mode) > FIRST_PSEUDO_REGISTER)
-    return 0;
-
-  /* All modes larger than QImode should start in an even register.  */
+  /* NOTE: 8-bit values must not be disallowed for R28 or R29.
+        Disallowing QI et al. in these regs might lead to code like
+            (set (subreg:QI (reg:HI 28) n) ...)
+        which will result in wrong code because reload does not
+        handle SUBREGs of hard regsisters like this.
+        This could be fixed in reload.  However, it appears
+        that fixing reload is not wanted by reload people.  */
+  
+  /* Any GENERAL_REGS register can hold 8-bit values.  */
+  
+  if (GET_MODE_SIZE (mode) == 1)
+    return 1;
+
+  /* FIXME: Ideally, the following test is not needed.
+        However, it turned out that it can reduce the number
+        of spill fails.  AVR and it's poor endowment with
+        address registers is extreme stress test for reload.  */
+  
+  if (GET_MODE_SIZE (mode) >= 4
+      && regno >= REG_X)
+    return 0;
+
+  /* All modes larger than 8 bits should start in an even register.  */
+  
   return !(regno & 1);
 }
 
@@ -6194,13 +6239,23 @@
       && !df_regs_ever_live_p (regno))
     return false;
 
+  /* Don't allow hard registers that might be part of the frame pointer.
+     Some places in the compiler just test for [HARD_]FRAME_POINTER_REGNUM
+     and don't care for a frame pointer that spans more than one register.  */
+
+  if ((!reload_completed || frame_pointer_needed)
+      && (regno == REG_Y || regno == REG_Y + 1))
+    {
+      return false;
+    }
+
   return true;
 }
 
 /* Return nonzero if register OLD_REG can be renamed to register NEW_REG.  */
 
 int
-avr_hard_regno_rename_ok (unsigned int old_reg ATTRIBUTE_UNUSED,
+avr_hard_regno_rename_ok (unsigned int old_reg,
 			  unsigned int new_reg)
 {
   /* Interrupt functions can only use registers that have already been
@@ -6211,6 +6266,17 @@
       && !df_regs_ever_live_p (new_reg))
     return 0;
 
+  /* Don't allow hard registers that might be part of the frame pointer.
+     Some places in the compiler just test for [HARD_]FRAME_POINTER_REGNUM
+     and don't care for a frame pointer that spans more than one register.  */
+
+  if ((!reload_completed || frame_pointer_needed)
+      && (old_reg == REG_Y || old_reg == REG_Y + 1
+          || new_reg == REG_Y || new_reg == REG_Y + 1))
+    {
+      return 0;
+    }
+  
   return 1;
 }
 

=== modified file 'gcc/config/avr/avr.md'
--- gcc/config/avr/avr.md	2011-06-14 19:12:53 +0000
+++ gcc/config/avr/avr.md	2011-08-13 08:58:15 +0000
@@ -1514,18 +1514,18 @@
 				(match_operand:VOID 2 "const_int_operand" "")))
 		(clobber (match_operand 3 ""))])]
   ""
-  "
-{
-  if (CONST_INT_P (operands[2]) && 0 == (INTVAL (operands[2]) % 8))
   {
-  if (AVR_HAVE_MOVW && 0 == INTVAL (operands[2]) % 16)
-    operands[3] = gen_reg_rtx (<rotsmode>mode);
-  else
-    operands[3] = gen_reg_rtx (QImode);
-  }
-  else
-    FAIL;
-}")
+    if (CONST_INT_P (operands[2])
+        && 0 == INTVAL (operands[2]) % 8)
+      {
+        if (AVR_HAVE_MOVW && 0 == INTVAL (operands[2]) % 16)
+          operands[3] = gen_rtx_SCRATCH (<rotsmode>mode);
+        else
+          operands[3] = gen_rtx_SCRATCH (QImode);
+      }
+    else
+      FAIL;
+  })
 
 
 ;; Overlapping non-HImode registers often (but not always) need a scratch.
@@ -1537,34 +1537,38 @@
 ; Split word aligned rotates using scratch that is mode dependent.
 (define_insn_and_split "*rotw<mode>"
   [(set (match_operand:HIDI 0 "register_operand" "=r,r,#&r")
-	(rotate:HIDI (match_operand:HIDI 1 "register_operand" "0,r,r")
-		     (match_operand 2 "immediate_operand" "n,n,n")))
-   (clobber (match_operand:<rotsmode> 3 "register_operand"  "=<rotx>" ))]
-  "(CONST_INT_P (operands[2]) &&
-     (0 == (INTVAL (operands[2]) % 16) && AVR_HAVE_MOVW))"
+        (rotate:HIDI (match_operand:HIDI 1 "register_operand" "0,r,r")
+                     (match_operand 2 "const_int_operand" "n,n,n")))
+   (clobber (match_scratch:<rotsmode> 3 "=<rotx>"))]
+  "AVR_HAVE_MOVW
+   && CONST_INT_P (operands[2])
+   && 0 == INTVAL (operands[2]) % 16"
   "#"
   "&& (reload_completed || <MODE>mode == DImode)"
   [(const_int 0)]
-  "avr_rotate_bytes (operands);
-  DONE;"
-)
+  {
+    avr_rotate_bytes (operands);
+    DONE;
+  })
 
 
 ; Split byte aligned rotates using scratch that is always QI mode.
 (define_insn_and_split "*rotb<mode>"
   [(set (match_operand:HIDI 0 "register_operand" "=r,r,#&r")
-	(rotate:HIDI (match_operand:HIDI 1 "register_operand" "0,r,r")
-		     (match_operand 2 "immediate_operand" "n,n,n")))
-   (clobber (match_operand:QI 3 "register_operand" "=<rotx>" ))]
-  "(CONST_INT_P (operands[2]) &&
-     (8 == (INTVAL (operands[2]) % 16)
-     	|| (!AVR_HAVE_MOVW && 0 == (INTVAL (operands[2]) % 16))))"
+        (rotate:HIDI (match_operand:HIDI 1 "register_operand" "0,r,r")
+                     (match_operand 2 "const_int_operand" "n,n,n")))
+   (clobber (match_scratch:QI 3 "=<rotx>"))]
+  "CONST_INT_P (operands[2])
+   && (8 == INTVAL (operands[2]) % 16
+       || (!AVR_HAVE_MOVW
+           && 0 == INTVAL (operands[2]) % 16))"
   "#"
   "&& (reload_completed || <MODE>mode == DImode)"
   [(const_int 0)]
-  "avr_rotate_bytes (operands);
-  DONE;"
-)
+  {
+    avr_rotate_bytes (operands);
+    DONE;
+  })
 
 
 ;;<< << << << << << << << << << << << << << << << << << << << << << << << << <<

=== modified file 'gcc/config/i386/constraints.md'
--- gcc/config/i386/constraints.md	2011-05-16 20:29:20 +0000
+++ gcc/config/i386/constraints.md	2011-08-13 08:58:15 +0000
@@ -19,7 +19,7 @@
 
 ;;; Unused letters:
 ;;;     B     H           T  W
-;;;           h jk          vw  z
+;;;           h jk          vw
 
 ;; Integer register constraints.
 ;; It is not necessary to define 'r' here.
@@ -105,6 +105,10 @@
  "TARGET_MMX && TARGET_INTER_UNIT_MOVES ? MMX_REGS : NO_REGS"
  "@internal Any MMX register, when inter-unit moves are enabled.")
 
+(define_constraint "z"
+  "@internal Constant call address operand."
+  (match_operand 0 "constant_call_address_operand"))
+
 ;; Integer constant constraints.
 (define_constraint "I"
   "Integer constant in the range 0 @dots{} 31, for 32-bit shifts."

=== modified file 'gcc/config/i386/i386.c'
--- gcc/config/i386/i386.c	2011-06-29 20:15:32 +0000
+++ gcc/config/i386/i386.c	2011-08-13 08:58:15 +0000
@@ -3412,6 +3412,11 @@
 	PTA_64BIT | PTA_MMX | PTA_SSE | PTA_SSE2 | PTA_SSE3
 	| PTA_SSSE3 | PTA_SSE4_1 | PTA_SSE4_2 | PTA_AVX
 	| PTA_CX16 | PTA_POPCNT | PTA_AES | PTA_PCLMUL},
+      {"core-avx-i", PROCESSOR_COREI7_64, CPU_COREI7,
+	PTA_64BIT | PTA_MMX | PTA_SSE | PTA_SSE2 | PTA_SSE3
+	| PTA_SSSE3 | PTA_SSE4_1 | PTA_SSE4_2 | PTA_AVX
+	| PTA_CX16 | PTA_POPCNT | PTA_AES | PTA_PCLMUL | PTA_FSGSBASE
+	| PTA_RDRND | PTA_F16C},
       {"atom", PROCESSOR_ATOM, CPU_ATOM,
 	PTA_64BIT | PTA_MMX | PTA_SSE | PTA_SSE2 | PTA_SSE3
 	| PTA_SSSE3 | PTA_CX16 | PTA_MOVBE},

=== modified file 'gcc/config/i386/i386.md'
--- gcc/config/i386/i386.md	2011-05-16 20:29:20 +0000
+++ gcc/config/i386/i386.md	2011-08-13 08:58:15 +0000
@@ -5280,11 +5280,20 @@
   if (GET_CODE (op1) == SUBREG)
     op1 = SUBREG_REG (op1);
 
-  if (GENERAL_REG_P (op1) && TARGET_INTER_UNIT_MOVES)
+  if (GENERAL_REG_P (op1))
     {
       operands[4] = simplify_gen_subreg (V4SImode, operands[0], <MODE>mode, 0);
-      emit_insn (gen_sse2_loadld (operands[4],
-				  CONST0_RTX (V4SImode), operands[1]));
+      if (TARGET_INTER_UNIT_MOVES)
+	emit_insn (gen_sse2_loadld (operands[4],
+				    CONST0_RTX (V4SImode), operands[1]));
+      else
+	{
+	  operands[5] = ix86_force_to_memory (GET_MODE (operands[1]),
+					      operands[1]);
+	  emit_insn (gen_sse2_loadld (operands[4],
+				      CONST0_RTX (V4SImode), operands[5]));
+	  ix86_free_from_memory (GET_MODE (operands[1]));
+	}
     }
   /* We can ignore possible trapping value in the
      high part of SSE register for non-trapping math. */
@@ -11341,7 +11350,7 @@
 
 (define_insn_and_split "*call_pop_1_vzeroupper"
   [(parallel
-    [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lsm"))
+    [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lzm"))
 	   (match_operand:SI 1 "" ""))
      (set (reg:SI SP_REG)
 	  (plus:SI (reg:SI SP_REG)
@@ -11356,7 +11365,7 @@
   [(set_attr "type" "call")])
 
 (define_insn "*call_pop_1"
-  [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lsm"))
+  [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lzm"))
 	 (match_operand:SI 1 "" ""))
    (set (reg:SI SP_REG)
 	(plus:SI (reg:SI SP_REG)
@@ -11371,7 +11380,7 @@
 
 (define_insn_and_split "*sibcall_pop_1_vzeroupper"
  [(parallel
-   [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "s,U"))
+   [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "z,U"))
 	   (match_operand:SI 1 "" ""))
      (set (reg:SI SP_REG)
 	  (plus:SI (reg:SI SP_REG)
@@ -11386,7 +11395,7 @@
   [(set_attr "type" "call")])
 
 (define_insn "*sibcall_pop_1"
-  [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "s,U"))
+  [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "z,U"))
 	 (match_operand:SI 1 "" ""))
    (set (reg:SI SP_REG)
 	(plus:SI (reg:SI SP_REG)
@@ -11437,7 +11446,7 @@
   [(set_attr "type" "call")])
 
 (define_insn_and_split "*call_1_vzeroupper"
-  [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lsm"))
+  [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lzm"))
 	 (match_operand 1 "" ""))
    (unspec [(match_operand 2 "const_int_operand" "")]
    	   UNSPEC_CALL_NEEDS_VZEROUPPER)]
@@ -11449,14 +11458,14 @@
   [(set_attr "type" "call")])
 
 (define_insn "*call_1"
-  [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lsm"))
+  [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lzm"))
 	 (match_operand 1 "" ""))]
   "!TARGET_64BIT && !SIBLING_CALL_P (insn)"
   { return ix86_output_call_insn (insn, operands[0], 0); }
   [(set_attr "type" "call")])
 
 (define_insn_and_split "*sibcall_1_vzeroupper"
-  [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "s,U"))
+  [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "z,U"))
 	 (match_operand 1 "" ""))
    (unspec [(match_operand 2 "const_int_operand" "")]
    	   UNSPEC_CALL_NEEDS_VZEROUPPER)]
@@ -11468,14 +11477,14 @@
   [(set_attr "type" "call")])
 
 (define_insn "*sibcall_1"
-  [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "s,U"))
+  [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "z,U"))
 	 (match_operand 1 "" ""))]
   "!TARGET_64BIT && SIBLING_CALL_P (insn)"
   { return ix86_output_call_insn (insn, operands[0], 0); }
   [(set_attr "type" "call")])
 
 (define_insn_and_split "*call_1_rex64_vzeroupper"
-  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rsm"))
+  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rzm"))
 	 (match_operand 1 "" ""))
    (unspec [(match_operand 2 "const_int_operand" "")]
    	   UNSPEC_CALL_NEEDS_VZEROUPPER)]
@@ -11488,7 +11497,7 @@
   [(set_attr "type" "call")])
 
 (define_insn "*call_1_rex64"
-  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rsm"))
+  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rzm"))
 	 (match_operand 1 "" ""))]
   "TARGET_64BIT && !SIBLING_CALL_P (insn)
    && ix86_cmodel != CM_LARGE && ix86_cmodel != CM_LARGE_PIC"
@@ -11497,7 +11506,7 @@
 
 (define_insn_and_split "*call_1_rex64_ms_sysv_vzeroupper"
   [(parallel
-    [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rsm"))
+    [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rzm"))
 	   (match_operand 1 "" ""))
      (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
      (clobber (reg:TI XMM6_REG))
@@ -11522,7 +11531,7 @@
   [(set_attr "type" "call")])
 
 (define_insn "*call_1_rex64_ms_sysv"
-  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rsm"))
+  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rzm"))
 	 (match_operand 1 "" ""))
    (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
    (clobber (reg:TI XMM6_REG))
@@ -11561,7 +11570,7 @@
   [(set_attr "type" "call")])
 
 (define_insn_and_split "*sibcall_1_rex64_vzeroupper"
-  [(call (mem:QI (match_operand:DI 0 "sibcall_insn_operand" "s,U"))
+  [(call (mem:QI (match_operand:DI 0 "sibcall_insn_operand" "z,U"))
 	 (match_operand 1 "" ""))
    (unspec [(match_operand 2 "const_int_operand" "")]
    	   UNSPEC_CALL_NEEDS_VZEROUPPER)]
@@ -11573,7 +11582,7 @@
   [(set_attr "type" "call")])
 
 (define_insn "*sibcall_1_rex64"
-  [(call (mem:QI (match_operand:DI 0 "sibcall_insn_operand" "s,U"))
+  [(call (mem:QI (match_operand:DI 0 "sibcall_insn_operand" "z,U"))
 	 (match_operand 1 "" ""))]
   "TARGET_64BIT && SIBLING_CALL_P (insn)"
   { return ix86_output_call_insn (insn, operands[0], 0); }
@@ -15699,7 +15708,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 "memory" "both")
@@ -15714,7 +15724,7 @@
    (set (match_operand:P 1 "register_operand" "=S")
 	(plus:P (match_dup 3)
 		(const_int 4)))]
-  ""
+  "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movs{l|d}"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
@@ -15729,7 +15739,7 @@
    (set (match_operand:P 1 "register_operand" "=S")
 	(plus:P (match_dup 3)
 		(const_int 2)))]
-  ""
+  "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movsw"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
@@ -15744,7 +15754,7 @@
    (set (match_operand:P 1 "register_operand" "=S")
 	(plus:P (match_dup 3)
 		(const_int 1)))]
-  ""
+  "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "movsb"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
@@ -15779,7 +15789,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")
@@ -15798,7 +15809,7 @@
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  ""
+  "!(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")
@@ -15815,7 +15826,7 @@
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  ""
+  "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "rep{%;} movsb"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -15858,7 +15869,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]));
@@ -15880,7 +15893,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")
@@ -15892,7 +15906,7 @@
    (set (match_operand:P 0 "register_operand" "=D")
 	(plus:P (match_dup 1)
 		(const_int 4)))]
-  ""
+  "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stos{l|d}"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -15904,7 +15918,7 @@
    (set (match_operand:P 0 "register_operand" "=D")
 	(plus:P (match_dup 1)
 		(const_int 2)))]
-  ""
+  "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stosw"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -15916,7 +15930,7 @@
    (set (match_operand:P 0 "register_operand" "=D")
 	(plus:P (match_dup 1)
 		(const_int 1)))]
-  ""
+  "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
   "stosb"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
@@ -15947,7 +15961,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")
@@ -15964,7 +15979,7 @@
 	(const_int 0))
    (use (match_operand:SI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  ""
+  "!(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")
@@ -15980,7 +15995,7 @@
 	(const_int 0))
    (use (match_operand:QI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  ""
+  "!(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "rep{%;} stosb"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
@@ -16005,8 +16020,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];
@@ -16101,7 +16116,7 @@
    (clobber (match_operand:P 0 "register_operand" "=S"))
    (clobber (match_operand:P 1 "register_operand" "=D"))
    (clobber (match_operand:P 2 "register_operand" "=c"))]
-  ""
+  "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "repz{%;} cmpsb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
@@ -16141,7 +16156,7 @@
    (clobber (match_operand:P 0 "register_operand" "=S"))
    (clobber (match_operand:P 1 "register_operand" "=D"))
    (clobber (match_operand:P 2 "register_operand" "=c"))]
-  ""
+  "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
   "repz{%;} cmpsb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
@@ -16153,11 +16168,11 @@
    (set_attr "prefix_rep" "1")])
 
 (define_expand "strlen<mode>"
-  [(set (match_operand:SWI48x 0 "register_operand" "")
-	(unspec:SWI48x [(match_operand:BLK 1 "general_operand" "")
-			(match_operand:QI 2 "immediate_operand" "")
-			(match_operand 3 "immediate_operand" "")]
-		       UNSPEC_SCAS))]
+  [(set (match_operand:P 0 "register_operand" "")
+	(unspec:P [(match_operand:BLK 1 "general_operand" "")
+		   (match_operand:QI 2 "immediate_operand" "")
+		   (match_operand 3 "immediate_operand" "")]
+		  UNSPEC_SCAS))]
   ""
 {
  if (ix86_expand_strlen (operands[0], operands[1], operands[2], operands[3]))
@@ -16182,7 +16197,7 @@
 		   (match_operand:P 4 "register_operand" "0")] UNSPEC_SCAS))
    (clobber (match_operand:P 1 "register_operand" "=D"))
    (clobber (reg:CC FLAGS_REG))]
-  ""
+  "!(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
   "repnz{%;} scasb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
@@ -17567,7 +17582,7 @@
 (define_insn_and_split "*call_value_pop_1_vzeroupper"
   [(parallel
     [(set (match_operand 0 "" "")
-	  (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lsm"))
+	  (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lzm"))
 		(match_operand:SI 2 "" "")))
      (set (reg:SI SP_REG)
 	  (plus:SI (reg:SI SP_REG)
@@ -17583,7 +17598,7 @@
 
 (define_insn "*call_value_pop_1"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:SI 1 "call_insn_operand" "lsm"))
+	(call (mem:QI (match_operand:SI 1 "call_insn_operand" "lzm"))
 	      (match_operand:SI 2 "" "")))
    (set (reg:SI SP_REG)
 	(plus:SI (reg:SI SP_REG)
@@ -17595,7 +17610,7 @@
 (define_insn_and_split "*sibcall_value_pop_1_vzeroupper"
  [(parallel
    [(set (match_operand 0 "" "")
-	  (call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "s,U"))
+	  (call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "z,U"))
 		(match_operand:SI 2 "" "")))
      (set (reg:SI SP_REG)
 	  (plus:SI (reg:SI SP_REG)
@@ -17611,7 +17626,7 @@
 
 (define_insn "*sibcall_value_pop_1"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "s,U"))
+	(call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "z,U"))
 	      (match_operand:SI 2 "" "")))
    (set (reg:SI SP_REG)
 	(plus:SI (reg:SI SP_REG)
@@ -17712,7 +17727,7 @@
 
 (define_insn_and_split "*call_value_1_vzeroupper"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:SI 1 "call_insn_operand" "lsm"))
+	(call (mem:QI (match_operand:SI 1 "call_insn_operand" "lzm"))
 	      (match_operand:SI 2 "" "")))
    (unspec [(match_operand 3 "const_int_operand" "")]
    	   UNSPEC_CALL_NEEDS_VZEROUPPER)]
@@ -17725,7 +17740,7 @@
 
 (define_insn "*call_value_1"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:SI 1 "call_insn_operand" "lsm"))
+	(call (mem:QI (match_operand:SI 1 "call_insn_operand" "lzm"))
 	      (match_operand:SI 2 "" "")))]
   "!TARGET_64BIT && !SIBLING_CALL_P (insn)"
   { return ix86_output_call_insn (insn, operands[1], 1); }
@@ -17733,7 +17748,7 @@
 
 (define_insn_and_split "*sibcall_value_1_vzeroupper"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "s,U"))
+	(call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "z,U"))
 	      (match_operand:SI 2 "" "")))
    (unspec [(match_operand 3 "const_int_operand" "")]
    	   UNSPEC_CALL_NEEDS_VZEROUPPER)]
@@ -17746,7 +17761,7 @@
 
 (define_insn "*sibcall_value_1"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "s,U"))
+	(call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "z,U"))
 	      (match_operand:SI 2 "" "")))]
   "!TARGET_64BIT && SIBLING_CALL_P (insn)"
   { return ix86_output_call_insn (insn, operands[1], 1); }
@@ -17754,7 +17769,7 @@
 
 (define_insn_and_split "*call_value_1_rex64_vzeroupper"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:DI 1 "call_insn_operand" "rsm"))
+	(call (mem:QI (match_operand:DI 1 "call_insn_operand" "rzm"))
 	      (match_operand:DI 2 "" "")))
    (unspec [(match_operand 3 "const_int_operand" "")]
    	   UNSPEC_CALL_NEEDS_VZEROUPPER)]
@@ -17768,7 +17783,7 @@
 
 (define_insn "*call_value_1_rex64"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:DI 1 "call_insn_operand" "rsm"))
+	(call (mem:QI (match_operand:DI 1 "call_insn_operand" "rzm"))
 	      (match_operand:DI 2 "" "")))]
   "TARGET_64BIT && !SIBLING_CALL_P (insn)
    && ix86_cmodel != CM_LARGE && ix86_cmodel != CM_LARGE_PIC"
@@ -17778,7 +17793,7 @@
 (define_insn_and_split "*call_value_1_rex64_ms_sysv_vzeroupper"
   [(parallel
     [(set (match_operand 0 "" "")
-	  (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rsm"))
+	  (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rzm"))
 		(match_operand:DI 2 "" "")))
      (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
      (clobber (reg:TI XMM6_REG))
@@ -17804,7 +17819,7 @@
 
 (define_insn "*call_value_1_rex64_ms_sysv"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:DI 1 "call_insn_operand" "rsm"))
+	(call (mem:QI (match_operand:DI 1 "call_insn_operand" "rzm"))
 	      (match_operand:DI 2 "" "")))
    (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
    (clobber (reg:TI XMM6_REG))
@@ -17846,7 +17861,7 @@
 
 (define_insn_and_split "*sibcall_value_1_rex64_vzeroupper"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:DI 1 "sibcall_insn_operand" "s,U"))
+	(call (mem:QI (match_operand:DI 1 "sibcall_insn_operand" "z,U"))
 	      (match_operand:DI 2 "" "")))
    (unspec [(match_operand 3 "const_int_operand" "")]
    	   UNSPEC_CALL_NEEDS_VZEROUPPER)]
@@ -17859,7 +17874,7 @@
 
 (define_insn "*sibcall_value_1_rex64"
   [(set (match_operand 0 "" "")
-	(call (mem:QI (match_operand:DI 1 "sibcall_insn_operand" "s,U"))
+	(call (mem:QI (match_operand:DI 1 "sibcall_insn_operand" "z,U"))
 	      (match_operand:DI 2 "" "")))]
   "TARGET_64BIT && SIBLING_CALL_P (insn)"
   { return ix86_output_call_insn (insn, operands[1], 1); }

=== modified file 'gcc/config/m68k/m68k.c'
--- gcc/config/m68k/m68k.c	2010-12-12 14:03:55 +0000
+++ gcc/config/m68k/m68k.c	2011-08-13 08:58:15 +0000
@@ -136,6 +136,7 @@
 static bool m68k_legitimate_address_p (enum machine_mode, rtx, bool);
 static bool m68k_handle_option (size_t, const char *, int);
 static void m68k_option_override (void);
+static void m68k_override_options_after_change (void);
 static rtx find_addr_reg (rtx);
 static const char *singlemove_string (rtx *);
 static void m68k_output_mi_thunk (FILE *, tree, HOST_WIDE_INT,
@@ -241,6 +242,9 @@
 #undef TARGET_OPTION_OVERRIDE
 #define TARGET_OPTION_OVERRIDE m68k_option_override
 
+#undef TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE
+#define TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE m68k_override_options_after_change
+
 #undef TARGET_RTX_COSTS
 #define TARGET_RTX_COSTS m68k_rtx_costs
 
@@ -756,6 +760,19 @@
     }
 }
 
+/* Implement TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE.  */
+
+static void
+m68k_override_options_after_change (void)
+{
+  if (m68k_sched_cpu == CPU_UNKNOWN)
+    {
+      flag_schedule_insns = 0;
+      flag_schedule_insns_after_reload = 0;
+      flag_modulo_sched = 0;
+    }
+}
+
 /* Generate a macro of the form __mPREFIX_cpu_NAME, where PREFIX is the
    given argument and NAME is the argument passed to -mcpu.  Return NULL
    if -mcpu was not passed.  */

=== modified file 'gcc/config/pa/pa.md'
--- gcc/config/pa/pa.md	2011-04-20 23:36:20 +0000
+++ gcc/config/pa/pa.md	2011-08-13 08:58:15 +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")])
 
@@ -6913,7 +6913,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-04-28 22:39:59 +0000
+++ gcc/config/rs6000/altivec.md	2011-08-13 08:58:15 +0000
@@ -495,7 +495,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)"
@@ -506,7 +506,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-06-20 15:12:44 +0000
+++ gcc/config/rs6000/rs6000.c	2011-08-13 08:58:15 +0000
@@ -17437,7 +17437,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-04-28 22:39:59 +0000
+++ gcc/config/rs6000/vector.md	2011-08-13 08:58:15 +0000
@@ -454,21 +454,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-03 05:42:19 +0000
+++ gcc/config/rs6000/vsx.md	2011-08-13 08:58:15 +0000
@@ -674,7 +674,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)"
@@ -685,7 +685,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/rx/rx.md'
--- gcc/config/rx/rx.md	2011-05-17 08:46:51 +0000
+++ gcc/config/rx/rx.md	2011-08-13 08:58:15 +0000
@@ -708,24 +708,24 @@
      (clobber (reg:CC CC_REG))])]
   ""
 {
-  /* ??? Support other conditions via cstore into a temporary?  */
-  if (GET_CODE (operands[1]) != EQ && GET_CODE (operands[1]) != NE)
-    FAIL;
-  /* One operand must be a constant.  */
-  if (!CONSTANT_P (operands[2]) && !CONSTANT_P (operands[3]))
+  /* One operand must be a constant or a register, the other must be a register.  */
+  if (   ! CONSTANT_P (operands[2])
+      && ! CONSTANT_P (operands[3])
+      && ! (REG_P (operands[2]) && REG_P (operands[3])))
     FAIL;
 })
 
 (define_insn_and_split "*movsicc"
-  [(set (match_operand:SI     0 "register_operand" "=r,r")
+  [(set (match_operand:SI     0 "register_operand" "=r,r,r")
 	(if_then_else:SI
-	  (match_operator 5 "rx_z_comparison_operator"
-	   [(match_operand:SI 3 "register_operand"  "r,r")
-	    (match_operand:SI 4 "rx_source_operand" "riQ,riQ")])
-	  (match_operand:SI   1 "nonmemory_operand" "i,ri")
-	  (match_operand:SI   2 "nonmemory_operand" "ri,i")))
+	  (match_operator     5 "comparison_operator"
+	   [(match_operand:SI 3 "register_operand"  "r,r,r")
+	    (match_operand:SI 4 "rx_source_operand" "riQ,riQ,riQ")])
+	  (match_operand:SI   1 "nonmemory_operand" "i,ri,r")
+	  (match_operand:SI   2 "nonmemory_operand" "ri,i,r")))
    (clobber (reg:CC CC_REG))]
-  "CONSTANT_P (operands[1]) || CONSTANT_P (operands[2])"
+  "(CONSTANT_P (operands[1]) || CONSTANT_P (operands[2]))
+    || (REG_P (operands[1]) && REG_P (operands[2]))"
   "#"
   "&& reload_completed"
   [(const_int 0)]
@@ -742,8 +742,11 @@
   op1 = operands[1];
   op2 = operands[2];
 
-  /* If OP2 is the constant, reverse the sense of the move.  */
-  if (!CONSTANT_P (operands[1]))
+  /* If OP2 is the constant, reverse the sense of the move.
+     Likewise if both operands are registers but OP1 == OP0.  */
+  if ((! CONSTANT_P (operands[1]) && CONSTANT_P (operands[2]))
+      || (REG_P (operands[1]) && REG_P (operands[2])
+          && rtx_equal_p (op0, op1)))
     {
       x = op1, op1 = op2, op2 = x;
       cmp_code = reverse_condition (cmp_code);
@@ -752,7 +755,7 @@
   /* If OP2 does not match the output, copy it into place.  We have allowed
      these alternatives so that the destination can legitimately be one of
      the comparison operands without increasing register pressure.  */
-  if (!rtx_equal_p (op0, op2))
+  if (! rtx_equal_p (op0, op2))
     emit_move_insn (op0, op2);
 
   x = gen_rtx_fmt_ee (cmp_code, VOIDmode, flags, const0_rtx);
@@ -768,16 +771,33 @@
 	    [(reg CC_REG) (const_int 0)])
 	  (match_operand:SI 1 "immediate_operand" "Sint08,Sint16,Sint24,i")
 	  (match_dup 0)))]
-  "reload_completed"
-{
-  if (GET_CODE (operands[2]) == EQ)
-    return "stz\t%1, %0";
-  else
-    return "stnz\t%1, %0";
-}
+  "reload_completed
+   && ((GET_CODE (operands[2]) == EQ) || (GET_CODE (operands[2]) == NE))"
+  {
+    if (GET_CODE (operands[2]) == EQ)
+      return "stz\t%1, %0";
+    else
+     return "stnz\t%1, %0";
+  }
   [(set_attr "length" "4,5,6,7")]
 )
 
+(define_insn "*stcc_reg"
+  [(set (match_operand:SI 0 "register_operand" "+r,r,r,r,r,r")
+	(if_then_else:SI
+	  (match_operator 2 "comparison_operator"
+	    [(reg CC_REG) (const_int 0)])
+	  (match_operand:SI 1 "nonmemory_operand"
+		              "r,Uint04,Sint08,Sint16,Sint24,i")
+	  (match_dup 0)))]
+  "reload_completed"
+  {
+    PUT_CODE (operands[2], reverse_condition (GET_CODE (operands[2])));
+    return "b%B2 1f\n\tmov %1, %0\n1:";
+  }
+  [(set_attr "length" "3,3,4,5,6,7")]
+)
+
 ;; Arithmetic Instructions
 
 (define_insn "abssi2"
@@ -1598,7 +1618,7 @@
 		   (memex_commutative:SI (match_dup 0)
 					 (match_dup 2)))
 	      (clobber (reg:CC CC_REG))])]
-  "peep2_regno_dead_p (2, REGNO (operands[0]))"
+  "peep2_regno_dead_p (2, REGNO (operands[0])) && (optimize < 3 || optimize_size)"
   [(parallel [(set:SI (match_dup 2)
 		      (memex_commutative:SI (match_dup 2)
 					    (extend_types:SI (match_dup 1))))
@@ -1612,7 +1632,7 @@
 		   (memex_commutative:SI (match_dup 2)
 					 (match_dup 0)))
 	      (clobber (reg:CC CC_REG))])]
-  "peep2_regno_dead_p (2, REGNO (operands[0]))"
+  "peep2_regno_dead_p (2, REGNO (operands[0])) && (optimize < 3 || optimize_size)"
   [(parallel [(set:SI (match_dup 2)
 		      (memex_commutative:SI (match_dup 2)
 					    (extend_types:SI (match_dup 1))))
@@ -1626,7 +1646,7 @@
 		   (memex_noncomm:SI (match_dup 2)
 				     (match_dup 0)))
 	      (clobber (reg:CC CC_REG))])]
-  "peep2_regno_dead_p (2, REGNO (operands[0]))"
+  "peep2_regno_dead_p (2, REGNO (operands[0])) && (optimize < 3 || optimize_size)"
   [(parallel [(set:SI (match_dup 2)
 		      (memex_noncomm:SI (match_dup 2)
 					(extend_types:SI (match_dup 1))))
@@ -1639,7 +1659,7 @@
    (set (match_operand:SI                               2 "register_operand")
 	(memex_nocc:SI (match_dup 0)
 		       (match_dup 2)))]
-  "peep2_regno_dead_p (2, REGNO (operands[0]))"
+  "peep2_regno_dead_p (2, REGNO (operands[0])) && (optimize < 3 || optimize_size)"
   [(set:SI (match_dup 2)
 	   (memex_nocc:SI (match_dup 2)
 			  (extend_types:SI (match_dup 1))))]
@@ -1651,7 +1671,7 @@
    (set (match_operand:SI                               2 "register_operand")
 	(memex_nocc:SI (match_dup 2)
 		       (match_dup 0)))]
-  "peep2_regno_dead_p (2, REGNO (operands[0]))"
+  "peep2_regno_dead_p (2, REGNO (operands[0])) && (optimize < 3 || optimize_size)"
   [(set:SI (match_dup 2)
 	   (memex_nocc:SI (match_dup 2)
 			  (extend_types:SI (match_dup 1))))]
@@ -1662,7 +1682,7 @@
 	(memex_commutative:SI (match_operand:SI                               1 "register_operand" "%0")
  		              (extend_types:SI (match_operand:small_int_modes 2 "rx_restricted_mem_operand" "Q"))))
    (clobber (reg:CC CC_REG))]
-  ""
+  "(optimize < 3 || optimize_size)"
   "<memex_commutative:op>\t%<extend_types:letter>2, %0"
   [(set_attr "timings" "33")
    (set_attr "length"  "5")] ;; Worst case sceanario.  FIXME: If we defined separate patterns 
@@ -1673,7 +1693,7 @@
 	(memex_noncomm:SI (match_operand:SI                               1 "register_operand" "0")
                           (extend_types:SI (match_operand:small_int_modes 2 "rx_restricted_mem_operand" "Q"))))
    (clobber (reg:CC CC_REG))]
-  ""
+  "(optimize < 3 || optimize_size)"
   "<memex_noncomm:op>\t%<extend_types:letter>2, %0"
   [(set_attr "timings" "33")
    (set_attr "length"  "5")] ;; Worst case sceanario.  FIXME: If we defined separate patterns 
@@ -1683,7 +1703,7 @@
   [(set (match_operand:SI                                              0 "register_operand" "=r")
 	(memex_nocc:SI (match_operand:SI                               1 "register_operand" "%0")
 		       (extend_types:SI (match_operand:small_int_modes 2 "rx_restricted_mem_operand" "Q"))))]
-  ""
+  "(optimize < 3 || optimize_size)"
   "<memex_nocc:op>\t%<extend_types:letter>2, %0"
   [(set_attr "timings" "33")
    (set_attr "length"  "5")] ;; Worst case sceanario.  FIXME: If we defined separate patterns 
@@ -1695,7 +1715,7 @@
    (set (reg:CC CC_REG)
 	(compare:CC (match_operand:SI                   2 "register_operand")
 		    (match_dup 0)))]
-  "peep2_regno_dead_p (2, REGNO (operands[0]))"
+  "peep2_regno_dead_p (2, REGNO (operands[0])) && (optimize < 3 || optimize_size)"
   [(set (reg:CC CC_REG)
 	(compare:CC (match_dup 2)
 		    (extend_types:SI (match_dup 1))))]
@@ -1734,7 +1754,7 @@
   [(set (reg:CC CC_REG)
 	(compare:CC (match_operand:SI                               0 "register_operand" "=r")
 		    (extend_types:SI (match_operand:small_int_modes 1 "rx_restricted_mem_operand" "Q"))))]
-  ""
+  "(optimize < 3 || optimize_size)"
   "cmp\t%<extend_types:letter>1, %0"
   [(set_attr "timings" "33")
    (set_attr "length"  "5")] ;; Worst case sceanario.  FIXME: If we defined separate patterns 

=== modified file 'gcc/config/s390/s390-protos.h'
--- gcc/config/s390/s390-protos.h	2011-03-09 16:27:15 +0000
+++ gcc/config/s390/s390-protos.h	2011-08-13 08:58:15 +0000
@@ -41,7 +41,7 @@
 extern void s390_set_has_landing_pad_p (bool);
 extern bool s390_hard_regno_mode_ok (unsigned int, enum machine_mode);
 extern bool s390_hard_regno_rename_ok (unsigned int, unsigned int);
-extern bool s390_class_max_nregs (enum reg_class, enum machine_mode);
+extern int s390_class_max_nregs (enum reg_class, enum machine_mode);
 
 #ifdef RTX_CODE
 extern int s390_extra_constraint_str (rtx, int, const char *);

=== modified file 'gcc/config/s390/s390.c'
--- gcc/config/s390/s390.c	2011-05-06 11:10:13 +0000
+++ gcc/config/s390/s390.c	2011-08-13 08:58:15 +0000
@@ -7648,7 +7648,7 @@
 /* Maximum number of registers to represent a value of mode MODE
    in a register of class RCLASS.  */
 
-bool
+int
 s390_class_max_nregs (enum reg_class rclass, enum machine_mode mode)
 {
   switch (rclass)

=== modified file 'gcc/config/sol2.h'
--- gcc/config/sol2.h	2011-01-26 20:23:17 +0000
+++ gcc/config/sol2.h	2011-08-13 08:58:15 +0000
@@ -132,10 +132,8 @@
 #define LIB_SPEC \
   "%{compat-bsd:-lucb -lsocket -lnsl -lelf -laio} \
    %{!symbolic:\
-     %{pthreads|pthread:" \
-        LIB_THREAD_LDFLAGS_SPEC " -lpthread " LIB_TLS_SPEC "} \
-     %{!pthreads:%{!pthread:%{threads:" \
-	LIB_THREAD_LDFLAGS_SPEC " -lthread}}} \
+     %{pthreads|pthread:-lpthread " LIB_TLS_SPEC "} \
+     %{!pthreads:%{!pthread:%{threads:-lthread}}} \
      %{p|pg:-ldl} -lc}"
 
 #undef  ENDFILE_SPEC
@@ -185,6 +183,7 @@
    %{static:-dn -Bstatic} \
    %{shared:-G -dy %{!mimpure-text:-z text}} \
    %{symbolic:-Bsymbolic -G -dy -z text} \
+   %{pthreads|pthread|threads:" LIB_THREAD_LDFLAGS_SPEC "} \
    %(link_arch) \
    %{Qy:} %{!Qn:-Qy}"
 

=== 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-13 08:58:15 +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-12-06 19:11:02 +0000
+++ gcc/config/sparc/sol2.h	2011-08-13 08:58:15 +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/config/spu/spu.c'
--- gcc/config/spu/spu.c	2011-06-04 10:15:48 +0000
+++ gcc/config/spu/spu.c	2011-08-13 08:58:15 +0000
@@ -223,7 +223,6 @@
 static bool spu_addr_space_subset_p (addr_space_t, addr_space_t);
 static rtx spu_addr_space_convert (rtx, tree, tree);
 static int spu_sms_res_mii (struct ddg *g);
-static void asm_file_start (void);
 static unsigned int spu_section_type_flags (tree, const char *, int);
 static section *spu_select_section (tree, int, unsigned HOST_WIDE_INT);
 static void spu_unique_section (tree, int);
@@ -455,9 +454,6 @@
 #undef TARGET_SCHED_SMS_RES_MII
 #define TARGET_SCHED_SMS_RES_MII spu_sms_res_mii
 
-#undef TARGET_ASM_FILE_START
-#define TARGET_ASM_FILE_START asm_file_start
-
 #undef TARGET_SECTION_TYPE_FLAGS
 #define TARGET_SECTION_TYPE_FLAGS spu_section_type_flags
 
@@ -2717,9 +2713,11 @@
     {
       /* We still do it for unoptimized code because an external
          function might have hinted a call or return. */
+      compute_bb_for_insn ();
       insert_hbrp ();
       pad_bb ();
       spu_var_tracking ();
+      free_bb_for_insn ();
       return;
     }
 
@@ -7052,14 +7050,6 @@
   return SImode;
 }
 
-/* An early place to adjust some flags after GCC has finished processing
- * them. */
-static void
-asm_file_start (void)
-{
-  default_file_start ();
-}
-
 /* Implement targetm.section_type_flags.  */
 static unsigned int
 spu_section_type_flags (tree decl, const char *name, int reloc)

=== modified file 'gcc/cp/ChangeLog'
--- gcc/cp/ChangeLog	2011-06-27 20:16:14 +0000
+++ gcc/cp/ChangeLog	2011-08-13 08:58:15 +0000
@@ -1,3 +1,84 @@
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/48993
+	* semantics.c (potential_constant_expression_1) [CALL_EXPR]: Sorry
+	on 'this' in a constructor.
+
+	PR c++/49921
+	* semantics.c (finish_decltype_type): Call invalid_nonstatic_memfn_p.
+
+	PR c++/49669
+	* init.c (perform_member_init): Handle invalid array initializer.
+
+	PR c++/49988
+	* semantics.c (cxx_eval_array_reference): Handle failure to
+	reduce the array operand to something we can work with.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/43886
+	* parser.c (cp_parser_lambda_body): Clear local_variables_forbidden_p.
+
+	PR c++/49593
+	* pt.c (find_parameter_packs_r): Handle CONSTRUCTOR.
+
+	PR c++/49803
+	* init.c (sort_mem_initializers): Initialize uses_unions_p here.
+	(build_field_list): Not here.
+
+	PR c++/49924
+	* semantics.c (cxx_eval_vec_init_1): Fix logic.
+
+	PR c++/49260
+	* call.c (build_call_a): Set cp_function_chain->can_throw here.
+	(build_cxx_call): Not here.
+
[phone]  Jeffrey Yasskin  <[e-mail]>
+
+	* pt.c (build_template_decl): Copy the function_decl's
+	source location to the new template_decl.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/49785
+	* pt.c (coerce_template_parms): Handle non-pack after pack.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/49672
+	* pt.c (extract_fnparm_pack): Split out from...
+	(make_fnparm_pack): ...here.
+	(instantiate_decl): Handle non-pack parms after a pack.
+	* semantics.c (maybe_add_lambda_conv_op): Don't in a template.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	* tree.c (build_vec_init_elt): Strip TARGET_EXPR.
+
+	* tree.c (build_vec_init_expr): Don't add TARGET_EXPR.
+	* typeck2.c (digest_init_r): Handle VEC_INIT_EXPR.
+	* semantics.c (cxx_eval_vec_init_1): Correct type.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/48157
+	* pt.c (tsubst_qualified_id): Preserve TEMPLATE_ID_EXPR in
+	partial instantiation.
+
[phone]  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.
+
[phone]  Jason Merrill  <[e-mail]>
+
+	PR c++/49598
+	* semantics.c (finish_id_expression): convert_from_reference.
+
+	* error.c (type_to_string): Avoid redundant akas.
+
 2011-06-27  Jason Merrill  <[e-mail]>
 
 	PR c++/49528

=== modified file 'gcc/cp/call.c'
--- gcc/cp/call.c	2011-06-27 20:15:49 +0000
+++ gcc/cp/call.c	2011-08-13 08:58:15 +0000
@@ -351,6 +351,9 @@
   nothrow = ((decl && TREE_NOTHROW (decl))
 	     || TYPE_NOTHROW_P (TREE_TYPE (TREE_TYPE (function))));
 
+  if (!nothrow && at_function_scope_p () && cfun && cp_function_chain)
+    cp_function_chain->can_throw = 1;
+
   if (decl && TREE_THIS_VOLATILE (decl) && cfun && cp_function_chain)
     current_function_returns_abnormally = 1;
 
@@ -6457,11 +6460,6 @@
 
   /* If this call might throw an exception, note that fact.  */
   fndecl = get_callee_fndecl (fn);
-  if ((!fndecl || !TREE_NOTHROW (fndecl))
-      && at_function_scope_p ()
-      && cfun
-      && cp_function_chain)
-    cp_function_chain->can_throw = 1;
 
   /* Check that arguments to builtin functions match the expectations.  */
   if (fndecl

=== modified file 'gcc/cp/error.c'
--- gcc/cp/error.c	2011-06-14 22:13:45 +0000
+++ gcc/cp/error.c	2011-08-13 08:58:15 +0000
@@ -2618,14 +2618,28 @@
 
   reinit_cxx_pp ();
   dump_type (typ, flags);
+  /* If we're printing a type that involves typedefs, also print the
+     stripped version.  But sometimes the stripped version looks
+     exactly the same, so we don't want it after all.  To avoid printing
+     it in that case, we play ugly obstack games.  */
   if (typ && TYPE_P (typ) && typ != TYPE_CANONICAL (typ)
       && !uses_template_parms (typ))
     {
+      int aka_start; char *p;
+      struct obstack *ob = pp_base (cxx_pp)->buffer->obstack;
+      /* Remember the end of the initial dump.  */
+      int len = obstack_object_size (ob);
       tree aka = strip_typedefs (typ);
       pp_string (cxx_pp, " {aka");
       pp_cxx_whitespace (cxx_pp);
+      /* And remember the start of the aka dump.  */
+      aka_start = obstack_object_size (ob);
       dump_type (aka, flags);
       pp_character (cxx_pp, '}');
+      p = (char*)obstack_base (ob);
+      /* If they are identical, cut off the aka with a NUL.  */
+      if (memcmp (p, p+aka_start, len) == 0)
+	p[len] = '\0';
     }
   return pp_formatted_text (cxx_pp);
 }

=== modified file 'gcc/cp/init.c'
--- gcc/cp/init.c	2011-06-27 20:16:14 +0000
+++ gcc/cp/init.c	2011-08-13 08:58:15 +0000
@@ -526,8 +526,10 @@
 	{
 	  if (init)
 	    {
-	      gcc_assert (TREE_CHAIN (init) == NULL_TREE);
-	      init = TREE_VALUE (init);
+	      if (TREE_CHAIN (init))
+		init = error_mark_node;
+	      else
+		init = TREE_VALUE (init);
 	      if (BRACE_ENCLOSED_INITIALIZER_P (init))
 		init = digest_init (type, init);
 	    }
@@ -627,8 +629,6 @@
 {
   tree fields;
 
-  *uses_unions_p = 0;
-
   /* Note whether or not T is a union.  */
   if (TREE_CODE (t) == UNION_TYPE)
     *uses_unions_p = 1;
@@ -682,7 +682,7 @@
   tree next_subobject;
   VEC(tree,gc) *vbases;
   int i;
-  int uses_unions_p;
+  int uses_unions_p = 0;
 
   /* Build up a list of initializations.  The TREE_PURPOSE of entry
      will be the subobject (a FIELD_DECL or BINFO) to initialize.  The

=== modified file 'gcc/cp/parser.c'
--- gcc/cp/parser.c	2011-05-27 20:48:24 +0000
+++ gcc/cp/parser.c	2011-08-13 08:58:15 +0000
@@ -7940,8 +7940,11 @@
 cp_parser_lambda_body (cp_parser* parser, tree lambda_expr)
 {
   bool nested = (current_function_decl != NULL_TREE);
+  bool local_variables_forbidden_p = parser->local_variables_forbidden_p;
   if (nested)
     push_function_context ();
+  /* Clear this in case we're in the middle of a default argument.  */
+  parser->local_variables_forbidden_p = false;
 
   /* Finish the function call operator
      - class_specifier
@@ -8028,6 +8031,7 @@
     expand_or_defer_fn (finish_function (/*inline*/2));
   }
 
+  parser->local_variables_forbidden_p = local_variables_forbidden_p;
   if (nested)
     pop_function_context();
 }

=== modified file 'gcc/cp/pt.c'
--- gcc/cp/pt.c	2011-06-17 01:06:50 +0000
+++ gcc/cp/pt.c	2011-08-13 08:58:15 +0000
@@ -3013,6 +3013,7 @@
       *walk_subtrees = 0;
       return NULL_TREE;
 
+    case CONSTRUCTOR:
     case TEMPLATE_DECL:
       cp_walk_tree (&TREE_TYPE (t),
 		    &find_parameter_packs_r, ppd, ppd->visited);
@@ -4109,6 +4110,7 @@
   tree tmpl = build_lang_decl (TEMPLATE_DECL, DECL_NAME (decl), NULL_TREE);
   DECL_TEMPLATE_PARMS (tmpl) = parms;
   DECL_CONTEXT (tmpl) = DECL_CONTEXT (decl);
+  DECL_SOURCE_LOCATION (tmpl) = DECL_SOURCE_LOCATION (decl);
   DECL_MEMBER_TEMPLATE_P (tmpl) = member_template_p;
 
   return tmpl;
@@ -6295,6 +6297,7 @@
      subtract it from nparms to get the number of non-variadic
      parameters.  */
   int variadic_p = 0;
+  int post_variadic_parms = 0;
 
   if (args == error_mark_node)
     return error_mark_node;
@@ -6305,19 +6308,22 @@
   for (parm_idx = 0; parm_idx < nparms; ++parm_idx)
     {
       tree tparm = TREE_VALUE (TREE_VEC_ELT (parms, parm_idx));
+      if (variadic_p)
+	++post_variadic_parms;
       if (template_parameter_pack_p (tparm))
 	++variadic_p;
     }
 
   inner_args = INNERMOST_TEMPLATE_ARGS (args);
-  /* If there are 0 or 1 parameter packs, we need to expand any argument
-     packs so that we can deduce a parameter pack from some non-packed args
-     followed by an argument pack, as in variadic85.C.  If there are more
-     than that, we need to leave argument packs intact so the arguments are
-     assigned to the right parameter packs.  This should only happen when
-     dealing with a nested class inside a partial specialization of a class
-     template, as in variadic92.C.  */
-  if (variadic_p <= 1)
+  /* If there are no parameters that follow a parameter pack, we need to
+     expand any argument packs so that we can deduce a parameter pack from
+     some non-packed args followed by an argument pack, as in variadic85.C.
+     If there are such parameters, we need to leave argument packs intact
+     so the arguments are assigned properly.  This can happen when dealing
+     with a nested class inside a partial specialization of a class
+     template, as in variadic92.C, or when deducing a template parameter pack
+     from a sub-declarator, as in variadic114.C.  */
+  if (!post_variadic_parms)
     inner_args = expand_template_argument_pack (inner_args);
 
   nargs = inner_args ? NUM_TMPL_ARGS (inner_args) : 0;
@@ -8620,11 +8626,12 @@
   return r;
 }
 
-/* Give a chain SPEC_PARM of PARM_DECLs, pack them into a
-   NONTYPE_ARGUMENT_PACK.  */
+/* Given a function parameter pack TMPL_PARM and some function parameters
+   instantiated from it at *SPEC_P, return a NONTYPE_ARGUMENT_PACK of them
+   and set *SPEC_P to point at the next point in the list.  */
 
 static tree
-make_fnparm_pack (tree spec_parm)
+extract_fnparm_pack (tree tmpl_parm, tree *spec_p)
 {
   /* Collect all of the extra "packed" parameters into an
      argument pack.  */
@@ -8632,11 +8639,18 @@
   tree parmtypevec;
   tree argpack = make_node (NONTYPE_ARGUMENT_PACK);
   tree argtypepack = cxx_make_type (TYPE_ARGUMENT_PACK);
-  int i, len = list_length (spec_parm);
+  tree spec_parm = *spec_p;
+  int i, len;
+
+  for (len = 0; spec_parm; ++len, spec_parm = TREE_CHAIN (spec_parm))
+    if (tmpl_parm
+	&& !function_parameter_expanded_from_pack_p (spec_parm, tmpl_parm))
+      break;
 
   /* Fill in PARMVEC and PARMTYPEVEC with all of the parameters.  */
   parmvec = make_tree_vec (len);
   parmtypevec = make_tree_vec (len);
+  spec_parm = *spec_p;
   for (i = 0; i < len; i++, spec_parm = DECL_CHAIN (spec_parm))
     {
       TREE_VEC_ELT (parmvec, i) = spec_parm;
@@ -8647,9 +8661,19 @@
   SET_ARGUMENT_PACK_ARGS (argpack, parmvec);
   SET_ARGUMENT_PACK_ARGS (argtypepack, parmtypevec);
   TREE_TYPE (argpack) = argtypepack;
+  *spec_p = spec_parm;
 
   return argpack;
-}        
+}
+
+/* Give a chain SPEC_PARM of PARM_DECLs, pack them into a
+   NONTYPE_ARGUMENT_PACK.  */
+
+static tree
+make_fnparm_pack (tree spec_parm)
+{
+  return extract_fnparm_pack (NULL_TREE, &spec_parm);
+}
 
 /* Substitute ARGS into T, which is an pack expansion
    (i.e. TYPE_PACK_EXPANSION or EXPR_PACK_EXPANSION). Returns a
@@ -11200,8 +11224,12 @@
     expr = name;
 
   if (dependent_scope_p (scope))
-    return build_qualified_name (NULL_TREE, scope, expr,
-				 QUALIFIED_NAME_IS_TEMPLATE (qualified_id));
+    {
+      if (is_template)
+	expr = build_min_nt (TEMPLATE_ID_EXPR, expr, template_args);
+      return build_qualified_name (NULL_TREE, scope, expr,
+				   QUALIFIED_NAME_IS_TEMPLATE (qualified_id));
+    }
 
   if (!BASELINK_P (name) && !DECL_P (expr))
     {
@@ -17466,21 +17494,21 @@
 	  spec_parm = skip_artificial_parms_for (d, spec_parm);
 	  tmpl_parm = skip_artificial_parms_for (subst_decl, tmpl_parm);
 	}
-      while (tmpl_parm && !FUNCTION_PARAMETER_PACK_P (tmpl_parm))
+      for (; tmpl_parm; tmpl_parm = DECL_CHAIN (tmpl_parm))
 	{
-	  register_local_specialization (spec_parm, tmpl_parm);
-	  tmpl_parm = DECL_CHAIN (tmpl_parm);
-	  spec_parm = DECL_CHAIN (spec_parm);
+	  if (!FUNCTION_PARAMETER_PACK_P (tmpl_parm))
+	    {
+	      register_local_specialization (spec_parm, tmpl_parm);
+	      spec_parm = DECL_CHAIN (spec_parm);
+	    }
+	  else
+	    {
+	      /* Register the (value) argument pack as a specialization of
+		 TMPL_PARM, then move on.  */
+	      tree argpack = extract_fnparm_pack (tmpl_parm, &spec_parm);
+	      register_local_specialization (argpack, tmpl_parm);
+	    }
 	}
-      if (tmpl_parm && FUNCTION_PARAMETER_PACK_P (tmpl_parm))
-        {
-          /* Register the (value) argument pack as a specialization of
-             TMPL_PARM, then move on.  */
-	  tree argpack = make_fnparm_pack (spec_parm);
-          register_local_specialization (argpack, tmpl_parm);
-          tmpl_parm = DECL_CHAIN (tmpl_parm);
-	  spec_parm = NULL_TREE;
-        }
       gcc_assert (!spec_parm);
 
       /* Substitute into the body of the function.  */

=== modified file 'gcc/cp/semantics.c'
--- gcc/cp/semantics.c	2011-06-27 20:16:14 +0000
+++ gcc/cp/semantics.c	2011-08-13 08:58:15 +0000
@@ -2895,7 +2895,7 @@
 	  tree containing_function = current_function_decl;
 	  tree lambda_stack = NULL_TREE;
 	  tree lambda_expr = NULL_TREE;
-	  tree initializer = decl;
+	  tree initializer = convert_from_reference (decl);
 
 	  /* Core issue 696: "[At the July 2009 meeting] the CWG expressed
 	     support for an approach in which a reference to a local
@@ -4835,6 +4835,9 @@
 
   expr = resolve_nondeduced_context (expr);
 
+  if (invalid_nonstatic_memfn_p (expr, complain))
+    return error_mark_node;
+
   /* To get the size of a static data member declared as an array of
      unknown bound, we need to instantiate it.  */
   if (TREE_CODE (expr) == VAR_DECL
@@ -6300,12 +6303,22 @@
   elem_type = TREE_TYPE (TREE_TYPE (ary));
   if (TREE_CODE (ary) == CONSTRUCTOR)
     len = CONSTRUCTOR_NELTS (ary);
-  else
+  else if (TREE_CODE (ary) == STRING_CST)
     {
       elem_nchars = (TYPE_PRECISION (elem_type)
 		     / TYPE_PRECISION (char_type_node));
       len = (unsigned) TREE_STRING_LENGTH (ary) / elem_nchars;
     }
+  else
+    {
+      /* We can't do anything with other tree codes, so use
+	 VERIFY_CONSTANT to complain and fail.  */
+      VERIFY_CONSTANT (ary);
+      /* This should be unreachable, but be more fault-tolerant on the
+	 release branch.  */
+      *non_constant_p = true;
+      return t;
+    }
   if (compare_tree_int (index, len) >= 0)
     {
       if (tree_int_cst_lt (index, array_type_nelts_top (TREE_TYPE (ary))))
@@ -6589,6 +6602,7 @@
   tree elttype = TREE_TYPE (atype);
   int max = tree_low_cst (array_type_nelts (atype), 0);
   VEC(constructor_elt,gc) *n = VEC_alloc (constructor_elt, gc, max + 1);
+  bool default_init = false;
   int i;
 
   /* For the default constructor, build up a call to the default
@@ -6607,6 +6621,7 @@
       release_tree_vector (argvec);
       init = cxx_eval_constant_expression (call, init, allow_non_constant,
 					   addr, non_constant_p);
+      default_init = true;
     }
 
   if (*non_constant_p && !allow_non_constant)
@@ -6634,7 +6649,7 @@
 	  eltinit = cxx_eval_constant_expression
 	    (call, eltinit, allow_non_constant, addr, non_constant_p);
 	}
-      else if (TREE_CODE (init) == CONSTRUCTOR)
+      else if (default_init)
 	{
 	  /* Initializing an element using the call to the default
 	     constructor we just built above.  */
@@ -6666,7 +6681,7 @@
 
   if (!*non_constant_p)
     {
-      init = build_constructor (TREE_TYPE (atype), n);
+      init = build_constructor (atype, n);
       TREE_CONSTANT (init) = true;
       return init;
     }
@@ -7491,7 +7506,17 @@
 		  {
 		    tree x = get_nth_callarg (t, 0);
 		    if (is_this_parameter (x))
-		      /* OK.  */;
+		      {
+			if (DECL_CONSTRUCTOR_P (DECL_CONTEXT (x)))
+			  {
+			    if (flags & tf_error)
+			      sorry ("calling a member function of the "
+				     "object being constructed in a constant "
+				     "expression");
+			    return false;
+			  }
+			/* Otherwise OK.  */;
+		      }
 		    else if (!potential_constant_expression_1 (x, rval, flags))
 		      {
 			if (flags & tf_error)
@@ -8473,6 +8498,9 @@
   if (LAMBDA_EXPR_CAPTURE_LIST (CLASSTYPE_LAMBDA_EXPR (type)) != NULL_TREE)
     return;
 
+  if (processing_template_decl)
+    return;
+
   stattype = build_function_type (TREE_TYPE (TREE_TYPE (callop)),
 				  FUNCTION_ARG_CHAIN (callop));
 

=== modified file 'gcc/cp/tree.c'
--- gcc/cp/tree.c	2011-06-06 04:31:24 +0000
+++ gcc/cp/tree.c	2011-08-13 08:58:15 +0000
@@ -495,9 +495,16 @@
 	dummy = move (dummy);
       VEC_quick_push (tree, argvec, dummy);
     }
-  return build_special_member_call (NULL_TREE, complete_ctor_identifier,
+  init = build_special_member_call (NULL_TREE, complete_ctor_identifier,
 				    &argvec, inner_type, LOOKUP_NORMAL,
 				    tf_warning_or_error);
+
+  /* For a trivial constructor, build_over_call creates a TARGET_EXPR.  But
+     we don't want one here.  */
+  if (TREE_CODE (init) == TARGET_EXPR)
+    init = TARGET_EXPR_INITIAL (init);
+
+  return init;
 }
 
 /* Return a TARGET_EXPR which expresses the initialization of an array to
@@ -526,9 +533,6 @@
     VEC_INIT_EXPR_IS_CONSTEXPR (init) = true;
   VEC_INIT_EXPR_VALUE_INIT (init) = value_init;
 
-  init = build_target_expr (slot, init);
-  TARGET_EXPR_IMPLICIT_P (init) = 1;
-
   return init;
 }
 

=== modified file 'gcc/cp/typeck.c'
--- gcc/cp/typeck.c	2011-06-07 15:12:15 +0000
+++ gcc/cp/typeck.c	2011-08-13 08:58:15 +0000
@@ -4331,6 +4331,7 @@
 		{
 		case MULT_EXPR:
 		case TRUNC_DIV_EXPR:
+		  op1 = save_expr (op1);
 		  imag = build2 (resultcode, real_type, imag, op1);
 		  /* Fall through.  */
 		case PLUS_EXPR:
@@ -4349,6 +4350,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/cp/typeck2.c'
--- gcc/cp/typeck2.c	2011-07-13 13:17:31 +0000
+++ gcc/cp/typeck2.c	2011-08-13 08:58:15 +0000
@@ -894,7 +894,7 @@
 	{
 	  /* Allow the result of build_array_copy and of
 	     build_value_init_noctor.  */
-	  if ((TREE_CODE (init) == TARGET_EXPR
+	  if ((TREE_CODE (init) == VEC_INIT_EXPR
 	       || TREE_CODE (init) == CONSTRUCTOR)
 	      && (same_type_ignoring_top_level_qualifiers_p
 		  (type, TREE_TYPE (init))))

=== modified file 'gcc/df-problems.c'
--- gcc/df-problems.c	2011-01-26 22:45:04 +0000
+++ gcc/df-problems.c	2011-08-13 08:58:15 +0000
@@ -3095,6 +3095,7 @@
 dead_debug_reset (struct dead_debug *debug, unsigned int dregno)
 {
   struct dead_debug_use **tailp = &debug->head;
+  struct dead_debug_use **insnp = &debug->head;
   struct dead_debug_use *cur;
   rtx insn;
 
@@ -3112,9 +3113,25 @@
 	    debug->to_rescan = BITMAP_ALLOC (NULL);
 	  bitmap_set_bit (debug->to_rescan, INSN_UID (insn));
 	  XDELETE (cur);
+	  /* If the current use isn't the first one attached to INSN, go back
+	     to this first use.  We assume that the uses attached to an insn
+	     are adjacent.  */                                                                       
+	  if (tailp != insnp && DF_REF_INSN ((*insnp)->use) == insn)
+	    tailp = insnp;
+	  /* Then remove all the other uses attached to INSN.  */
+	  while ((cur = *tailp) && DF_REF_INSN (cur->use) == insn)
+	    {
+	      *tailp = cur->next;
+	      XDELETE (cur);
+	    }
+	  insnp = tailp;
 	}
       else
-	tailp = &(*tailp)->next;
+	{
+	  if (DF_REF_INSN ((*insnp)->use) != DF_REF_INSN (cur->use))
+	    insnp = tailp;
+	  tailp = &(*tailp)->next;
+	}
     }
 }
 
@@ -3173,7 +3190,10 @@
 	tailp = &(*tailp)->next;
     }
 
-  gcc_assert (reg);
+  /* We may have dangling bits in debug->used for registers that were part
+     of a multi-register use, one component of which has been reset.  */
+  if (reg == NULL)
+    return;
 
   /* Create DEBUG_EXPR (and DEBUG_EXPR_DECL).  */
   dval = make_debug_expr_from_rtl (reg);

=== modified file 'gcc/doc/invoke.texi'
--- gcc/doc/invoke.texi	2011-07-01 09:19:21 +0000
+++ gcc/doc/invoke.texi	2011-08-13 08:58:15 +0000
@@ -12183,6 +12183,10 @@
 @item corei7-avx
 Intel Core i7 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3,
 SSE4.1, SSE4.2, AVX, AES and PCLMUL instruction set support.
+@item core-avx-i
+Intel Core CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3,
+SSE4.1, SSE4.2, AVX, AES, PCLMUL, FSGSBASE, RDRND and F16C instruction
+set support.
 @item atom
 Intel Atom CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3 and SSSE3
 instruction set support.

=== modified file 'gcc/doc/md.texi'
--- gcc/doc/md.texi	2011-06-07 11:18:20 +0000
+++ gcc/doc/md.texi	2011-08-13 08:58:15 +0000
@@ -4683,8 +4683,9 @@
 string.  The instruction is not allowed to prefetch more than one byte
 at a time since either string may end in the first byte and reading past
 that may access an invalid page or segment and cause a fault.  The
-effect of the instruction is to store a value in operand 0 whose sign
-indicates the result of the comparison.
+comparison terminates early if the fetched bytes are different or if
+they are equal to zero.  The effect of the instruction is to store a
+value in operand 0 whose sign indicates the result of the comparison.
 
 @cindex @code{cmpstr@var{m}} instruction pattern
 @item @samp{cmpstr@var{m}}
@@ -4702,8 +4703,10 @@
 order starting at the beginning of each string.  The instruction is not allowed
 to prefetch more than one byte at a time since either string may end in the
 first byte and reading past that may access an invalid page or segment and
-cause a fault.  The effect of the instruction is to store a value in operand 0
-whose sign indicates the result of the comparison.
+cause a fault.  The comparison will terminate when the fetched bytes
+are different or if they are equal to zero.  The effect of the
+instruction is to store a value in operand 0 whose sign indicates the
+result of the comparison.
 
 @cindex @code{cmpmem@var{m}} instruction pattern
 @item @samp{cmpmem@var{m}}
@@ -4711,9 +4714,10 @@
 of @samp{cmpstr@var{m}}.  The two memory blocks specified are compared
 byte by byte in lexicographic order starting at the beginning of each
 block.  Unlike @samp{cmpstr@var{m}} the instruction can prefetch
-any bytes in the two memory blocks.  The effect of the instruction is
-to store a value in operand 0 whose sign indicates the result of the
-comparison.
+any bytes in the two memory blocks.  Also unlike @samp{cmpstr@var{m}}
+the comparison will not stop if both bytes are zero.  The effect of
+the instruction is to store a value in operand 0 whose sign indicates
+the result of the comparison.
 
 @cindex @code{strlen@var{m}} instruction pattern
 @item @samp{strlen@var{m}}
@@ -5552,7 +5556,7 @@
 @cindex @code{stack_protect_set} instruction pattern
 @item @samp{stack_protect_set}
 
-This pattern, if defined, moves a @code{Pmode} value from the memory
+This pattern, if defined, moves a @code{ptr_mode} value from the memory
 in operand 1 to the memory in operand 0 without leaving the value in
 a register afterward.  This is to avoid leaking the value some place
 that an attacker might use to rewrite the stack guard slot after
@@ -5563,7 +5567,7 @@
 @cindex @code{stack_protect_test} instruction pattern
 @item @samp{stack_protect_test}
 
-This pattern, if defined, compares a @code{Pmode} value from the
+This pattern, if defined, compares a @code{ptr_mode} value from the
 memory in operand 1 with the memory in operand 0 without leaving the
 value in a register afterward and branches to operand 2 if the values
 weren't equal.

=== modified file 'gcc/dwarf2out.c'
--- gcc/dwarf2out.c	2011-07-01 09:19:21 +0000
+++ gcc/dwarf2out.c	2011-08-13 08:58:15 +0000
@@ -10683,7 +10683,15 @@
 	  size += size_of_sleb128 (AT_int (a));
 	  break;
 	case dw_val_class_unsigned_const:
-	  size += constant_size (AT_unsigned (a));
+	  {
+	    int csize = constant_size (AT_unsigned (a));
+	    if (dwarf_version == 3
+		&& a->dw_attr == DW_AT_data_member_location
+		&& csize >= 4)
+	      size += size_of_uleb128 (AT_unsigned (a));
+	    else
+	      size += csize;
+	  }
 	  break;
 	case dw_val_class_const_double:
 	  size += 2 * HOST_BITS_PER_WIDE_INT / HOST_BITS_PER_CHAR;
@@ -10953,8 +10961,16 @@
 	case 2:
 	  return DW_FORM_data2;
 	case 4:
+	  /* In DWARF3 DW_AT_data_member_location with
+	     DW_FORM_data4 or DW_FORM_data8 is a loclistptr, not
+	     constant, so we need to use DW_FORM_udata if we need
+	     a large constant.  */
+	  if (dwarf_version == 3 && a->dw_attr == DW_AT_data_member_location)
+	    return DW_FORM_udata;
 	  return DW_FORM_data4;
 	case 8:
+	  if (dwarf_version == 3 && a->dw_attr == DW_AT_data_member_location)
+	    return DW_FORM_udata;
 	  return DW_FORM_data8;
 	default:
 	  gcc_unreachable ();
@@ -11261,8 +11277,15 @@
 	  break;
 
 	case dw_val_class_unsigned_const:
-	  dw2_asm_output_data (constant_size (AT_unsigned (a)),
-			       AT_unsigned (a), "%s", name);
+	  {
+	    int csize = constant_size (AT_unsigned (a));
+	    if (dwarf_version == 3
+		&& a->dw_attr == DW_AT_data_member_location
+		&& csize >= 4)
+	      dw2_asm_output_data_uleb128 (AT_unsigned (a), "%s", name);
+	    else
+	      dw2_asm_output_data (csize, AT_unsigned (a), "%s", name);
+	  }
 	  break;
 
 	case dw_val_class_const_double:
@@ -17187,7 +17210,7 @@
 		{
 		  int count = tree_low_cst (TREE_OPERAND (index, 1), 0)
 			      - tree_low_cst (TREE_OPERAND (index, 0), 0);
-		  while (count > 0)
+		  while (count-- > 0)
 		    {
 		      if (val)
 			memcpy (array + curpos, array + pos, fieldsize);

=== modified file 'gcc/expr.c'
--- gcc/expr.c	2011-07-14 11:52:32 +0000
+++ gcc/expr.c	2011-08-13 08:58:15 +0000
@@ -6965,6 +6965,14 @@
 				modifier == EXPAND_INITIALIZER
 				? EXPAND_INITIALIZER : EXPAND_CONST_ADDRESS);
 
+	  if (TREE_ADDRESSABLE (exp)
+	      && ! MEM_P (result)
+	      && ! targetm.calls.allocate_stack_slots_for_args ())
+	    {
+	      error ("local frame unavailable (naked function?)");
+	      return result;
+	    }
+
 	  /* If the DECL isn't in memory, then the DECL wasn't properly
 	     marked TREE_ADDRESSABLE, which will be either a front-end
 	     or a tree optimizer bug.  */

=== modified file 'gcc/fortran/ChangeLog'
--- gcc/fortran/ChangeLog	2011-06-27 10:02:19 +0000
+++ gcc/fortran/ChangeLog	2011-08-13 08:58:15 +0000
@@ -1,3 +1,101 @@
[phone]  Janus Weil  <[e-mail]>
+
+	PR fortran/49112
+	* resolve.c (resolve_structure_cons): Don't do the full dt resolution,
+	only call 'resolve_fl_derived0'.
+	(resolve_typebound_procedures): Resolve typebound procedures of
+	parent type.
+	(resolve_fl_derived0): New function, which does a part of the work
+	for 'resolve_fl_derived'.
+	(resolve_fl_derived): Call 'resolve_fl_derived0' and do some additional
+	things.
+
[phone]  Daniel Kraft  <[e-mail]>
+
+	PR fortran/49885
+	* trans-array.c (gfc_trans_auto_array_allocation): Change
+	gfc_start_block to gfc_init_block to avoid spurious extra-scope.
+
[phone]  Thomas Koenig  <[e-mail]>
+
+	Backport from trunk.
+	PR fortran/48876
+	* expr.c (gfc_simplify_expr):  If end of a string is less
+	than zero, set it to zero.
+
[phone]  Tobias Burnus  <[e-mail]>
+
+	PR fortran/45586
+	* trans-types.c (gfc_get_derived_type): Ensure that pointer
+	component types are marked as nonrestricted.
+
[phone]  Janus Weil  <[e-mail]>
+
+	PR fortran/49708
+	* resolve.c (resolve_allocate_expr): Fix diagnostics for pointers.
+
[phone]  Mikael Morin  <[e-mail]>
+
+	PR fortran/49648
+	* resolve.c (resolve_symbol): Force resolution of function result's
+	array specification.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR fortran/49698
+	* trans-stmt.c (gfc_trans_pointer_assign_need_temp): Initialize
+	inner_size to gfc_index_one_node instead of integer_one_node.
+
[phone]  Tobias Burnus  <[e-mail]>
+
+	PR fortran/49690
+	* intrinsic.c (add_functions): Use BT_VOID for 2nd argument of SIGNAL.
+
[phone]  Janus Weil  <[e-mail]>
+
+	PR fortran/49562
+	* expr.c (gfc_check_vardef_context): Handle type-bound procedures.
+
[phone]  Uros Bizjak  <[e-mail]>
+
+	PR fortran/48926
+	* expr.c (gfc_get_corank): Change return value to int.
+	* gfortran.h (gfc_get_corank): Update function prototype.
+
[phone]  Jakub Jelinek  <[e-mail]>
+
+	PR fortran/49623
+	* gfortranspec.c (lang_specific_driver): Ignore options with
+	CL_ERR_MISSING_ARG errors.
+
+	Backported from mainline
+	2011-06-30  Jakub Jelinek  <[e-mail]>
+
+	PR fortran/49540
+	* gfortran.h (gfc_constructor): Add repeat field.
+	* trans-array.c (gfc_conv_array_initializer): Handle repeat > 1.
+	* array.c (current_expand): Add repeat field.
+	(expand_constructor): Copy repeat.
+	* constructor.c (node_free, node_copy, gfc_constructor_get,
+	gfc_constructor_lookup): Handle repeat field.
+	(gfc_constructor_lookup_next, gfc_constructor_remove): New functions.
+	* data.h (gfc_assign_data_value): Add mpz_t * argument.
+	(gfc_assign_data_value_range): Removed.
+	* constructor.h (gfc_constructor_advance): Removed.
+	(gfc_constructor_lookup_next, gfc_constructor_remove): New prototypes.
+	* data.c (gfc_assign_data_value): Add REPEAT argument, handle it and
+	also handle overwriting a range with a single entry.
+	(gfc_assign_data_value_range): Removed.
+	* resolve.c (check_data_variable): Adjust gfc_assign_data_value
+	call.  Use gfc_assign_data_value instead of
+	gfc_assign_data_value_expr.
+
[phone]  Janus Weil  <[e-mail]>
+
+	PR fortran/49466
+	* trans-array.c (structure_alloc_comps): Make sure sub-components
+	and extended types are correctly deallocated.
+
 2011-06-27  Release Manager
 
 	* GCC 4.6.1 released.

=== modified file 'gcc/fortran/array.c'
--- gcc/fortran/array.c	2010-11-02 17:09:58 +0000
+++ gcc/fortran/array.c	2011-08-13 08:58:15 +0000
@@ -1309,6 +1309,7 @@
 
   mpz_t *offset;
   gfc_component *component;
+  mpz_t *repeat;
 
   gfc_try (*expand_work_function) (gfc_expr *);
 }
@@ -1543,6 +1544,7 @@
 	  return FAILURE;
 	}
       current_expand.offset = &c->offset;
+      current_expand.repeat = &c->repeat;
       current_expand.component = c->n.component;
       if (current_expand.expand_work_function (e) == FAILURE)
 	return FAILURE;

=== modified file 'gcc/fortran/constructor.c'
--- gcc/fortran/constructor.c	2010-05-05 17:53:23 +0000
+++ gcc/fortran/constructor.c	2011-08-13 08:58:15 +0000
@@ -1,5 +1,5 @@
 /* Array and structure constructors
-   Copyright (C) 2009, 2010
+   Copyright (C) 2009, 2010, 2011
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -36,6 +36,7 @@
     gfc_free_iterator (c->iterator, 1);
 
   mpz_clear (c->offset);
+  mpz_clear (c->repeat);
 
   gfc_free (c);
 }
@@ -54,6 +55,7 @@
   c->n.component = src->n.component;
 
   mpz_init_set (c->offset, src->offset);
+  mpz_init_set (c->repeat, src->repeat);
 
   return c;
 }
@@ -78,6 +80,7 @@
   c->iterator = NULL;
 
   mpz_init_set_si (c->offset, 0);
+  mpz_init_set_si (c->repeat, 1);
 
   return c;
 }
@@ -169,6 +172,7 @@
 gfc_constructor *
 gfc_constructor_lookup (gfc_constructor_base base, int offset)
 {
+  gfc_constructor *c;
   splay_tree_node node;
 
   if (!base)
@@ -176,9 +180,24 @@
 
   node = splay_tree_lookup (base, (splay_tree_key) offset);
   if (node)
-    return (gfc_constructor*) node->value;
-
-  return NULL;
+    return (gfc_constructor *) node->value;
+
+  /* Check if the previous node has a repeat count big enough to
+     cover the offset looked for.  */
+  node = splay_tree_predecessor (base, (splay_tree_key) offset);
+  if (!node)
+    return NULL;
+
+  c = (gfc_constructor *) node->value;
+  if (mpz_cmp_si (c->repeat, 1) > 0)
+    {
+      if (mpz_get_si (c->offset) + mpz_get_si (c->repeat) <= offset)
+	c = NULL;
+    }
+  else
+    c = NULL;
+
+  return c;
 }
 
 
@@ -232,3 +251,27 @@
   else
     return NULL;
 }
+
+
+void
+gfc_constructor_remove (gfc_constructor *ctor)
+{
+  if (ctor)
+    splay_tree_remove (ctor->base, mpz_get_si (ctor->offset));
+}
+
+
+gfc_constructor *
+gfc_constructor_lookup_next (gfc_constructor_base base, int offset)
+{
+  splay_tree_node node;
+
+  if (!base)
+    return NULL;
+
+  node = splay_tree_successor (base, (splay_tree_key) offset);
+  if (!node)
+    return NULL;
+
+  return (gfc_constructor *) node->value;
+}

=== modified file 'gcc/fortran/constructor.h'
--- gcc/fortran/constructor.h	2010-05-23 16:18:24 +0000
+++ gcc/fortran/constructor.h	2011-08-13 08:58:15 +0000
@@ -1,5 +1,5 @@
 /* Array and structure constructors
-   Copyright (C) 2009, 2010
+   Copyright (C) 2009, 2010, 2011
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -81,6 +81,10 @@
    Returns NULL if there is no next expression.  */
 gfc_constructor *gfc_constructor_next (gfc_constructor *ctor);
 
-gfc_constructor *gfc_constructor_advance (gfc_constructor *ctor, int n);
+/* Remove the gfc_constructor node from the splay tree.  */
+void gfc_constructor_remove (gfc_constructor *);
+
+/* Return first constructor node after offset.  */
+gfc_constructor *gfc_constructor_lookup_next (gfc_constructor_base, int);
 
 #endif /* GFC_CONSTRUCTOR_H */

=== modified file 'gcc/fortran/data.c'
--- gcc/fortran/data.c	2010-08-27 06:50:03 +0000
+++ gcc/fortran/data.c	2011-08-13 08:58:15 +0000
@@ -1,5 +1,5 @@
 /* Supporting functions for resolving DATA statement.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Contributed by Lifang Zeng <[e-mail]>
 
@@ -189,10 +189,13 @@
 
 /* Assign the initial value RVALUE to  LVALUE's symbol->value. If the
    LVALUE already has an initialization, we extend this, otherwise we
-   create a new one.  */
+   create a new one.  If REPEAT is non-NULL, initialize *REPEAT
+   consecutive values in LVALUE the same value in RVALUE.  In that case,
+   LVALUE must refer to a full array, not an array section.  */
 
 gfc_try
-gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index)
+gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index,
+		       mpz_t *repeat)
 {
   gfc_ref *ref;
   gfc_expr *init;
@@ -269,6 +272,100 @@
 			 &lvalue->where);
 	      goto abort;
 	    }
+	  else if (repeat != NULL
+		   && ref->u.ar.type != AR_ELEMENT)
+	    {
+	      mpz_t size, end;
+	      gcc_assert (ref->u.ar.type == AR_FULL
+			  && ref->next == NULL);
+	      mpz_init_set (end, offset);
+	      mpz_add (end, end, *repeat);
+	      if (spec_size (ref->u.ar.as, &size) == SUCCESS)
+		{
+		  if (mpz_cmp (end, size) > 0)
+		    {
+		      mpz_clear (size);
+		      gfc_error ("Data element above array upper bound at %L",
+				 &lvalue->where);
+		      goto abort;
+		    }
+		  mpz_clear (size);
+		}
+
+	      con = gfc_constructor_lookup (expr->value.constructor,
+					    mpz_get_si (offset));
+	      if (!con)
+		{
+		  con = gfc_constructor_lookup_next (expr->value.constructor,
+						     mpz_get_si (offset));
+		  if (con != NULL && mpz_cmp (con->offset, end) >= 0)
+		    con = NULL;
+		}
+
+	      /* Overwriting an existing initializer is non-standard but
+		 usually only provokes a warning from other compilers.  */
+	      if (con != NULL && con->expr != NULL)
+		{
+		  /* Order in which the expressions arrive here depends on
+		     whether they are from data statements or F95 style
+		     declarations.  Therefore, check which is the most
+		     recent.  */
+		  gfc_expr *exprd;
+		  exprd = (LOCATION_LINE (con->expr->where.lb->location)
+			   > LOCATION_LINE (rvalue->where.lb->location))
+			  ? con->expr : rvalue;
+		  if (gfc_notify_std (GFC_STD_GNU,"Extension: "
+				      "re-initialization of '%s' at %L",
+				      symbol->name, &exprd->where) == FAILURE)
+		    return FAILURE;
+		}
+
+	      while (con != NULL)
+		{
+		  gfc_constructor *next_con = gfc_constructor_next (con);
+
+		  if (mpz_cmp (con->offset, end) >= 0)
+		    break;
+		  if (mpz_cmp (con->offset, offset) < 0)
+		    {
+		      gcc_assert (mpz_cmp_si (con->repeat, 1) > 0);
+		      mpz_sub (con->repeat, offset, con->offset);
+		    }
+		  else if (mpz_cmp_si (con->repeat, 1) > 0
+			   && mpz_get_si (con->offset)
+			      + mpz_get_si (con->repeat) > mpz_get_si (end))
+		    {
+		      int endi;
+		      splay_tree_node node
+			= splay_tree_lookup (con->base,
+					     mpz_get_si (con->offset));
+		      gcc_assert (node
+				  && con == (gfc_constructor *) node->value
+				  && node->key == (splay_tree_key)
+						  mpz_get_si (con->offset));
+		      endi = mpz_get_si (con->offset)
+			     + mpz_get_si (con->repeat);
+		      if (endi > mpz_get_si (end) + 1)
+			mpz_set_si (con->repeat, endi - mpz_get_si (end));
+		      else
+			mpz_set_si (con->repeat, 1);
+		      mpz_set (con->offset, end);
+		      node->key = (splay_tree_key) mpz_get_si (end);
+		      break;
+		    }
+		  else
+		    gfc_constructor_remove (con);
+		  con = next_con;
+		}
+
+	      con = gfc_constructor_insert_expr (&expr->value.constructor,
+						 NULL, &rvalue->where,
+						 mpz_get_si (offset));
+	      mpz_set (con->repeat, *repeat);
+	      repeat = NULL;
+	      mpz_clear (end);
+	      break;
+	    }
 	  else
 	    {
 	      mpz_t size;
@@ -293,6 +390,32 @@
 						 NULL, &rvalue->where,
 						 mpz_get_si (offset));
 	    }
+	  else if (mpz_cmp_si (con->repeat, 1) > 0)
+	    {
+	      /* Need to split a range.  */
+	      if (mpz_cmp (con->offset, offset) < 0)
+		{
+		  gfc_constructor *pred_con = con;
+		  con = gfc_constructor_insert_expr (&expr->value.constructor,
+						     NULL, &con->where,
+						     mpz_get_si (offset));
+		  con->expr = gfc_copy_expr (pred_con->expr);
+		  mpz_add (con->repeat, pred_con->offset, pred_con->repeat);
+		  mpz_sub (con->repeat, con->repeat, offset);
+		  mpz_sub (pred_con->repeat, offset, pred_con->offset);
+		}
+	      if (mpz_cmp_si (con->repeat, 1) > 0)
+		{
+		  gfc_constructor *succ_con;
+		  succ_con
+		    = gfc_constructor_insert_expr (&expr->value.constructor,
+						   NULL, &con->where,
+						   mpz_get_si (offset) + 1);
+		  succ_con->expr = gfc_copy_expr (con->expr);
+		  mpz_sub_ui (succ_con->repeat, con->repeat, 1);
+		  mpz_set_si (con->repeat, 1);
+		}
+	    }
 	  break;
 
 	case REF_COMPONENT:
@@ -337,6 +460,7 @@
     }
 
   mpz_clear (offset);
+  gcc_assert (repeat == NULL);
 
   if (ref || last_ts->type == BT_CHARACTER)
     {
@@ -380,36 +504,6 @@
 }
 
 
-/* Similarly, but initialize REPEAT consecutive values in LVALUE the same
-   value in RVALUE.  */
-
-gfc_try
-gfc_assign_data_value_range (gfc_expr *lvalue, gfc_expr *rvalue,
-			     mpz_t index, mpz_t repeat)
-{
-  mpz_t offset, last_offset;
-  gfc_try t;
-
-  mpz_init (offset);
-  mpz_init (last_offset);
-  mpz_add (last_offset, index, repeat);
-
-  t = SUCCESS;
-  for (mpz_set(offset, index) ; mpz_cmp(offset, last_offset) < 0;
-		   mpz_add_ui (offset, offset, 1))
-    if (gfc_assign_data_value (lvalue, rvalue, offset) == FAILURE)
-      {
-	t = FAILURE;
-	break;
-      }
-
-  mpz_clear (offset);
-  mpz_clear (last_offset);
-
-  return t;
-}
-
-
 /* Modify the index of array section and re-calculate the array offset.  */
 
 void 

=== modified file 'gcc/fortran/data.h'
--- gcc/fortran/data.h	2011-01-03 20:52:22 +0000
+++ gcc/fortran/data.h	2011-08-13 08:58:15 +0000
@@ -1,5 +1,5 @@
 /* Header for functions resolving DATA statements.
-   Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -19,6 +19,5 @@
 
 void gfc_formalize_init_value (gfc_symbol *);
 void gfc_get_section_index (gfc_array_ref *, mpz_t *, mpz_t *);
-gfc_try gfc_assign_data_value (gfc_expr *, gfc_expr *, mpz_t);
-gfc_try gfc_assign_data_value_range (gfc_expr *, gfc_expr *, mpz_t, mpz_t);
+gfc_try gfc_assign_data_value (gfc_expr *, gfc_expr *, mpz_t, mpz_t *);
 void gfc_advance_section (mpz_t *, gfc_array_ref *, mpz_t *);

=== modified file 'gcc/fortran/expr.c'
--- gcc/fortran/expr.c	2011-05-11 20:31:14 +0000
+++ gcc/fortran/expr.c	2011-08-13 08:58:15 +0000
@@ -1840,6 +1840,9 @@
 	  if (p->ref && p->ref->u.ss.end)
 	    gfc_extract_int (p->ref->u.ss.end, &end);
 
+	  if (end < 0)
+	    end = 0;
+
 	  s = gfc_get_wide_string (end - start + 2);
 	  memcpy (s, p->value.character.string + start,
 		  (end - start) * sizeof (gfc_char_t));
@@ -4139,7 +4142,7 @@
 }
 
 
-bool
+int
 gfc_get_corank (gfc_expr *e)
 {
   int corank;
@@ -4389,8 +4392,8 @@
       sym = e->value.function.esym ? e->value.function.esym : e->symtree->n.sym;
     }
 
-  if (!pointer && e->expr_type == EXPR_FUNCTION
-      && sym->result->attr.pointer)
+  attr = gfc_expr_attr (e);
+  if (!pointer && e->expr_type == EXPR_FUNCTION && attr.pointer)
     {
       if (!(gfc_option.allow_std & GFC_STD_F2008))
 	{
@@ -4427,7 +4430,6 @@
 
   /* Find out whether the expr is a pointer; this also means following
      component references to the last one.  */
-  attr = gfc_expr_attr (e);
   is_pointer = (attr.pointer || attr.proc_pointer);
   if (pointer && !is_pointer)
     {

=== modified file 'gcc/fortran/gfortran.h'
--- gcc/fortran/gfortran.h	2011-05-31 21:37:01 +0000
+++ gcc/fortran/gfortran.h	2011-08-13 08:58:15 +0000
@@ -2264,6 +2264,8 @@
      gfc_component *component; /* Record the component being initialized.  */
   }
   n;
+  mpz_t repeat; /* Record the repeat number of initial values in data
+		  statement like "data a/5*10/".  */
 }
 gfc_constructor;
 
@@ -2725,7 +2727,7 @@
 bool gfc_is_proc_ptr_comp (gfc_expr *, gfc_component **);
 
 bool gfc_is_coindexed (gfc_expr *);
-bool gfc_get_corank (gfc_expr *);
+int gfc_get_corank (gfc_expr *);
 bool gfc_has_ultimate_allocatable (gfc_expr *);
 bool gfc_has_ultimate_pointer (gfc_expr *);
 

=== modified file 'gcc/fortran/gfortranspec.c'
--- gcc/fortran/gfortranspec.c	2011-01-31 13:52:42 +0000
+++ gcc/fortran/gfortranspec.c	2011-08-13 08:58:15 +0000
@@ -255,6 +255,9 @@
 
   for (i = 1; i < argc; ++i)
     {
+      if (decoded_options[i].errors & CL_ERR_MISSING_ARG)
+	continue;
+
       switch (decoded_options[i].opt_index)
 	{
 	case OPT_SPECIAL_input_file:

=== modified file 'gcc/fortran/intrinsic.c'
--- gcc/fortran/intrinsic.c	2011-01-29 17:36:18 +0000
+++ gcc/fortran/intrinsic.c	2011-08-13 08:58:15 +0000
@@ -2588,7 +2588,7 @@
 
   add_sym_2 ("signal", GFC_ISYM_SIGNAL, CLASS_IMPURE, ACTUAL_NO, BT_INTEGER,
 	     di, GFC_STD_GNU, gfc_check_signal, NULL, gfc_resolve_signal,
-	     num, BT_INTEGER, di, REQUIRED, han, BT_UNKNOWN, 0, REQUIRED);
+	     num, BT_INTEGER, di, REQUIRED, han, BT_VOID, 0, REQUIRED);
 
   make_generic ("signal", GFC_ISYM_SIGNAL, GFC_STD_GNU);
 

=== modified file 'gcc/fortran/resolve.c'
--- gcc/fortran/resolve.c	2011-06-19 21:05:18 +0000
+++ gcc/fortran/resolve.c	2011-08-13 08:58:15 +0000
@@ -950,6 +950,9 @@
 }
 
 
+static gfc_try resolve_fl_derived0 (gfc_symbol *sym);
+
+
 /* Resolve all of the elements of a structure constructor and make sure that
    the types are correct. The 'init' flag indicates that the given
    constructor is an initializer.  */
@@ -965,7 +968,7 @@
   t = SUCCESS;
 
   if (expr->ts.type == BT_DERIVED)
-    resolve_symbol (expr->ts.u.derived);
+    resolve_fl_derived0 (expr->ts.u.derived);
 
   cons = gfc_constructor_first (expr->value.constructor);
   /* A constructor may have references if it is the result of substituting a
@@ -6831,7 +6834,7 @@
       gfc_find_derived_vtab (ts.u.derived);
     }
 
-  if (pointer || (dimension == 0 && codimension == 0))
+  if (dimension == 0 && codimension == 0)
     goto success;
 
   /* Make sure the last reference node is an array specifiction.  */
@@ -11242,9 +11245,14 @@
 resolve_typebound_procedures (gfc_symbol* derived)
 {
   int op;
+  gfc_symbol* super_type;
 
   if (!derived->f2k_derived || !derived->f2k_derived->tb_sym_root)
     return SUCCESS;
+  
+  super_type = gfc_get_derived_super_type (derived);
+  if (super_type)
+    resolve_typebound_procedures (super_type);
 
   resolve_bindings_derived = derived;
   resolve_bindings_result = SUCCESS;
@@ -11356,28 +11364,17 @@
 }
 
 
-/* Resolve the components of a derived type.  */
+/* Resolve the components of a derived type. This does not have to wait until
+   resolution stage, but can be done as soon as the dt declaration has been
+   parsed.  */
 
 static gfc_try
-resolve_fl_derived (gfc_symbol *sym)
+resolve_fl_derived0 (gfc_symbol *sym)
 {
   gfc_symbol* super_type;
   gfc_component *c;
 
   super_type = gfc_get_derived_super_type (sym);
-  
-  if (sym->attr.is_class && sym->ts.u.derived == NULL)
-    {
-      /* Fix up incomplete CLASS symbols.  */
-      gfc_component *data = gfc_find_component (sym, "_data", true, true);
-      gfc_component *vptr = gfc_find_component (sym, "_vptr", true, true);
-      if (vptr->ts.u.derived == NULL)
-	{
-	  gfc_symbol *vtab = gfc_find_derived_vtab (data->ts.u.derived);
-	  gcc_assert (vtab);
-	  vptr->ts.u.derived = vtab->ts.u.derived;
-	}
-    }
 
   /* F2008, C432. */
   if (super_type && sym->attr.coarray_comp && !super_type->attr.coarray_comp)
@@ -11389,7 +11386,7 @@
     }
 
   /* Ensure the extended type gets resolved before we do.  */
-  if (super_type && resolve_fl_derived (super_type) == FAILURE)
+  if (super_type && resolve_fl_derived0 (super_type) == FAILURE)
     return FAILURE;
 
   /* An ABSTRACT type must be extensible.  */
@@ -11742,14 +11739,6 @@
 	return FAILURE;
     }
 
-  /* Resolve the type-bound procedures.  */
-  if (resolve_typebound_procedures (sym) == FAILURE)
-    return FAILURE;
-
-  /* Resolve the finalizer procedures.  */
-  if (gfc_resolve_finalizers (sym) == FAILURE)
-    return FAILURE;
-
   /* If this is a non-ABSTRACT type extending an ABSTRACT one, ensure that
      all DEFERRED bindings are overridden.  */
   if (super_type && super_type->attr.abstract && !sym->attr.abstract
@@ -11764,6 +11753,42 @@
 }
 
 
+/* The following procedure does the full resolution of a derived type,
+   including resolution of all type-bound procedures (if present). In contrast
+   to 'resolve_fl_derived0' this can only be done after the module has been
+   parsed completely.  */
+
+static gfc_try
+resolve_fl_derived (gfc_symbol *sym)
+{
+  if (sym->attr.is_class && sym->ts.u.derived == NULL)
+    {
+      /* Fix up incomplete CLASS symbols.  */
+      gfc_component *data = gfc_find_component (sym, "_data", true, true);
+      gfc_component *vptr = gfc_find_component (sym, "_vptr", true, true);
+      if (vptr->ts.u.derived == NULL)
+	{
+	  gfc_symbol *vtab = gfc_find_derived_vtab (data->ts.u.derived);
+	  gcc_assert (vtab);
+	  vptr->ts.u.derived = vtab->ts.u.derived;
+	}
+    }
+  
+  if (resolve_fl_derived0 (sym) == FAILURE)
+    return FAILURE;
+  
+  /* Resolve the type-bound procedures.  */
+  if (resolve_typebound_procedures (sym) == FAILURE)
+    return FAILURE;
+
+  /* Resolve the finalizer procedures.  */
+  if (gfc_resolve_finalizers (sym) == FAILURE)
+    return FAILURE;
+  
+  return SUCCESS;
+}
+
+
 static gfc_try
 resolve_fl_namelist (gfc_symbol *sym)
 {
@@ -12076,6 +12101,8 @@
 	    }
 	}
     }
+  else if (mp_flag && sym->attr.flavor == FL_PROCEDURE && sym->attr.function)
+    gfc_resolve_array_spec (sym->result->as, false);
 
   /* Assumed size arrays and assumed shape arrays must be dummy
      arguments.  Array-spec's of implied-shape should have been resolved to
@@ -12612,8 +12639,8 @@
 	      mpz_set_ui (size, 0);
 	    }
 
-	  t = gfc_assign_data_value_range (var->expr, values.vnode->expr,
-					   offset, range);
+	  t = gfc_assign_data_value (var->expr, values.vnode->expr,
+				     offset, &range);
 
 	  mpz_add (offset, offset, range);
 	  mpz_clear (range);
@@ -12628,7 +12655,8 @@
 	  mpz_sub_ui (values.left, values.left, 1);
 	  mpz_sub_ui (size, size, 1);
 
-	  t = gfc_assign_data_value (var->expr, values.vnode->expr, offset);
+	  t = gfc_assign_data_value (var->expr, values.vnode->expr,
+				     offset, NULL);
 	  if (t == FAILURE)
 	    break;
 

=== modified file 'gcc/fortran/trans-array.c'
--- gcc/fortran/trans-array.c	2011-06-17 06:11:31 +0000
+++ gcc/fortran/trans-array.c	2011-08-13 08:58:15 +0000
@@ -4490,7 +4490,7 @@
   gfc_se se;
   HOST_WIDE_INT hi;
   unsigned HOST_WIDE_INT lo;
-  tree index;
+  tree index, range;
   VEC(constructor_elt,gc) *v = NULL;
 
   switch (expr->expr_type)
@@ -4544,28 +4544,56 @@
           else
             index = NULL_TREE;
 
+	  if (mpz_cmp_si (c->repeat, 1) > 0)
+	    {
+	      tree tmp1, tmp2;
+	      mpz_t maxval;
+
+	      mpz_init (maxval);
+	      mpz_add (maxval, c->offset, c->repeat);
+	      mpz_sub_ui (maxval, maxval, 1);
+	      tmp2 = gfc_conv_mpz_to_tree (maxval, gfc_index_integer_kind);
+	      if (mpz_cmp_si (c->offset, 0) != 0)
+		{
+		  mpz_add_ui (maxval, c->offset, 1);
+		  tmp1 = gfc_conv_mpz_to_tree (maxval, gfc_index_integer_kind);
+		}
+	      else
+		tmp1 = gfc_conv_mpz_to_tree (c->offset, gfc_index_integer_kind);
+
+	      range = fold_build2 (RANGE_EXPR, gfc_array_index_type, tmp1, tmp2);
+	      mpz_clear (maxval);
+	    }
+	  else
+	    range = NULL;
+
           gfc_init_se (&se, NULL);
 	  switch (c->expr->expr_type)
 	    {
 	    case EXPR_CONSTANT:
 	      gfc_conv_constant (&se, c->expr);
-	      CONSTRUCTOR_APPEND_ELT (v, index, se.expr);
 	      break;
 
 	    case EXPR_STRUCTURE:
               gfc_conv_structure (&se, c->expr, 1);
-	      CONSTRUCTOR_APPEND_ELT (v, index, se.expr);
 	      break;
 
-
 	    default:
 	      /* Catch those occasional beasts that do not simplify
 		 for one reason or another, assuming that if they are
 		 standard defying the frontend will catch them.  */
 	      gfc_conv_expr (&se, c->expr);
-	      CONSTRUCTOR_APPEND_ELT (v, index, se.expr);
 	      break;
 	    }
+
+	  if (range == NULL_TREE)
+	    CONSTRUCTOR_APPEND_ELT (v, index, se.expr);
+	  else
+	    {
+	      if (index != NULL_TREE)
+		CONSTRUCTOR_APPEND_ELT (v, index, se.expr);
+	      CONSTRUCTOR_APPEND_ELT (v, range, se.expr);
+	    }
         }
       break;
 
@@ -4694,7 +4722,7 @@
   gcc_assert (GFC_ARRAY_TYPE_P (type));
   onstack = TREE_CODE (type) != POINTER_TYPE;
 
-  gfc_start_block (&init);
+  gfc_init_block (&init);
 
   /* Evaluate character string length.  */
   if (sym->ts.type == BT_CHARACTER
@@ -6521,18 +6549,22 @@
       switch (purpose)
 	{
 	case DEALLOCATE_ALLOC_COMP:
+	  if (cmp_has_alloc_comps && !c->attr.pointer)
+	    {
+	      /* Do not deallocate the components of ultimate pointer
+		 components.  */
+	      comp = fold_build3_loc (input_location, COMPONENT_REF, ctype,
+				      decl, cdecl, NULL_TREE);
+	      rank = c->as ? c->as->rank : 0;
+	      tmp = structure_alloc_comps (c->ts.u.derived, comp, NULL_TREE,
+					   rank, purpose);
+	      gfc_add_expr_to_block (&fnblock, tmp);
+	    }
+
 	  if (c->attr.allocatable && c->attr.dimension)
 	    {
 	      comp = fold_build3_loc (input_location, COMPONENT_REF, ctype,
 				      decl, cdecl, NULL_TREE);
-	      if (cmp_has_alloc_comps && !c->attr.pointer)
-		{
-		  /* Do not deallocate the components of ultimate pointer
-		     components.  */
-		  tmp = structure_alloc_comps (c->ts.u.derived, comp, NULL_TREE,
-					       c->as->rank, purpose);
-		  gfc_add_expr_to_block (&fnblock, tmp);
-		}
 	      tmp = gfc_trans_dealloc_allocated (comp);
 	      gfc_add_expr_to_block (&fnblock, tmp);
 	    }

=== modified file 'gcc/fortran/trans-stmt.c'
--- gcc/fortran/trans-stmt.c	2011-02-27 14:12:31 +0000
+++ gcc/fortran/trans-stmt.c	2011-08-13 08:58:15 +0000
@@ -3095,7 +3095,7 @@
   count = gfc_create_var (gfc_array_index_type, "count");
   gfc_add_modify (block, count, gfc_index_zero_node);
 
-  inner_size = integer_one_node;
+  inner_size = gfc_index_one_node;
   lss = gfc_walk_expr (expr1);
   rss = gfc_walk_expr (expr2);
   if (lss == gfc_ss_terminator)

=== modified file 'gcc/fortran/trans-types.c'
--- gcc/fortran/trans-types.c	2011-02-20 16:23:50 +0000
+++ gcc/fortran/trans-types.c	2011-08-13 08:58:15 +0000
@@ -2329,6 +2329,9 @@
 	       && !c->attr.proc_pointer)
 	field_type = build_pointer_type (field_type);
 
+      if (c->attr.pointer)
+	field_type = gfc_nonrestricted_type (field_type);
+
       /* vtype fields can point to different types to the base type.  */
       if (c->ts.type == BT_DERIVED && c->ts.u.derived->attr.vtype)
 	  field_type = build_pointer_type_for_mode (TREE_TYPE (field_type),

=== modified file 'gcc/gimple.c'
--- gcc/gimple.c	2011-06-02 12:12:00 +0000
+++ gcc/gimple.c	2011-08-13 08:58:15 +0000
@@ -5030,6 +5030,20 @@
 		   && TREE_CODE (OBJ_TYPE_REF_OBJECT (rhs)) == ADDR_EXPR)
 	    ret |= visit_addr (stmt, TREE_OPERAND (OBJ_TYPE_REF_OBJECT (rhs),
 						   0), data);
+	  else if (TREE_CODE (rhs) == CONSTRUCTOR)
+	    {
+	      unsigned int ix;
+	      tree val;
+
+	      FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (rhs), ix, val)
+		if (TREE_CODE (val) == ADDR_EXPR)
+		  ret |= visit_addr (stmt, TREE_OPERAND (val, 0), data);
+		else if (TREE_CODE (val) == OBJ_TYPE_REF
+			 && TREE_CODE (OBJ_TYPE_REF_OBJECT (val)) == ADDR_EXPR)
+		  ret |= visit_addr (stmt,
+				     TREE_OPERAND (OBJ_TYPE_REF_OBJECT (val),
+						   0), data);
+	    }
           lhs = gimple_assign_lhs (stmt);
 	  if (TREE_CODE (lhs) == TARGET_MEM_REF
               && TREE_CODE (TMR_BASE (lhs)) == ADDR_EXPR)

=== modified file 'gcc/gimplify.c'
--- gcc/gimplify.c	2011-07-13 13:17:31 +0000
+++ gcc/gimplify.c	2011-08-13 08:58:15 +0000
@@ -2008,8 +2008,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));
@@ -2028,11 +2034,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);
@@ -2051,6 +2063,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);
+	    }
 	}
     }
 

=== modified file 'gcc/omp-low.c'
--- gcc/omp-low.c	2011-04-13 15:52:17 +0000
+++ gcc/omp-low.c	2011-08-13 08:58:15 +0000
@@ -785,7 +785,7 @@
 		  break;
 
 	      if (c)
-		return true;
+		goto maybe_mark_addressable_and_ret;
 	    }
 	}
 
@@ -795,7 +795,9 @@
 	 returns, the task hasn't necessarily terminated.  */
       if (!TREE_READONLY (decl) && is_task_ctx (shared_ctx))
 	{
-	  tree outer = maybe_lookup_decl_in_outer_ctx (decl, shared_ctx);
+	  tree outer;
+	maybe_mark_addressable_and_ret:
+	  outer = maybe_lookup_decl_in_outer_ctx (decl, shared_ctx);
 	  if (is_gimple_reg (outer))
 	    {
 	      /* Taking address of OUTER in lower_send_shared_vars

=== modified file 'gcc/po/ChangeLog'
--- gcc/po/ChangeLog	2011-06-27 20:57:06 +0000
+++ gcc/po/ChangeLog	2011-08-13 08:58:15 +0000
@@ -1,3 +1,21 @@
[phone]  Joseph Myers  <[e-mail]>
+
+	* de.po: Update.
+
[phone]  Joseph Myers  <[e-mail]>
+
+	* de.po, sv.po: Update.
+
[phone]  Joseph Myers  <[e-mail]>
+
+	* be.po, da.po, de.po, el.po, es.po, fi.po, fr.po, id.po, ja.po,
+	nl.po, ru.po, sr.po, sv.po, tr.po, vi.po, zh_CN.po, zh_TW.po:
+	Update.
+
[phone]  Joseph Myers  <[e-mail]>
+
+	* de.po: Update.
+
 2011-06-27  Joseph Myers  <[e-mail]>
 
 	* de.po: Update.

=== modified file 'gcc/po/be.po'
--- gcc/po/be.po	2011-04-03 11:30:58 +0000
+++ gcc/po/be.po	2011-08-13 08:58:15 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gcc 3.1\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2011-03-24 16:45+0000\n"
+"POT-Creation-Date: 2011-06-21 10:27+0000\n"
 "PO-Revision-Date: 2002-05-17 15:54+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[e-mail]>\n"
 "Language-Team: Belarusian <[e-mail]>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: c-decl.c:4660 c-typeck.c:5851 toplev.c:1013 c-family/c-pretty-print.c:423
-#: cp/error.c:610 cp/error.c:889
+#: c-decl.c:4660 c-typeck.c:5853 toplev.c:1013 c-family/c-pretty-print.c:423
+#: cp/error.c:617 cp/error.c:896
 msgid "<anonymous>"
 msgstr ""
 
@@ -24,7 +24,7 @@
 msgid "({anonymous})"
 msgstr ""
 
-#: c-parser.c:942 cp/parser.c:20965
+#: c-parser.c:942 cp/parser.c:20975
 #, gcc-internal-format
 msgid "expected end of line"
 msgstr ""
@@ -34,7 +34,7 @@
 #: c-parser.c:6980 c-parser.c:7016 c-parser.c:7048 c-parser.c:7096
 #: c-parser.c:7276 c-parser.c:8042 c-parser.c:8112 c-parser.c:8155
 #: c-parser.c:9132 c-parser.c:9277 c-parser.c:9315 c-parser.c:2442
-#: c-parser.c:7269 cp/parser.c:20911
+#: c-parser.c:7269 cp/parser.c:20921
 #, gcc-internal-format
 msgid "expected %<;%>"
 msgstr ""
@@ -46,13 +46,13 @@
 #: c-parser.c:6395 c-parser.c:6419 c-parser.c:7566 c-parser.c:7638
 #: c-parser.c:8447 c-parser.c:8468 c-parser.c:8518 c-parser.c:8628
 #: c-parser.c:8701 c-parser.c:8769 c-parser.c:9240 c-parser.c:8591
-#: cp/parser.c:20914
+#: cp/parser.c:20924
 #, gcc-internal-format
 msgid "expected %<(%>"
 msgstr ""
 
 #: c-parser.c:1804 c-parser.c:6186 c-parser.c:6224 c-parser.c:6309
-#: c-parser.c:6316 c-parser.c:6353 cp/parser.c:20576 cp/parser.c:20929
+#: c-parser.c:6316 c-parser.c:6353 cp/parser.c:20586 cp/parser.c:20939
 #, gcc-internal-format
 msgid "expected %<,%>"
 msgstr ""
@@ -68,13 +68,13 @@
 #: c-parser.c:7381 c-parser.c:7589 c-parser.c:7642 c-parser.c:8014
 #: c-parser.c:8450 c-parser.c:8471 c-parser.c:8549 c-parser.c:8634
 #: c-parser.c:8750 c-parser.c:8832 c-parser.c:9168 c-parser.c:9285
-#: c-parser.c:9326 cp/parser.c:20959
+#: c-parser.c:9326 cp/parser.c:20969
 #, gcc-internal-format
 msgid "expected %<)%>"
 msgstr ""
 
 #: c-parser.c:2997 c-parser.c:3784 c-parser.c:3818 c-parser.c:5089
-#: c-parser.c:6288 c-parser.c:6452 c-parser.c:6559 cp/parser.c:20923
+#: c-parser.c:6288 c-parser.c:6452 c-parser.c:6559 cp/parser.c:20933
 #, gcc-internal-format
 msgid "expected %<]%>"
 msgstr ""
@@ -83,25 +83,25 @@
 msgid "expected %<;%>, %<,%> or %<)%>"
 msgstr ""
 
-#: c-parser.c:3647 cp/parser.c:20917 cp/parser.c:22533
+#: c-parser.c:3647 cp/parser.c:20927 cp/parser.c:22543
 #, gcc-internal-format
 msgid "expected %<}%>"
 msgstr ""
 
 #: c-parser.c:3937 c-parser.c:7609 c-parser.c:9569 c-parser.c:2262
-#: c-parser.c:2462 c-parser.c:7165 cp/parser.c:13540 cp/parser.c:20920
+#: c-parser.c:2462 c-parser.c:7165 cp/parser.c:13548 cp/parser.c:20930
 #, gcc-internal-format
 msgid "expected %<{%>"
 msgstr ""
 
 #: c-parser.c:4156 c-parser.c:4165 c-parser.c:4993 c-parser.c:5334
 #: c-parser.c:7374 c-parser.c:7749 c-parser.c:7806 c-parser.c:8739
-#: cp/parser.c:20953 cp/parser.c:21771
+#: cp/parser.c:20963 cp/parser.c:21781
 #, gcc-internal-format
 msgid "expected %<:%>"
 msgstr ""
 
-#: c-parser.c:4689 cp/parser.c:20853
+#: c-parser.c:4689 cp/parser.c:20863
 #, gcc-internal-format
 msgid "expected %<while%>"
 msgstr ""
@@ -110,33 +110,33 @@
 msgid "expected %<.%>"
 msgstr ""
 
-#: c-parser.c:6854 c-parser.c:6886 c-parser.c:7109 cp/parser.c:22319
-#: cp/parser.c:22392
+#: c-parser.c:6854 c-parser.c:6886 c-parser.c:7109 cp/parser.c:22329
+#: cp/parser.c:22402
 #, gcc-internal-format
 msgid "expected %<@end%>"
 msgstr ""
 
-#: c-parser.c:7523 cp/parser.c:20938
+#: c-parser.c:7523 cp/parser.c:20948
 #, gcc-internal-format
 msgid "expected %<>%>"
 msgstr ""
 
-#: c-parser.c:8836 cp/parser.c:20962
+#: c-parser.c:8836 cp/parser.c:20972
 #, gcc-internal-format
 msgid "expected %<,%> or %<)%>"
 msgstr ""
 
-#: c-parser.c:9266 c-parser.c:3841 cp/parser.c:20941
+#: c-parser.c:9266 c-parser.c:3841 cp/parser.c:20951
 #, gcc-internal-format
 msgid "expected %<=%>"
 msgstr ""
 
-#: c-parser.c:9626 c-parser.c:9616 cp/parser.c:24857
+#: c-parser.c:9626 c-parser.c:9616 cp/parser.c:24868
 #, gcc-internal-format
 msgid "expected %<#pragma omp section%> or %<}%>"
 msgstr ""
 
-#: c-typeck.c:6494
+#: c-typeck.c:6496
 msgid "(anonymous)"
 msgstr ""
 
@@ -158,6 +158,7 @@
 
 #: collect2.c:500
 #, fuzzy, c-format
+#| msgid "abort in %s, at %s:%d"
 msgid "internal gcc abort in %s, at %s:%d"
 msgstr "спынена ў %s, ля %s:%d"
 
@@ -188,6 +189,7 @@
 
 #: collect2.c:1797
 #, fuzzy, c-format
+#| msgid "%d constructor(s) found\n"
 msgid "%d constructor found\n"
 msgid_plural "%d constructors found\n"
 msgstr[0] "%d канструктар(аў) знойдзен(а)\n"
@@ -195,6 +197,7 @@
 
 #: collect2.c:1801
 #, fuzzy, c-format
+#| msgid "%d destructor(s)  found\n"
 msgid "%d destructor found\n"
 msgid_plural "%d destructors found\n"
 msgstr[0] "%d дэструктар(аў) знойдзен(а)\n"
@@ -234,6 +237,7 @@
 
 #: collect2.c:2076
 #, fuzzy, c-format
+#| msgid "cannot find `%s'"
 msgid "cannot find '%s'"
 msgstr "нельга знайсці \"%s\""
 
@@ -256,11 +260,13 @@
 
 #: collect2.c:2595
 #, fuzzy, c-format
+#| msgid "cannot find `nm'"
 msgid "cannot find 'nm'"
 msgstr "нельга знайсці \"nm\""
 
 #: collect2.c:2643
 #, fuzzy, c-format
+#| msgid "can't open output file `%s'"
 msgid "can't open nm output"
 msgstr "немагчыма адчыніць файл уводу `%s'"
 
@@ -276,6 +282,7 @@
 
 #: collect2.c:2838
 #, fuzzy, c-format
+#| msgid "can't open output file `%s'"
 msgid "can't open ldd output"
 msgstr "немагчыма адчыніць файл уводу `%s'"
 
@@ -323,11 +330,13 @@
 
 #: diagnostic.c:219
 #, fuzzy, c-format
+#| msgid "compilation terminated.\n"
 msgid "compilation terminated due to -Wfatal-errors.\n"
 msgstr "кампіляцыя завершана.\n"
 
 #: diagnostic.c:229
 #, fuzzy, c-format
+#| msgid "compilation terminated.\n"
 msgid "compilation terminated due to -fmax-errors=%u.\n"
 msgstr "кампіляцыя завершана.\n"
 
@@ -358,41 +367,42 @@
 msgid "negative insn length"
 msgstr ""
 
-#: final.c:2643
+#: final.c:2648
 msgid "could not split insn"
 msgstr ""
 
-#: final.c:3079
+#: final.c:3084
 #, fuzzy
+#| msgid "invalid mask"
 msgid "invalid 'asm': "
 msgstr "нерэчаісная маска"
 
-#: final.c:3262
+#: final.c:3267
 #, c-format
 msgid "nested assembly dialect alternatives"
 msgstr ""
 
-#: final.c:3279 final.c:3291
+#: final.c:3284 final.c:3296
 #, c-format
 msgid "unterminated assembly dialect alternative"
 msgstr ""
 
-#: final.c:3338
+#: final.c:3343
 #, c-format
 msgid "operand number missing after %%-letter"
 msgstr ""
 
-#: final.c:3341 final.c:3382
+#: final.c:3346 final.c:3387
 #, c-format
 msgid "operand number out of range"
 msgstr ""
 
-#: final.c:3399
+#: final.c:3404
 #, c-format
 msgid "invalid %%-code"
 msgstr "нерэчаісны %%-код"
 
-#: final.c:3429
+#: final.c:3434
 #, c-format
 msgid "'%%l' operand isn't a label"
 msgstr ""
@@ -403,12 +413,12 @@
 #. TARGET_PRINT_OPERAND must handle them.
 #. We can't handle floating point constants;
 #. PRINT_OPERAND must handle them.
-#: final.c:3570 config/i386/i386.c:13149 config/pdp11/pdp11.c:1722
+#: final.c:3575 config/i386/i386.c:13168 config/pdp11/pdp11.c:1722
 #, c-format
 msgid "floating constant misused"
 msgstr ""
 
-#: final.c:3629 config/i386/i386.c:13247 config/pdp11/pdp11.c:1763
+#: final.c:3634 config/i386/i386.c:13266 config/pdp11/pdp11.c:1763
 #, c-format
 msgid "invalid expression as operand"
 msgstr ""
@@ -491,6 +501,7 @@
 
 #: gcc.c:2921
 #, fuzzy
+#| msgid "  --help                   Display this information\n"
 msgid "                           Display specific types of command line options\n"
 msgstr "  --help                   Адлюстраваць гэту інфармацыю\n"
 
@@ -500,6 +511,7 @@
 
 #: gcc.c:2924
 #, fuzzy
+#| msgid "  --help                   Display this information\n"
 msgid "  --version                Display compiler version information\n"
 msgstr "  --help                   Адлюстраваць гэту інфармацыю\n"
 
@@ -547,6 +559,7 @@
 
 #: gcc.c:2937
 #, fuzzy
+#| msgid "  -dumpversion             Display the version of the compiler\n"
 msgid "  -print-sysroot           Display the target libraries directory\n"
 msgstr "  -dumpversion             Адлюстраваць версію кампілятара\n"
 
@@ -708,6 +721,7 @@
 
 #: gcc.c:6579
 #, fuzzy, c-format
+#| msgid "libraries: %s\n"
 msgid "Target: %s\n"
 msgstr "бібліятэкі: %s\n"
 
@@ -723,6 +737,7 @@
 
 #: gcc.c:6605
 #, fuzzy, c-format
+#| msgid "gcc version %s\n"
 msgid "gcc version %s %s\n"
 msgstr "версія gcc %s\n"
 
@@ -837,6 +852,7 @@
 
 #: gcov.c:431
 #, fuzzy, c-format
+#| msgid "  --help                   Display this information\n"
 msgid "  -d, --display-progress          Display progress information\n"
 msgstr "  --help                   Адлюстраваць гэту інфармацыю\n"
 
@@ -866,21 +882,27 @@
 
 #: gcov.c:546
 #, fuzzy, c-format
+#| msgid "not found\n"
 msgid "%s:no functions found\n"
 msgstr "не знойдзена\n"
 
 #: gcov.c:578 gcov.c:606
 #, fuzzy, c-format
+#| msgid ":\n"
 msgid "\n"
 msgstr ":\n"
 
 #: gcov.c:593
 #, fuzzy, c-format
+#| msgid "%s: compiling `%s'\n"
 msgid "%s:creating '%s'\n"
 msgstr "%s: кампілюецца \"%s\"\n"
 
 #: gcov.c:597
 #, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: error reading input file `%s': %s\n"
 msgid "%s:error writing output file '%s'\n"
 msgstr ""
 "\n"
@@ -888,6 +910,7 @@
 
 #: gcov.c:602
 #, fuzzy, c-format
+#| msgid "can't open output file `%s'"
 msgid "%s:could not open output file '%s'\n"
 msgstr "немагчыма адчыніць файл уводу `%s'"
 
@@ -903,6 +926,7 @@
 
 #: gcov.c:780
 #, fuzzy, c-format
+#| msgid "can't open output file `%s'"
 msgid "%s:cannot open graph file\n"
 msgstr "немагчыма адчыніць файл уводу `%s'"
 
@@ -933,6 +957,7 @@
 
 #: gcov.c:1052
 #, fuzzy, c-format
+#| msgid "Could not open data file %s.\n"
 msgid "%s:not a gcov data file\n"
 msgstr "Немагчыма адчыніць файл з дадзенымі %s.\n"
 
@@ -948,6 +973,7 @@
 
 #: gcov.c:1101
 #, fuzzy, c-format
+#| msgid "In function `%s':"
 msgid "%s:unknown function '%u'\n"
 msgstr "у функцыі \"%s\":"
 
@@ -1023,6 +1049,9 @@
 
 #: gcov.c:1648
 #, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| " Options for %s:\n"
 msgid "%s:no lines for '%s'\n"
 msgstr ""
 "\n"
@@ -1060,6 +1089,7 @@
 
 #: gcov.c:1901
 #, fuzzy, c-format
+#| msgid "cannot find source %s"
 msgid "%s:cannot open source file\n"
 msgstr "не магу знайсці крыніцу %s"
 
@@ -1125,6 +1155,7 @@
 
 #: gengtype-state.c:1175
 #, fuzzy, c-format
+#| msgid "%s: can't open file `%s' for reading: %s\n"
 msgid "Failed to open file %s for writing state: %s"
 msgstr "%s: немагчыма адчыніць файл `%s' для чытаньня: %s\n"
 
@@ -1135,6 +1166,7 @@
 
 #: gengtype-state.c:1210
 #, fuzzy, c-format
+#| msgid "can't close input file %s"
 msgid "failed to close state file %s [%s]"
 msgstr "немагчыма зачыніць уваходзячы файл %s"
 
@@ -1145,6 +1177,7 @@
 
 #: gengtype-state.c:2395
 #, fuzzy, c-format
+#| msgid "%s: can't open file `%s' for reading: %s\n"
 msgid "Failed to open state file %s for reading [%s]"
 msgstr "%s: немагчыма адчыніць файл `%s' для чытаньня: %s\n"
 
@@ -1183,7 +1216,7 @@
 msgid "End of search list.\n"
 msgstr ""
 
-#: input.c:39 c-family/c-opts.c:1294 cp/error.c:1046 fortran/cpp.c:568
+#: input.c:39 c-family/c-opts.c:1294 cp/error.c:1053 fortran/cpp.c:568
 msgid "<built-in>"
 msgstr ""
 
@@ -1209,28 +1242,32 @@
 msgid "At top level:"
 msgstr ""
 
-#: langhooks.c:394 cp/error.c:2818
+#: langhooks.c:394 cp/error.c:2837
 #, fuzzy, c-format
 msgid "In member function %qs"
 msgstr "у функцыі \"%s\":"
 
-#: langhooks.c:398 cp/error.c:2821
+#: langhooks.c:398 cp/error.c:2840
 #, fuzzy, c-format
+#| msgid "In function `%s':"
 msgid "In function %qs"
 msgstr "у функцыі \"%s\":"
 
-#: langhooks.c:449 cp/error.c:2771
+#: langhooks.c:449 cp/error.c:2790
 #, fuzzy, c-format
+#| msgid "In file included from %s:%d"
 msgid "    inlined from %qs at %s:%d:%d"
 msgstr "У файле уключаным з %s:%d"
 
-#: langhooks.c:454 cp/error.c:2776
+#: langhooks.c:454 cp/error.c:2795
 #, fuzzy, c-format
+#| msgid "In file included from %s:%d"
 msgid "    inlined from %qs at %s:%d"
 msgstr "У файле уключаным з %s:%d"
 
-#: langhooks.c:460 cp/error.c:2782
+#: langhooks.c:460 cp/error.c:2801
 #, fuzzy, c-format
+#| msgid "In file included from %s:%d"
 msgid "    inlined from %qs"
 msgstr "У файле уключаным з %s:%d"
 
@@ -1272,11 +1309,13 @@
 
 #: lto-wrapper.c:258
 #, fuzzy, c-format
+#| msgid "unable to open file '%s'"
 msgid "failed to open %s"
 msgstr "немагу адчыніць файл \"%s\""
 
 #: lto-wrapper.c:263
 #, fuzzy, c-format
+#| msgid "cannot create temporary file"
 msgid "could not write to temporary file %s"
 msgstr "немагчыма стварыць часовы файл"
 
@@ -1297,6 +1336,7 @@
 
 #: lto-wrapper.c:484
 #, fuzzy, c-format
+#| msgid "can't open %s"
 msgid "fopen: %s"
 msgstr "немагчыма адчыніць %s"
 
@@ -1402,17 +1442,17 @@
 msgstr ""
 
 #. It's the compiler's fault.
-#: reload1.c:6009
+#: reload1.c:6016
 #, fuzzy
 msgid "could not find a spill register"
 msgstr "Не выкарыстоўваць рэгістра sb"
 
 #. It's the compiler's fault.
-#: reload1.c:7852
+#: reload1.c:7849
 msgid "VOIDmode on an output"
 msgstr ""
 
-#: reload1.c:8619
+#: reload1.c:8616
 msgid "failure trying to reload:"
 msgstr ""
 
@@ -1474,11 +1514,16 @@
 
 #: toplev.c:355
 #, fuzzy, c-format
+#| msgid "internal error"
 msgid "unrecoverable error"
 msgstr "унутраная памылка"
 
 #: toplev.c:691
 #, fuzzy, c-format
+#| msgid ""
+#| "%s%s%s version %s (%s)\n"
+#| "%s\tcompiled by GNU C version %s.\n"
+#| "%s%s%s version %s (%s) compiled by CC.\n"
 msgid ""
 "%s%s%s %sversion %s (%s)\n"
 "%s\tcompiled by GNU C version %s, "
@@ -1515,11 +1560,11 @@
 msgid "options enabled: "
 msgstr "выбары ўключаны:"
 
-#: tree-vrp.c:6794
+#: tree-vrp.c:6821
 msgid "assuming signed overflow does not occur when simplifying && or || to & or |"
 msgstr ""
 
-#: tree-vrp.c:6798
+#: tree-vrp.c:6825
 msgid "assuming signed overflow does not occur when simplifying ==, != or ! to identity or ^"
 msgstr ""
 
@@ -1588,6 +1633,9 @@
 #. Inlining failed because of mismatched options or arguments.
 #: cif-code.def:81
 #, fuzzy
+#| msgid ""
+#| "\n"
+#| "Language specific options:\n"
 msgid "target specific option mismatch"
 msgstr ""
 "\n"
@@ -1595,6 +1643,7 @@
 
 #: cif-code.def:82
 #, fuzzy
+#| msgid "no arguments"
 msgid "mismatched arguments"
 msgstr "няма аргументаў"
 
@@ -1653,6 +1702,7 @@
 
 #: diagnostic.def:44
 #, fuzzy
+#| msgid "parse error"
 msgid "permerror: "
 msgstr "граматычная памылка"
 
@@ -2064,107 +2114,111 @@
 msgid "The maximum number of instructions ready to be issued to be considered by the scheduler during the first scheduling pass"
 msgstr ""
 
-#: params.def:708
+#: params.def:704
+msgid "Maximum number of active local stores in RTL dead store elimination"
+msgstr ""
+
+#: params.def:714
 msgid "The number of insns executed before prefetch is completed"
 msgstr ""
 
-#: params.def:715
+#: params.def:721
 msgid "The number of prefetches that can run at the same time"
 msgstr ""
 
-#: params.def:722
+#: params.def:728
 msgid "The size of L1 cache"
 msgstr ""
 
-#: params.def:729
+#: params.def:735
 msgid "The size of L1 cache line"
 msgstr ""
 
-#: params.def:736
+#: params.def:742
 msgid "The size of L2 cache"
 msgstr ""
 
-#: params.def:747
+#: params.def:753
 msgid "Whether to use canonical types"
 msgstr ""
 
-#: params.def:752
+#: params.def:758
 msgid "Maximum length of partial antic set when performing tree pre optimization"
 msgstr ""
 
-#: params.def:762
+#: params.def:768
 msgid "Maximum size of a SCC before SCCVN stops processing a function"
 msgstr ""
 
-#: params.def:767
+#: params.def:773
 msgid "Max loops number for regional RA"
 msgstr ""
 
-#: params.def:772
+#: params.def:778
 msgid "Max size of conflict table in MB"
 msgstr ""
 
-#: params.def:777
+#: params.def:783
 msgid "The number of registers in each class kept unused by loop invariant motion"
 msgstr ""
 
-#: params.def:785
+#: params.def:791
 msgid "The maximum ratio between array size and switch branches for a switch conversion to take place"
 msgstr ""
 
-#: params.def:793
+#: params.def:799
 msgid "size of tiles for loop blocking"
 msgstr ""
 
-#: params.def:800
+#: params.def:806
 msgid "maximum number of parameters in a SCoP"
 msgstr ""
 
-#: params.def:807
+#: params.def:813
 msgid "maximum number of basic blocks per function to be analyzed by Graphite"
 msgstr ""
 
-#: params.def:814
+#: params.def:820
 msgid "Max basic blocks number in loop for loop invariant motion"
 msgstr ""
 
-#: params.def:820
+#: params.def:826
 msgid "Maximum number of instructions in basic block to be considered for SLP vectorization"
 msgstr ""
 
-#: params.def:825
+#: params.def:831
 msgid "Min. ratio of insns to prefetches to enable prefetching for a loop with an unknown trip count"
 msgstr ""
 
-#: params.def:831
+#: params.def:837
 msgid "Min. ratio of insns to mem ops to enable prefetching in a loop"
 msgstr ""
 
-#: params.def:838
+#: params.def:844
 msgid "Max. size of var tracking hash tables"
 msgstr ""
 
-#: params.def:845
+#: params.def:851
 msgid "The minimum UID to be used for a nondebug insn"
 msgstr ""
 
-#: params.def:850
+#: params.def:856
 msgid "Maximum allowed growth of size of new parameters ipa-sra replaces a pointer to an aggregate with"
 msgstr ""
 
-#: params.def:856
+#: params.def:862
 msgid "Maximum size of a type list associated with each parameter for devirtualization"
 msgstr ""
 
-#: params.def:864
+#: params.def:870
 msgid "Number of paritions program should be split to"
 msgstr ""
 
-#: params.def:869
+#: params.def:875
 msgid "Size of minimal paritition for WHOPR (in estimated instructions)"
 msgstr ""
 
-#: params.def:876
+#: params.def:882
 msgid "Maximum number of namespaces to search for alternatives when name lookup fails"
 msgstr ""
 
@@ -2182,6 +2236,7 @@
 
 #: c-family/c-format.c:484 c-family/c-format.c:508 config/i386/msformat-c.c:49
 #, fuzzy
+#| msgid "`0' flag"
 msgid "' ' flag"
 msgstr "'0' флаг"
 
@@ -2192,6 +2247,7 @@
 #: c-family/c-format.c:485 c-family/c-format.c:509 c-family/c-format.c:543
 #: c-family/c-format.c:606 config/i386/msformat-c.c:50
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'+' flag"
 msgstr "'0' флаг"
 
@@ -2204,6 +2260,7 @@
 #: c-family/c-format.c:582 config/i386/msformat-c.c:51
 #: config/i386/msformat-c.c:86
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'#' flag"
 msgstr "'0' флаг"
 
@@ -2215,6 +2272,7 @@
 #: c-family/c-format.c:487 c-family/c-format.c:511 c-family/c-format.c:580
 #: config/i386/msformat-c.c:52
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'0' flag"
 msgstr "'0' флаг"
 
@@ -2225,6 +2283,7 @@
 #: c-family/c-format.c:488 c-family/c-format.c:512 c-family/c-format.c:579
 #: c-family/c-format.c:609 config/i386/msformat-c.c:53
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'-' flag"
 msgstr "'0' флаг"
 
@@ -2235,6 +2294,7 @@
 #: c-family/c-format.c:489 c-family/c-format.c:562 config/i386/msformat-c.c:54
 #: config/i386/msformat-c.c:74
 #, fuzzy
+#| msgid "`0' flag"
 msgid "''' flag"
 msgstr "'0' флаг"
 
@@ -2244,6 +2304,7 @@
 
 #: c-family/c-format.c:490 c-family/c-format.c:563
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'I' flag"
 msgstr "'0' флаг"
 
@@ -2285,6 +2346,7 @@
 
 #: c-family/c-format.c:545
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'q' flag"
 msgstr "'0' флаг"
 
@@ -2302,6 +2364,7 @@
 
 #: c-family/c-format.c:558 config/i386/msformat-c.c:71
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'a' flag"
 msgstr "'0' флаг"
 
@@ -2311,6 +2374,7 @@
 
 #: c-family/c-format.c:559
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'m' flag"
 msgstr "'0' флаг"
 
@@ -2336,6 +2400,7 @@
 
 #: c-family/c-format.c:578
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'_' flag"
 msgstr "'0' флаг"
 
@@ -2353,6 +2418,7 @@
 
 #: c-family/c-format.c:581 c-family/c-format.c:605
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'^' flag"
 msgstr "'0' флаг"
 
@@ -2370,6 +2436,7 @@
 
 #: c-family/c-format.c:584
 #, fuzzy
+#| msgid "`O' modifier"
 msgid "'E' modifier"
 msgstr "'O' мадыфікатар"
 
@@ -2379,6 +2446,7 @@
 
 #: c-family/c-format.c:585
 #, fuzzy
+#| msgid "`O' modifier"
 msgid "'O' modifier"
 msgstr "'O' мадыфікатар"
 
@@ -2388,6 +2456,7 @@
 
 #: c-family/c-format.c:586
 #, fuzzy
+#| msgid "`O' modifier"
 msgid "the 'O' modifier"
 msgstr "'O' мадыфікатар"
 
@@ -2409,6 +2478,7 @@
 
 #: c-family/c-format.c:607
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'(' flag"
 msgstr "'0' флаг"
 
@@ -2418,6 +2488,7 @@
 
 #: c-family/c-format.c:608
 #, fuzzy
+#| msgid "`0' flag"
 msgid "'!' flag"
 msgstr "'0' флаг"
 
@@ -2460,6 +2531,7 @@
 
 #: c-family/c-pretty-print.c:344
 #, fuzzy
+#| msgid "parse error"
 msgid "<type-error>"
 msgstr "граматычная памылка"
 
@@ -2485,6 +2557,7 @@
 
 #: c-family/c-pretty-print.c:418
 #, fuzzy
+#| msgid "syntax error"
 msgid "<tag-error>"
 msgstr "сінтаксічная памылка"
 
@@ -2494,89 +2567,90 @@
 
 #: c-family/c-pretty-print.c:1169 cp/cxx-pretty-print.c:153
 #, fuzzy
+#| msgid "return"
 msgid "<return-value>"
 msgstr "вяртанне"
 
-#: config/alpha/alpha.c:5145
+#: config/alpha/alpha.c:5138
 #, c-format
 msgid "invalid %%H value"
 msgstr "нерэчаіснае значэньне %%H"
 
-#: config/alpha/alpha.c:5166 config/bfin/bfin.c:1671
+#: config/alpha/alpha.c:5159 config/bfin/bfin.c:1656
 #, fuzzy, c-format
 msgid "invalid %%J value"
 msgstr "дрэннае %%Q значэнне"
 
-#: config/alpha/alpha.c:5196 config/ia64/ia64.c:5169
+#: config/alpha/alpha.c:5189 config/ia64/ia64.c:5162
 #, c-format
 msgid "invalid %%r value"
 msgstr "нерэчаіснае значэньне %%r"
 
-#: config/alpha/alpha.c:5206 config/ia64/ia64.c:5123
-#: config/rs6000/rs6000.c:16096 config/xtensa/xtensa.c:2356
+#: config/alpha/alpha.c:5199 config/ia64/ia64.c:5116
+#: config/rs6000/rs6000.c:16116 config/xtensa/xtensa.c:2356
 #, c-format
 msgid "invalid %%R value"
 msgstr "нерэчаіснае значэньне %%R"
 
-#: config/alpha/alpha.c:5212 config/rs6000/rs6000.c:16015
+#: config/alpha/alpha.c:5205 config/rs6000/rs6000.c:16035
 #: config/xtensa/xtensa.c:2323
 #, c-format
 msgid "invalid %%N value"
 msgstr "нерэчаіснае значэньне %%N"
 
-#: config/alpha/alpha.c:5220 config/rs6000/rs6000.c:16043
+#: config/alpha/alpha.c:5213 config/rs6000/rs6000.c:16063
 #, c-format
 msgid "invalid %%P value"
 msgstr "нерэчаіснае значэньне %%P"
 
-#: config/alpha/alpha.c:5228
+#: config/alpha/alpha.c:5221
 #, c-format
 msgid "invalid %%h value"
 msgstr "нерэчаіснае значэньне %%h"
 
-#: config/alpha/alpha.c:5236 config/xtensa/xtensa.c:2349
+#: config/alpha/alpha.c:5229 config/xtensa/xtensa.c:2349
 #, c-format
 msgid "invalid %%L value"
 msgstr "нерэчаіснае значэньне %%L"
 
-#: config/alpha/alpha.c:5275 config/rs6000/rs6000.c:15997
+#: config/alpha/alpha.c:5268 config/rs6000/rs6000.c:16017
 #, c-format
 msgid "invalid %%m value"
 msgstr "нерэчаіснае значэньне %%m"
 
-#: config/alpha/alpha.c:5283 config/rs6000/rs6000.c:16005
+#: config/alpha/alpha.c:5276 config/rs6000/rs6000.c:16025
 #, c-format
 msgid "invalid %%M value"
 msgstr "нерэчаіснае значэньне %%M"
 
-#: config/alpha/alpha.c:5327
+#: config/alpha/alpha.c:5320
 #, c-format
 msgid "invalid %%U value"
 msgstr "нерэчаіснае значэньне %%U"
 
-#: config/alpha/alpha.c:5339 config/alpha/alpha.c:5353
-#: config/rs6000/rs6000.c:16104
+#: config/alpha/alpha.c:5332 config/alpha/alpha.c:5346
+#: config/rs6000/rs6000.c:16124
 #, c-format
 msgid "invalid %%s value"
 msgstr "нерэчаіснае значэньне %%v"
 
-#: config/alpha/alpha.c:5376
+#: config/alpha/alpha.c:5369
 #, c-format
 msgid "invalid %%C value"
 msgstr "нерэчаіснае значэньне %%C"
 
-#: config/alpha/alpha.c:5413 config/rs6000/rs6000.c:15862
+#: config/alpha/alpha.c:5406 config/rs6000/rs6000.c:15882
 #, c-format
 msgid "invalid %%E value"
 msgstr "нерэчаіснае значэньне %%E"
 
-#: config/alpha/alpha.c:5438 config/alpha/alpha.c:5486
+#: config/alpha/alpha.c:5431 config/alpha/alpha.c:5479
 #, c-format
 msgid "unknown relocation unspec"
 msgstr ""
 
-#: config/alpha/alpha.c:5447 config/crx/crx.c:1119
-#: config/rs6000/rs6000.c:16470 config/spu/spu.c:1725
+#: config/alpha/alpha.c:5440 config/crx/crx.c:1119
+#: config/rs6000/rs6000.c:16490 config/spu/spu.c:1726
 #, c-format
 msgid "invalid %%xn code"
 msgstr "нерэчаіснае значэньне %%xn"
@@ -2603,7 +2677,7 @@
 
 #. Unknown flag.
 #. Undocumented flag.
-#: config/arc/arc.c:1815 config/m32r/m32r.c:2276 config/sparc/sparc.c:7633
+#: config/arc/arc.c:1815 config/m32r/m32r.c:2276 config/sparc/sparc.c:7637
 #, c-format
 msgid "invalid operand output code"
 msgstr ""
@@ -2620,6 +2694,7 @@
 
 #: config/arm/arm.c:16195
 #, fuzzy, c-format
+#| msgid "invalid %%f operand"
 msgid "invalid shift operand"
 msgstr "нерэчаісны %%f аперанд"
 
@@ -2630,9 +2705,9 @@
 #: config/arm/arm.c:16482 config/arm/arm.c:16489 config/arm/arm.c:16497
 #: config/arm/arm.c:16518 config/arm/arm.c:16525 config/arm/arm.c:16650
 #: config/arm/arm.c:16657 config/arm/arm.c:16675 config/arm/arm.c:16682
-#: config/bfin/bfin.c:1684 config/bfin/bfin.c:1691 config/bfin/bfin.c:1698
-#: config/bfin/bfin.c:1705 config/bfin/bfin.c:1714 config/bfin/bfin.c:1721
-#: config/bfin/bfin.c:1728 config/bfin/bfin.c:1735
+#: config/bfin/bfin.c:1669 config/bfin/bfin.c:1676 config/bfin/bfin.c:1683
+#: config/bfin/bfin.c:1690 config/bfin/bfin.c:1699 config/bfin/bfin.c:1706
+#: config/bfin/bfin.c:1713 config/bfin/bfin.c:1720
 #, fuzzy, c-format
 msgid "invalid operand for code '%c'"
 msgstr "Нерэчаісны выбар \"%s\""
@@ -2654,72 +2729,74 @@
 
 #: config/arm/arm.c:19134
 #, fuzzy
+#| msgid "function does not return string type"
 msgid "functions cannot return __fp16 type"
 msgstr "функцыя не вяртае тып string"
 
-#: config/avr/avr.c:1165
+#: config/avr/avr.c:1222
 #, c-format
 msgid "address operand requires constraint for X, Y, or Z register"
 msgstr ""