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

Proposed by Andrew Stubbs
Status: Merged
Approved by: Ulrich Weigand
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-20111003
Merge into: lp:gcc-linaro/4.6
To merge this branch: bzr merge lp:~ams-codesourcery/gcc-linaro/merge-from-fsf-4.6-20111003
Reviewer Review Type Date Requested Status
Ulrich Weigand (community) Approve
Andrew Stubbs Pending
Michael Hope Pending
Review via email: mp+78068@code.launchpad.net

This proposal supersedes a proposal from 2011-10-03.

Description of the change

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

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

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

The diff against the ancestor r106816 is available at:
 http://builds.linaro.org/toolchain/snapshots/gcc-linaro-4.6+bzr106817~ams-codesourcery~merge-from-fsf-4.6-20111003.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+bzr106817~ams-codesourcery~merge-from-fsf-4.6-20111003
cbuild-ancestor: lp:gcc-linaro+bzr106816
cbuild-state: check

Revision history for this message
Michael Hope (michaelh1) wrote : Posted in a previous version of this proposal
Revision history for this message
Michael Hope (michaelh1) wrote : Posted in a previous version of this proposal

There's something strange here. The diff is empty except the ChangeLog entry:
 http://ex.seabright.co.nz/snapshots/gcc-linaro-4.6+bzr106817~ams-codesourcery~merge-from-fsf-4.6-20111003.diff

...and the test results are unchanged which is suspicious.

review: Needs Information
Revision history for this message
Michael Hope (michaelh1) wrote : Posted in a previous version of this proposal
Revision history for this message
Andrew Stubbs (ams-codesourcery) wrote : Posted in a previous version of this proposal

> There's something strange here. The diff is empty except the ChangeLog entry:
> http://ex.seabright.co.nz/snapshots/gcc-linaro-4.6+bzr106817~ams-codesourcery
> ~merge-from-fsf-4.6-20111003.diff
>
> ...and the test results are unchanged which is suspicious.

There's clearly some BZR silliness going on here. Let me try that again ....

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

Yeah, somehow the merge was rejected and since I wasn't expecting it to fail I just push it anyway. Oh well,fixed now .... I think.

Revision history for this message
Michael Hope (michaelh1) wrote :

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

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

and will be built on the following builders:

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

cbuild-snapshot: gcc-linaro-4.6+bzr106817~ams-codesourcery~merge-from-fsf-4.6-20111003
cbuild-ancestor: lp:gcc-linaro+bzr106816
cbuild-state: check

Revision history for this message
Michael Hope (michaelh1) wrote : Posted in a previous version of this proposal
Revision history for this message
Michael Hope (michaelh1) wrote :

Ah, the same revno as before so the cbuild reused the previous snapshot.

Nuked and bumped.

cbuild-state: queue

Revision history for this message
Michael Hope (michaelh1) wrote :

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

The diff against the ancestor r106816 is available at:
 http://builds.linaro.org/toolchain/snapshots/gcc-linaro-4.6+bzr106817~ams-codesourcery~merge-from-fsf-4.6-20111003.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+bzr106817~ams-codesourcery~merge-from-fsf-4.6-20111003
cbuild-ancestor: lp:gcc-linaro+bzr106816
cbuild-state: check

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

cbuild successfully built this on armv7l-natty-cbuild186-ursa3-armv5r2.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106817~ams-codesourcery~merge-from-fsf-4.6-20111003/logs/armv7l-natty-cbuild186-ursa3-armv5r2

+PASS: g++.dg/cpp0x/constexpr-typedef1.C (test for excess errors)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 23)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 27)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 32)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 38)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 24)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 28)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 33)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 39)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 44)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 45)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 57)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 63)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 58)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 66)
-PASS: g++.dg/cpp0x/defaulted2.C (test for warnings, line 20)
+PASS: g++.dg/cpp0x/defaulted2.C (test for warnings, line 21)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 34)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 35)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 36)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 37)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 15)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 17)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 20)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 38)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 39)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 40)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 41)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 16)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 19)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 26)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 25)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 33)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 7)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 8)
+PASS: g++.dg/cpp0x/pr50491.C (test for excess errors)
-PASS: g++.dg/cpp0x/rv-conv1.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic116.C (test for excess errors)
+PASS: g++.dg/eh/defarg1.C (test for excess errors)
+PASS: g++.dg/eh/defarg1.C execution test
+PASS: g++.dg/init/const8.C (test for excess errors)
+UNSUPPORTED: g++.dg/other/pr50464.C
+PASS: g++.dg/template/partial12.C (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 -flto -flto-partition=none (test for ex...

Read more...

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

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

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106817~ams-codesourcery~merge-from-fsf-4.6-20111003/logs/armv7l-natty-cbuild186-ursa4-cortexa9r1

+PASS: g++.dg/cpp0x/constexpr-typedef1.C (test for excess errors)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 23)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 27)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 32)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 38)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 24)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 28)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 33)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 39)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 44)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 45)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 57)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 63)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 58)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 66)
-PASS: g++.dg/cpp0x/defaulted2.C (test for warnings, line 20)
+PASS: g++.dg/cpp0x/defaulted2.C (test for warnings, line 21)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 34)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 35)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 36)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 37)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 15)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 17)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 20)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 38)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 39)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 40)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 41)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 16)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 19)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 26)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 25)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 33)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 7)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 8)
+PASS: g++.dg/cpp0x/pr50491.C (test for excess errors)
-PASS: g++.dg/cpp0x/rv-conv1.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic116.C (test for excess errors)
+PASS: g++.dg/eh/defarg1.C (test for excess errors)
+PASS: g++.dg/eh/defarg1.C execution test
+PASS: g++.dg/init/const8.C (test for excess errors)
+UNSUPPORTED: g++.dg/other/pr50464.C
+PASS: g++.dg/template/partial12.C (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 -flto -flto-partition=none (test ...

Read more...

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

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

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

+PASS: g++.dg/cpp0x/constexpr-typedef1.C (test for excess errors)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 23)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 27)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 32)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 38)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 24)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 28)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 33)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 39)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 44)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 45)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 57)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 63)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 58)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 66)
-PASS: g++.dg/cpp0x/defaulted2.C (test for warnings, line 20)
+PASS: g++.dg/cpp0x/defaulted2.C (test for warnings, line 21)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 34)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 35)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 36)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 37)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 15)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 17)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 20)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 38)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 39)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 40)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 41)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 16)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 19)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 26)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 25)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 33)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 7)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 8)
+PASS: g++.dg/cpp0x/pr50491.C (test for excess errors)
-PASS: g++.dg/cpp0x/rv-conv1.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic116.C (test for excess errors)
+PASS: g++.dg/eh/defarg1.C (test for excess errors)
+PASS: g++.dg/eh/defarg1.C execution test
+PASS: g++.dg/init/const8.C (test for excess errors)
+PASS: g++.dg/other/pr50464.C (test for excess errors)
+PASS: g++.dg/template/partial12.C (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 -flto -flto-partitio...

Read more...

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

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

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

+PASS: g++.dg/cpp0x/constexpr-typedef1.C (test for excess errors)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 23)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 27)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 32)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 38)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 24)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 28)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 33)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 39)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 44)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 45)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 57)
-PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 63)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 58)
+PASS: g++.dg/cpp0x/defaulted2.C (test for errors, line 66)
-PASS: g++.dg/cpp0x/defaulted2.C (test for warnings, line 20)
+PASS: g++.dg/cpp0x/defaulted2.C (test for warnings, line 21)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 34)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 35)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 36)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 37)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 15)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 17)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 20)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 38)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 39)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 40)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for errors, line 41)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 16)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 19)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 26)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 25)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 33)
-PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 7)
+PASS: g++.dg/cpp0x/pr42844-2.C (test for warnings, line 8)
+PASS: g++.dg/cpp0x/pr50491.C (test for excess errors)
-PASS: g++.dg/cpp0x/rv-conv1.C (test for excess errors)
+PASS: g++.dg/cpp0x/variadic116.C (test for excess errors)
+PASS: g++.dg/eh/defarg1.C (test for excess errors)
+PASS: g++.dg/eh/defarg1.C execution test
+PASS: g++.dg/init/const8.C (test for excess errors)
+PASS: g++.dg/other/pr50464.C (test for excess errors)
+PASS: g++.dg/template/partial12.C (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O0 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O1 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 -flto (test for excess errors)
+PASS: g++.dg/torture/pr49628.C -O2 -flto -flto-partition=none ...

Read more...

Revision history for this message
Michael Hope (michaelh1) wrote :

I've had a read of the diffs.

For ARMv5: all are a change in testsuite, PASSes, XPASSes, or UNSUPPORTED.

For Cortex-A9: all are a change in testsuite, PASSes, XPASSes, or UNSUPPORTED.

For i686: all are a change in testsuite, PASSes, XPASSes, or UNSUPPORTED.

For x86_64: all are a change in testsuite, PASSes, XPASSes, or UNSUPPORTED.

The change in results are OK.

Revision history for this message
Ulrich Weigand (uweigand) wrote :

This is OK.

review: Approve

Subscribers

People subscribed via source and target branches