Skip to content

Commit

Permalink
Add Windows ARM64/ARM64EC CI workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
jblazquez authored Apr 9, 2024
1 parent 71bd6b0 commit 32ca253
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
20 changes: 19 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ jobs:
# Build each combination of OS and release/debug variants
os: [ windows-2019 ]
build-type: [ Release, Debug ]
arch: [ Win32, x64 ]
arch: [ Win32, x64, ARM64, ARM64EC ]
toolchain: [ "", "-T ClangCL" ]
extra-cmake-flags: [ "" ]
# Add an extra check for the Windows 8 compatible PAL
Expand All @@ -388,6 +388,24 @@ jobs:
build-type: Debug
arch: x64
toolchain: ""
- os: windows-2022
build-type: Release
arch: ARM64
toolchain: ""
- os: windows-2022
build-type: Debug
arch: ARM64
toolchain: ""
- os: windows-2022
build-type: Release
arch: ARM64EC
toolchain: ""
extra-cmake-flags: -DCMAKE_SYSTEM_VERSION="10.0.22621.0"
- os: windows-2022
build-type: Debug
arch: ARM64EC
toolchain: ""
extra-cmake-flags: -DCMAKE_SYSTEM_VERSION="10.0.22621.0"

# Don't abort runners if a single one fails
fail-fast: false
Expand Down
9 changes: 6 additions & 3 deletions src/snmalloc/aal/aal.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
#include <cstdint>
#include <utility>

#if (defined(__i386__) || defined(_M_IX86) || defined(_X86_) || \
#if ( \
defined(__i386__) || defined(_M_IX86) || defined(_X86_) || \
defined(__amd64__) || defined(__x86_64__) || defined(_M_X64) || \
defined(_M_AMD64)) && !defined(_M_ARM64EC)
defined(_M_AMD64)) && \
!defined(_M_ARM64EC)
# if defined(SNMALLOC_SGX)
# define PLATFORM_IS_X86_SGX
# define SNMALLOC_NO_AAL_BUILTINS
Expand All @@ -25,7 +27,8 @@
# endif
#endif

#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM64) || \
defined(_M_ARM64EC)
# define PLATFORM_IS_ARM
#endif

Expand Down

0 comments on commit 32ca253

Please sign in to comment.