Merge commit 'bc45e18d433f879a02e369d027829f90f9e85724^' into HEAD

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc gcc/Makefile.in
Simple merge

diff --cc gcc/config.gcc
Simple merge

diff --cc gcc/configure
Simple merge

diff --cc gcc/configure.ac
Simple merge

diff --cc gcc/doc/tm.texi
Simple merge

diff --cc gcc/doc/tm.texi.in
Simple merge

diff --cc libgm2/Makefile.in
Simple merge

diff --cc libgm2/libm2cor/Makefile.in
Simple merge

diff --cc libgm2/libm2iso/Makefile.in
Simple merge

diff --cc libgm2/libm2log/Makefile.in
Simple merge

diff --cc libgm2/libm2min/Makefile.in
Simple merge

diff --cc libgm2/libm2pim/Makefile.in
Simple merge