svn merge -r 218679:218997 svn+ssh://gcc.gnu.org/svn/gcc/trunk