From 7ba998f4aaa5f171eabbf0fc23aa4a81b2a0c950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Fri, 19 Nov 2021 12:18:06 +0200
Subject: [PATCH] Return consistent architecture markers for python on
 mingw/armv7

---
 Lib/distutils/util.py | 2 ++
 Lib/sysconfig.py      | 2 ++
 Python/getcompiler.c  | 2 ++
 configure.ac          | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index 28e623b95d78fd..81626b394612c2 100644
--- 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
index 30c26168c252bc..97e3e8ebc31817 100644
--- 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
index 275f79997b4241..4b0b9b328ba2f8 100644
--- 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
index a4075f08415e25..06e797b1938ca1 100644
--- 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