Merge commit 'b4fddbe9592e9feb37ce567d90af822b75995531' into HEAD

diff --cc Makefile.def
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
index 85181bcbcdced5f99b36f0f950775f86e260367c,6af7dbd06b0beb0c725bad9f5394f9336111df07..5e10b50d916d6b40a78701ded23e4c6b2a7955f2
--- 1/gcc/configure
--- 2/gcc/configure
+++ b/gcc/configure
@@@ -19734,7 -19712,7 +19726,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19737 "configure"
 -#line 19715 "configure"
++#line 19729 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -19840,7 -19818,7 +19832,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19843 "configure"
 -#line 19821 "configure"
++#line 19835 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H

diff --cc gcc/configure.ac
Simple merge

diff --cc gcc/diagnostic.cc
Simple merge

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

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