merge 3.4 (#21121)

diff --cc Makefile.pre.in
Simple merge

diff --cc Misc/NEWS
index f43ee98156b1015df3b534f79d714d2ea342ca6f,a1d55c035816f0de179c344e11b902c3e804c645..a6fa6764965641017dc33806b6b7f330ae3843e6
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -115,12 -27,9 +115,15 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #22176: Update the ctypes module's libffi to v3.1.  This release
 +  adds support for the Linux AArch64 and POWERPC ELF ABIv2 little endian
 +  architectures.
 +
 +- Issue #5411: Added support for the "xztar" format in the shutil module.
 +
+ - Issue #21121: Don't force 3rd party C extensions to be built with
+   -Werror=declaration-after-statement.
+ 
  - Issue #21975: Fixed crash when using uninitialized sqlite3.Row (in particular
    when unpickling pickled sqlite3.Row).  sqlite3.Row is now initialized in the
    __new__() method.

diff --cc configure
index 28fcd077e2940a279468294a390afeb0478fe4fe,73792038507c8112fd26decfb554f4ef71ecffe1..c5ad543c6ed5a8b48cf0f2df6f7db417c4f533b5
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -6507,97 -6454,9 +6509,97 @@@ $as_echo "$ac_cv_declaration_after_stat
  
      if test $ac_cv_declaration_after_statement_warning = yes
      then
-       BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
+       CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
      fi
  
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC mixed sign comparison warning" >&5
 +$as_echo_n "checking if we can turn on $CC mixed sign comparison warning... " >&6; }
 +     ac_save_cc="$CC"
 +     CC="$CC -Wsign-compare"
 +     save_CFLAGS="$CFLAGS"
 +     if ${ac_cv_enable_sign_compare_warning+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +
 +           ac_cv_enable_sign_compare_warning=yes
 +
 +else
 +
 +           ac_cv_enable_sign_compare_warning=no
 +
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
 +     CFLAGS="$save_CFLAGS"
 +     CC="$ac_save_cc"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5
 +$as_echo "$ac_cv_enable_sign_compare_warning" >&6; }
 +
 +    if test $ac_cv_enable_sign_compare_warning = yes
 +    then
 +      BASECFLAGS="$BASECFLAGS -Wsign-compare"
 +    fi
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC unreachable code warning" >&5
 +$as_echo_n "checking if we can turn on $CC unreachable code warning... " >&6; }
 +     ac_save_cc="$CC"
 +     CC="$CC -Wunreachable-code"
 +     save_CFLAGS="$CFLAGS"
 +     if ${ac_cv_enable_unreachable_code_warning+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +
 +           ac_cv_enable_unreachable_code_warning=yes
 +
 +else
 +
 +           ac_cv_enable_unreachable_code_warning=no
 +
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
 +     CFLAGS="$save_CFLAGS"
 +     CC="$ac_save_cc"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5
 +$as_echo "$ac_cv_enable_unreachable_code_warning" >&6; }
 +
 +    # Don't enable unreachable code warning in debug mode, since it usually
 +    # results in non-standard code paths.
 +    if test $ac_cv_enable_unreachable_code_warning = yes && test "$Py_DEBUG" != "true"
 +    then
 +      BASECFLAGS="$BASECFLAGS -Wunreachable-code"
 +    fi
 +
      # if using gcc on alpha, use -mieee to get (near) full IEEE 754
      # support.  Without this, treatment of subnormals doesn't follow
      # the standard.

diff --cc configure.ac
index f39698469780d3208d422b3a18e12f63dfa241f0,418e16ffa5d517364a2782fbae712e34200b5cac..193c99cd7f7c0440415793e05daee023d5c01616
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1231,55 -1223,9 +1232,55 @@@ yes
  
      if test $ac_cv_declaration_after_statement_warning = yes
      then
-       BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
+       CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
      fi
  
 +    AC_MSG_CHECKING(if we can turn on $CC mixed sign comparison warning)
 +     ac_save_cc="$CC"
 +     CC="$CC -Wsign-compare"
 +     save_CFLAGS="$CFLAGS"
 +     AC_CACHE_VAL(ac_cv_enable_sign_compare_warning,
 +       AC_COMPILE_IFELSE(
 +         [
 +         AC_LANG_PROGRAM([[]], [[]])
 +       ],[
 +           ac_cv_enable_sign_compare_warning=yes
 +       ],[
 +           ac_cv_enable_sign_compare_warning=no
 +       ]))
 +     CFLAGS="$save_CFLAGS"
 +     CC="$ac_save_cc"
 +    AC_MSG_RESULT($ac_cv_enable_sign_compare_warning)
 +
 +    if test $ac_cv_enable_sign_compare_warning = yes
 +    then
 +      BASECFLAGS="$BASECFLAGS -Wsign-compare"
 +    fi
 +
 +    AC_MSG_CHECKING(if we can turn on $CC unreachable code warning)
 +     ac_save_cc="$CC"
 +     CC="$CC -Wunreachable-code"
 +     save_CFLAGS="$CFLAGS"
 +     AC_CACHE_VAL(ac_cv_enable_unreachable_code_warning,
 +       AC_COMPILE_IFELSE(
 +         [
 +         AC_LANG_PROGRAM([[]], [[]])
 +       ],[
 +           ac_cv_enable_unreachable_code_warning=yes
 +       ],[
 +           ac_cv_enable_unreachable_code_warning=no
 +       ]))
 +     CFLAGS="$save_CFLAGS"
 +     CC="$ac_save_cc"
 +    AC_MSG_RESULT($ac_cv_enable_unreachable_code_warning)
 +
 +    # Don't enable unreachable code warning in debug mode, since it usually
 +    # results in non-standard code paths.
 +    if test $ac_cv_enable_unreachable_code_warning = yes && test "$Py_DEBUG" != "true"
 +    then
 +      BASECFLAGS="$BASECFLAGS -Wunreachable-code"
 +    fi
 +
      # if using gcc on alpha, use -mieee to get (near) full IEEE 754
      # support.  Without this, treatment of subnormals doesn't follow
      # the standard.

diff --cc setup.py
Simple merge