Merge commit 'b0edfa0ef02c0f4820cec0601a4fd85aba516428^' into HEAD

diff --cc gcc/Makefile.in
Simple merge

diff --cc gcc/config.gcc
Simple merge

diff --cc gcc/config/t-darwin
Simple merge

diff --cc gcc/config/t-dragonfly
Simple merge

diff --cc gcc/config/t-freebsd
Simple merge

diff --cc gcc/config/t-linux
Simple merge

diff --cc gcc/config/t-netbsd
Simple merge

diff --cc gcc/config/t-sol2
Simple merge

diff --cc gcc/config/t-vxworks
Simple merge

diff --cc gcc/config/t-winnt
Simple merge

diff --cc gcc/configure
Simple merge

diff --cc gcc/configure.ac
Simple merge

diff --cc gcc/diagnostic-core.h
Simple merge

diff --cc gcc/diagnostic.cc
Simple merge

diff --cc gcc/genhooks.cc
Simple merge