Return consistent architecture markers for python on mingw/armv7

msys2-contrib · Jul 19, 2023 · 7ba998f · 7ba998f
1 parent 6e4161f
commit 7ba998f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
@@ -47,6 +47,8 @@ def get_host_platform():
                     return 'mingw_x86_64_clang'
                 if 'arm64' in sys.version.lower():
                     return 'mingw_aarch64'
+                if 'arm' in sys.version.lower():
+                    return 'mingw_armv7'
                 return 'mingw_i686_clang'
             if 'amd64' in sys.version.lower():
                 return 'mingw_x86_64'

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
@@ -780,6 +780,8 @@ def get_platform():
                     return 'mingw_x86_64_clang'
                 if 'arm64' in sys.version.lower():
                     return 'mingw_aarch64'
+                if 'arm' in sys.version.lower():
+                    return 'mingw_armv7'
                 return 'mingw_i686_clang'
             if 'amd64' in sys.version.lower():
                 return 'mingw_x86_64'

diff --git a/Python/getcompiler.c b/Python/getcompiler.c
@@ -20,6 +20,8 @@
 #define ARCH_SUFFIX " 64 bit (AMD64)"
 #elif defined(__aarch64__)
 #define ARCH_SUFFIX " 64 bit (ARM64)"
+#elif defined(__arm__)
+#define ARCH_SUFFIX " 32 bit (ARM)"
 #else
 #define ARCH_SUFFIX " 32 bit"
 #endif

diff --git a/configure.ac b/configure.ac
@@ -6017,6 +6017,9 @@ case $host_os in
   aarch64-*-mingw*)
     PYD_PLATFORM_TAG+="mingw_aarch64"
     ;;
+  armv7-*-mingw*)
+    PYD_PLATFORM_TAG+="mingw_armv7"
+    ;;
   esac
   AC_MSG_RESULT($PYD_PLATFORM_TAG)
 esac