Merge commit 'b1c06fd9723453dd2b2ec306684cb806dc2b4fbb^' into HEAD

diff --cc gcc/configure
Simple merge

diff --cc gcc/configure.ac
Simple merge

diff --cc libcpp/include/cpplib.h
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