Merge commit '0a85544e1aaeca41133ecfc438cda913dbc0f122^' into HEAD

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
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