Merge commit 'bc45e18d433f879a02e369d027829f90f9e85724' into HEAD

diff --cc gcc/configure
index af3f8bac32c8a5643dd18f467340819280634bfa,3aa2534f4d4aa4136e9aaf5de51b8e6b67c48d5a..f0f226cb5b03d00c579a9f6a418a0b1f84b53fc1
--- 1/gcc/configure
--- 2/gcc/configure
+++ b/gcc/configure
@@@ -19864,7 -19845,7 +19859,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19867 "configure"
 -#line 19848 "configure"
++#line 19862 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -19970,7 -19951,7 +19965,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19973 "configure"
 -#line 19954 "configure"
++#line 19968 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H

diff --cc gcc/configure.ac
Simple merge