From f3799413db844734da5cdd3b5298a846a89c2aa2 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Fri, 30 May 2025 15:18:42 -0400 Subject: [PATCH 1/3] fix: disable vcdiv64.asm on non-x86_64 Windows --- cmake/extensions/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cmake/extensions/CMakeLists.txt b/cmake/extensions/CMakeLists.txt index f3053212..b1f4991e 100644 --- a/cmake/extensions/CMakeLists.txt +++ b/cmake/extensions/CMakeLists.txt @@ -717,11 +717,13 @@ else() $<$:_decimal/libmpdec/mpalloc.c> ) if(WIN32) - if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) - enable_language(ASM_MASM) - list(APPEND _decimal_EXTRA_SOURCES - _decimal/libmpdec/vcdiv64.asm - ) + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64") + if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) + enable_language(ASM_MASM) + list(APPEND _decimal_EXTRA_SOURCES + _decimal/libmpdec/vcdiv64.asm + ) + endif() endif() endif() set(_decimal_INCLUDEDIRS INCLUDEDIRS ${SRC_DIR}/Modules/_decimal/libmpdec) From ef78b778d3fbf2e834eac161d41de2d4dbb65ed9 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Fri, 30 May 2025 16:18:02 -0400 Subject: [PATCH 2/3] add windows-11-arm to CI --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d9799c4f..c46d9654 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - runs-on: [macos-latest] + runs-on: [macos-latest, windows-11-arm] python-version: [3.7.17, 3.8.20, 3.9.22, 3.10.17, 3.11.12] include: - runs-on: macos-latest From 2f900492689b4e7677c2371f41b757d27c2633c8 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Fri, 30 May 2025 16:20:33 -0400 Subject: [PATCH 3/3] Revert "add windows-11-arm to CI" This reverts commit ef78b778d3fbf2e834eac161d41de2d4dbb65ed9. --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c46d9654..d9799c4f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - runs-on: [macos-latest, windows-11-arm] + runs-on: [macos-latest] python-version: [3.7.17, 3.8.20, 3.9.22, 3.10.17, 3.11.12] include: - runs-on: macos-latest