Merge commit '9fc0ae6033f3e41c9b4605531a6a8543414b0d2d' into HEAD

diff --cc gcc/configure
index 420d108b9ed2589f9eb8edf640015a878439d823,e5e95e7c1c82caba9dd1c269eeb371a5b03eb273..4933965bdce8c553112f892df4bff444b495ab8b
--- 1/gcc/configure
--- 2/gcc/configure
+++ b/gcc/configure
@@@ -19902,7 -19886,7 +19900,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19905 "configure"
 -#line 19889 "configure"
++#line 19903 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -20008,7 -19992,7 +20006,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 20011 "configure"
 -#line 19995 "configure"
++#line 20009 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H