Backport to 4.2

[Tobias Schlüter]

François-Xavier Coudert wrote:
> Hi all,
> 
> I just commited the attached (big) backport to 4.2

Including the merge markers? :-)  Anyway, thanks for doing this.

- Tobi

> ------------------------------------------------------------------------
> 
> Index: gcc/testsuite/ChangeLog
> ===================================================================
> --- gcc/testsuite/ChangeLog	(revision 122038)
> +++ gcc/testsuite/ChangeLog	(working copy)
> +<<<<<<< .working
...> +=======

> +>>>>>>> .merge-right.r121773