Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ windows-2022, windows-2025 ]
os: [ windows-2022, windows-2025, windows-11-arm ]

runs-on: ${{matrix.os}}

Expand Down
1 change: 1 addition & 0 deletions build/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import config : requires ;
project
: common-requirements <library>$(boost_dependencies)
: requirements
<target-os>windows,<architecture>arm,<address-model>64:<context-impl>winfib
<target-os>windows:<define>_WIN32_WINNT=0x0601
<target-os>linux,<toolset>gcc,<segmented-stacks>on:<cxxflags>-fsplit-stack
<target-os>linux,<toolset>gcc,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
Expand Down
24 changes: 22 additions & 2 deletions test/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ rule native-impl ( properties * )
{
result = <build>no ;
}
else if ( <target-os>windows in $(properties) && <architecture>arm in $(properties) && <address-model>64 in $(properties) )
{
return <context-impl>winfib ; # for windows arm64 always use winfib and skip ASM
}
else if ( ! ( <target-os>windows in $(properties) ) )
{
result = <context-impl>ucontext ;
Expand All @@ -52,6 +56,22 @@ rule native-impl ( properties * )
return $(result) ;
}

rule fcontext-impl ( properties * )
{
# Skip on Windows ARM64
if ( <target-os>windows in $(properties) &&
<architecture>arm in $(properties) &&
<address-model>64 in $(properties) )
{
return <build>no ; # for windows arm64 always use winfib and skip fcontext
}
else
{
return <context-impl>fcontext ;
}
}


obj is_libstdcxx : is_libstdcxx.cpp ;
explicit is_libstdcxx ;

Expand Down Expand Up @@ -95,7 +115,7 @@ test-suite minimal :

[ run test_fiber.cpp :
: :
<context-impl>fcontext
<conditional>@fcontext-impl
[ requires cxx11_auto_declarations
cxx11_constexpr
cxx11_defaulted_functions
Expand Down Expand Up @@ -150,7 +170,7 @@ test-suite minimal :

[ run test_callcc.cpp :
: :
<context-impl>fcontext
<conditional>@fcontext-impl
[ requires cxx11_auto_declarations
cxx11_constexpr
cxx11_defaulted_functions
Expand Down
Loading