Merge commit '33ebb0dff9bb022f1e0709e0e73faabfc3df7931' into HEAD

diff --cc gcc/configure
index 8703c4246f91396dfd06e64a2824db36f6ec3c1b,496da71060b2066a8e8ae546ced995e6fe74b1bd..12180193398926554b2cb8109dd743ff0cf04e8d
--- 1/gcc/configure
--- 2/gcc/configure
+++ b/gcc/configure
@@@ -19861,7 -19850,7 +19864,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19864 "configure"
 -#line 19853 "configure"
++#line 19867 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -19967,7 -19956,7 +19970,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19970 "configure"
 -#line 19959 "configure"
++#line 19973 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H

diff --cc gcc/configure.ac
Simple merge