freebsd stable - Jul 2009 - Merging a GCC bug fix to RELENG_7 - how?

Hi all,

This GCC bug bites us in the Boost regression tests in a number of places.

Uh oh, I've stepped on the one-line fix bomb:
    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31899
    http://gcc.gnu.org/viewcvs?view=rev&revision=129199

What's funny is that COPYING in the root of that branch is GPLv2, but 
the affected file's license is GPLv3.

So what on earth do we do?

thanks,
BMS

On Mon, Jul 06, 2009 at 03:30:01PM +0100, Bruce Simpson
wrote:
> Hi all,
> 
> This GCC bug bites us in the Boost regression tests in a number of places.
> 
> Uh oh, I've stepped on the one-line fix bomb:
>    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31899
>    http://gcc.gnu.org/viewcvs?view=rev&revision=129199
> 
> What's funny is that COPYING in the root of that branch is GPLv2, but 
> the affected file's license is GPLv3.
> 
> So what on earth do we do?
the whole change is one line

-    gcc_unreachable ();
+    return *tp;

and according to the dates bugzilla and the repository,
when the patch was submitted the file was still marked as GPLv2.

So I would think that taking the v2 file and the v2 patch
still makes a v2 file, doesn't it ?

cheers
luigi