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

Proposed by Andrew Stubbs
Status: Merged
Approved by: Andrew Stubbs
Approved revision: not available
Merge reported by: Andrew Stubbs
Merged at revision: not available
Proposed branch: lp:~ams-codesourcery/gcc-linaro/merge-from-fsf-4.6-20111201
Merge into: lp:gcc-linaro/4.6
To merge this branch: bzr merge lp:~ams-codesourcery/gcc-linaro/merge-from-fsf-4.6-20111201
Reviewer Review Type Date Requested Status
Andrew Stubbs (community) Approve
Review via email: mp+84127@code.launchpad.net

Description of the change

Merge from FSF GCC 4.6.2 (svn branches/gcc-4_6-branch 181866)

To post a comment you must log in.
Revision history for this message
Michael Hope (michaelh1) wrote :

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

The diff against the ancestor r106845 is available at:
 http://builds.linaro.org/toolchain/snapshots/gcc-linaro-4.6+bzr106846~ams-codesourcery~merge-from-fsf-4.6-20111201.diff

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

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

cbuild-snapshot: gcc-linaro-4.6+bzr106846~ams-codesourcery~merge-from-fsf-4.6-20111201
cbuild-ancestor: lp:gcc-linaro+bzr106845
cbuild-state: check

Revision history for this message
Michael Hope (michaelh1) wrote :
Download full text (4.6 KiB)

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

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106846~ams-codesourcery~merge-from-fsf-4.6-20111201/logs/x86_64-natty-cbuild211-oort1-x86_64r1

+PASS: g++.dg/cpp0x/decltype35.C (test for excess errors)
+PASS: g++.dg/cpp0x/decltype36.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr50901.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 15)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 17)
+PASS: g++.dg/cpp0x/pr51150.C (test for excess errors)
+PASS: g++.dg/other/offsetof7.C (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -Os (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-loops (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -Os (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c scan-assembler printf
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O3 -fomit-frame-pointer execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O3 -fomit-frame-pointer scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1....

Read more...

Revision history for this message
Michael Hope (michaelh1) wrote :
Download full text (4.5 KiB)

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

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106846~ams-codesourcery~merge-from-fsf-4.6-20111201/logs/i686-natty-cbuild211-oort2-i686r1

+PASS: g++.dg/cpp0x/decltype35.C (test for excess errors)
+PASS: g++.dg/cpp0x/decltype36.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr50901.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 15)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 17)
+PASS: g++.dg/cpp0x/pr51150.C (test for excess errors)
+PASS: g++.dg/other/offsetof7.C (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -Os (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-loops (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -Os (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c scan-assembler printf
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O3 -fomit-frame-pointer execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O3 -fomit-frame-pointer scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O3...

Read more...

Revision history for this message
Michael Hope (michaelh1) wrote :
Download full text (4.5 KiB)

cbuild successfully built this on armv7l-natty-cbuild212-tcpanda02-cortexa9r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106846~ams-codesourcery~merge-from-fsf-4.6-20111201/logs/armv7l-natty-cbuild212-tcpanda02-cortexa9r1

+PASS: g++.dg/cpp0x/decltype35.C (test for excess errors)
+PASS: g++.dg/cpp0x/decltype36.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr50901.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 15)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 17)
+PASS: g++.dg/cpp0x/pr51150.C (test for excess errors)
+PASS: g++.dg/other/offsetof7.C (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -Os (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-loops (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -Os (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c scan-assembler printf
-PASS: gcc.target/arm/headmerge-2.c scan-assembler-times 120 1
+FAIL: gcc.target/arm/headmerge-2.c scan-assembler-times 120 1
+UNSUPPORTED: gcc.target/arm/pr49641.c
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gfortran.dg/implicit_pu...

Read more...

Revision history for this message
Michael Hope (michaelh1) wrote :
Download full text (4.5 KiB)

cbuild successfully built this on armv7l-natty-cbuild212-tcpanda02-armv5r2.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106846~ams-codesourcery~merge-from-fsf-4.6-20111201/logs/armv7l-natty-cbuild212-tcpanda02-armv5r2

+PASS: g++.dg/cpp0x/decltype35.C (test for excess errors)
+PASS: g++.dg/cpp0x/decltype36.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr50901.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 15)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 17)
+PASS: g++.dg/cpp0x/pr51150.C (test for excess errors)
+PASS: g++.dg/other/offsetof7.C (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -Os (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-loops (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -Os (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c scan-assembler printf
-PASS: gcc.target/arm/headmerge-2.c scan-assembler-times 120 1
+FAIL: gcc.target/arm/headmerge-2.c scan-assembler-times 120 1
+PASS: gcc.target/arm/pr49641.c (test for excess errors)
+PASS: gcc.target/arm/pr49641.c scan-assembler-not stmia[\\t ]*r3![^\\n]*r3
-WARNING: program timed out.
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 scan-module IMPLICIT_PURE
+PA...

Read more...

Revision history for this message
Michael Hope (michaelh1) wrote :
Download full text (4.5 KiB)

cbuild successfully built this on armv7l-natty-cbuild212-tcpanda02-armv5r2.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106846~ams-codesourcery~merge-from-fsf-4.6-20111201/logs/armv7l-natty-cbuild212-tcpanda02-armv5r2

+PASS: g++.dg/cpp0x/decltype35.C (test for excess errors)
+PASS: g++.dg/cpp0x/decltype36.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr50901.C (test for excess errors)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 15)
+PASS: g++.dg/cpp0x/pr51150.C (test for errors, line 17)
+PASS: g++.dg/cpp0x/pr51150.C (test for excess errors)
+PASS: g++.dg/other/offsetof7.C (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/20110913-1.c -Os (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O0 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O1 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O2 -flto -flto-partition=none (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -fomit-frame-pointer -funroll-loops (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -O3 -g (test for excess errors)
+PASS: gcc.c-torture/compile/pr51077.c -Os (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c (test for excess errors)
+PASS: gcc.dg/delay-slot-2.c scan-assembler printf
-PASS: gcc.target/arm/headmerge-2.c scan-assembler-times 120 1
+FAIL: gcc.target/arm/headmerge-2.c scan-assembler-times 120 1
+PASS: gcc.target/arm/pr49641.c (test for excess errors)
+PASS: gcc.target/arm/pr49641.c scan-assembler-not stmia[\\t ]*r3![^\\n]*r3
-WARNING: program timed out.
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O0 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O1 scan-module IMPLICIT_PURE
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 (test for excess errors)
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 execution test
+PASS: gfortran.dg/implicit_pure_1.f90 -O2 scan-module IMPLICIT_PURE
+PA...

Read more...

Revision history for this message
Andrew Stubbs (ams-codesourcery) wrote :

From above:

-PASS: gcc.target/arm/headmerge-2.c scan-assembler-times 120 1
+FAIL: gcc.target/arm/headmerge-2.c scan-assembler-times 120 1

This failure is because the compiler version string, "GCC: (Linaro GCC 4.6-2011.11-1~dev) 4.6.3 20111201 (prerelease)", happens to contain "120".

This is not a problem. Otherwise, all seems well, so I'm going to apply the merge.

review: Approve

Subscribers

People subscribed via source and target branches