Merge commit 'ce7a757fd9ecb99c4f54cfde5cf5ef9a9e7819fc' into HEAD

diff --cc gcc/configure
index 53a32373a188170027f8e0b0076be35abe249bf7,1615927354909de236e7398d829a47007ae96b84..ee0a12a5378c452894e64616e0dd78f6b1e7603e
--- 1/gcc/configure
--- 2/gcc/configure
+++ b/gcc/configure
@@@ -19900,7 -19909,7 +19923,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 19903 "configure"
 -#line 19912 "configure"
++#line 19926 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -20006,7 -20015,7 +20029,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 20009 "configure"
 -#line 20018 "configure"
++#line 20032 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H

diff --cc gcc/configure.ac
Simple merge