Merge commit '9cf9f3c7629d768d940d9f87cddcd616bb0449e0^' into HEAD

diff --cc gcc/configure
index 5e10b50d916d6b40a78701ded23e4c6b2a7955f2,61b3cedbe693ea02692590aa39bbd5bfe3e0fe91..e702a5c078380a2c0ea5d033aaacee774bf00779
--- 1/gcc/configure
--- 2/gcc/configure
+++ b/gcc/configure
@@@ -19726,7 -19792,7 +19806,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19729 "configure"
 -#line 19795 "configure"
++#line 19809 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -19832,7 -19898,7 +19912,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19835 "configure"
 -#line 19901 "configure"
++#line 19915 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H

diff --cc gcc/configure.ac
Simple merge