Merge commit 'ea1cd66f2200839d46a8b4dc140d18c00b849c82' into HEAD

diff --cc gcc/configure
index 3f6ae7aa2af0a5600dbf8e40f161188a80c3f853,f7b4b283ca2ff04e2cff41be13f0c7b97051d00a..21703a71f0a034efaaa43f18a4c4d2cde62878a2
--- 1/gcc/configure
--- 2/gcc/configure
+++ b/gcc/configure
@@@ -19861,7 -19847,7 +19861,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19862 "configure"
 -#line 19850 "configure"
++#line 19864 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -19967,7 -19953,7 +19967,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19968 "configure"
 -#line 19956 "configure"
++#line 19970 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H