Merging a GCC bug fix to RELENG_7 - how?

[Bruce Simpson]

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