update to 3.9.7

1 files changed, 161 insertions, 0 deletions

diff --git a/0097-distutils-get-compilers-from-env-vars.patch b/0097-distutils-get-compilers-from-env-vars.patch
new file mode 100644
index 000000000000..7b6ecc4267eb
--- /dev/null
+++ b/0097-distutils-get-compilers-from-env-vars.patch
@@ -0,0 +1,161 @@
+From b1f1cbeefcc5ed956ee484cd96008d5d37eb7db2 Mon Sep 17 00:00:00 2001
+From: Long Nguyen <nguyen.long.908132@gmail.com>
+Date: Tue, 17 Aug 2021 20:26:05 +0700
+Subject: [PATCH 097/N] distutils: get compilers from env vars
+
+Upstreamed at https://github.com/pypa/distutils/pull/26
+
+This would allow us to bypass all gcc workarounds when we're using clang
+---
+ Lib/distutils/cygwinccompiler.py | 91 ++++++++++++++++++--------------
+ 1 file changed, 51 insertions(+), 40 deletions(-)
+
+diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
+index c134525..75bc17b 100644
+--- a/Lib/distutils/cygwinccompiler.py
++++ b/Lib/distutils/cygwinccompiler.py
+@@ -44,6 +44,8 @@ cygwin in no-cygwin mode).
+ #   (ld supports -shared)
+ # * mingw gcc 3.2/ld 2.13 works
+ #   (ld supports -shared)
++# * llvm-mingw with Clang 11 works
++#   (lld supports -shared)
+ 
+ import os
+ import sys
+@@ -110,41 +112,46 @@ class CygwinCCompiler(UnixCCompiler):
+                 "Compiling may fail because of undefined preprocessor macros."
+                 % details)
+ 
+-        self.gcc_version, self.ld_version, self.dllwrap_version = \
+-            get_versions()
+-        self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
+-                         (self.gcc_version,
+-                          self.ld_version,
+-                          self.dllwrap_version) )
+-
+-        # ld_version >= "2.10.90" and < "2.13" should also be able to use
+-        # gcc -mdll instead of dllwrap
+-        # Older dllwraps had own version numbers, newer ones use the
+-        # same as the rest of binutils ( also ld )
+-        # dllwrap 2.10.90 is buggy
+-        if self.ld_version >= "2.10.90":
+-            self.linker_dll = "gcc"
+-        else:
+-            self.linker_dll = "dllwrap"
++        self.cc = os.environ.get('CC', 'gcc')
++        self.cxx = os.environ.get('CXX', 'g++')
++
++        if ('gcc' in self.cc): # Start gcc workaround
++            self.gcc_version, self.ld_version, self.dllwrap_version = \
++                get_versions()
++            self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
++                             (self.gcc_version,
++                              self.ld_version,
++                              self.dllwrap_version) )
++
++            # ld_version >= "2.10.90" and < "2.13" should also be able to use
++            # gcc -mdll instead of dllwrap
++            # Older dllwraps had own version numbers, newer ones use the
++            # same as the rest of binutils ( also ld )
++            # dllwrap 2.10.90 is buggy
++            if self.ld_version >= "2.10.90":
++                self.linker_dll = self.cc
++            else:
++                self.linker_dll = "dllwrap"
+ 
+-        # ld_version >= "2.13" support -shared so use it instead of
+-        # -mdll -static
+-        if self.ld_version >= "2.13":
++            # ld_version >= "2.13" support -shared so use it instead of
++            # -mdll -static
++            if self.ld_version >= "2.13":
++                shared_option = "-shared"
++            else:
++                shared_option = "-mdll -static"
++        else: # Assume linker is up to date
++            self.linker_dll = self.cc
+             shared_option = "-shared"
+-        else:
+-            shared_option = "-mdll -static"
+ 
+-        # Hard-code GCC because that's what this is all about.
+-        # XXX optimization, warnings etc. should be customizable.
+-        self.set_executables(compiler='gcc -mcygwin -O -Wall',
+-                             compiler_so='gcc -mcygwin -mdll -O -Wall',
+-                             compiler_cxx='g++ -mcygwin -O -Wall',
+-                             linker_exe='gcc -mcygwin',
++        self.set_executables(compiler='%s -mcygwin -O -Wall' % self.cc,
++                             compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc,
++                             compiler_cxx='%s -mcygwin -O -Wall' % self.cxx,
++                             linker_exe='%s -mcygwin' % self.cc,
+                              linker_so=('%s -mcygwin %s' %
+                                         (self.linker_dll, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+-        if self.gcc_version == "2.91.57":
++        if ('gcc' in self.cc and self.gcc_version == "2.91.57"):
+             # cygwin shouldn't need msvcrt, but without the dlls will crash
+             # (gcc version 2.91.57) -- perhaps something about initialization
+             self.dll_libraries=["msvcrt"]
+@@ -287,26 +294,26 @@ class Mingw32CCompiler(CygwinCCompiler):
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+-        if self.ld_version >= "2.13":
+-            shared_option = "-shared"
+-        else:
++        if ('gcc' in self.cc and self.ld_version < "2.13"):
+             shared_option = "-mdll -static"
++        else:
++            shared_option = "-shared"
+ 
+         # A real mingw32 doesn't need to specify a different entry point,
+         # but cygwin 2.91.57 in no-cygwin-mode needs it.
+-        if self.gcc_version <= "2.91.57":
++        if ('gcc' in self.cc and self.gcc_version <= "2.91.57"):
+             entry_point = '--entry _DllMain@12'
+         else:
+             entry_point = ''
+ 
+-        if is_cygwingcc():
++        if is_cygwincc(self.cc):
+             raise CCompilerError(
+                 'Cygwin gcc cannot be used with --compiler=mingw32')
+ 
+-        self.set_executables(compiler='gcc -O2 -Wall',
+-                             compiler_so='gcc -mdll -O2 -Wall',
+-                             compiler_cxx='g++ -O2 -Wall',
+-                             linker_exe='gcc',
++        self.set_executables(compiler='%s -O2 -Wall' % self.cc,
++                             compiler_so='%s -mdll -O2 -Wall' % self.cc,
++                             compiler_cxx='%s -O2 -Wall' % self.cxx,
++                             linker_exe='%s' % self.cc,
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
+                                            entry_point))
+@@ -357,6 +364,10 @@ def check_config_h():
+     if "GCC" in sys.version:
+         return CONFIG_H_OK, "sys.version mentions 'GCC'"
+ 
++    # Clang would also work
++    if "Clang" in sys.version:
++        return CONFIG_H_OK, "sys.version mentions 'Clang'"
++
+     # let's see if __GNUC__ is mentioned in python.h
+     fn = sysconfig.get_config_h_filename()
+     try:
+@@ -413,7 +424,7 @@ def get_versions():
+     commands = [gcc+' -dumpversion', ld+' -v', dllwrap+' --version']
+     return tuple([_find_exe_version(cmd) for cmd in commands])
+ 
+-def is_cygwingcc():
+-    '''Try to determine if the gcc that would be used is from cygwin.'''
+-    out_string = check_output(['gcc', '-dumpmachine'])
++def is_cygwincc(cc):
++    '''Try to determine if the compiler that would be used is from cygwin.'''
++    out_string = check_output([cc, '-dumpmachine'])
+     return out_string.strip().endswith(b'cygwin')
+-- 
+2.33.0
+