diff --git a/boost-context-features.jam b/boost-context-features.jam
index 01daf2d0..94dd6dc0 100644
--- a/boost-context-features.jam
+++ b/boost-context-features.jam
@@ -58,8 +58,6 @@ rule default_abi ( properties * )
 
     if <target-os>windows in $(properties) { tmp = ms ; }
     else if <target-os>cygwin in $(properties) { tmp = ms ; }
-    else if [ os.name ] = "NT" { tmp = ms ; }
-    else if [ os.name ] = "CYGWIN" { tmp = ms ; }
     else if $(arch)
     {
         if <architecture>arm in $(properties) { tmp = aapcs ; }
@@ -74,7 +72,9 @@ rule default_abi ( properties * )
         # Avoid using "in" operator here: it returns true if its left
         # part is empty, which happens e.g. with os.platform on
         # some uncommon architectures.
-        if [ os.platform ] = "ARM" { tmp = aapcs ; }
+        if [ os.name ] = "NT" { tmp = ms ; }
+        else if [ os.name ] = "CYGWIN" { tmp = ms ; }
+        else if [ os.platform ] = "ARM" { tmp = aapcs ; }
         else if [ os.platform ] = "ARM64" { tmp = aapcs ; }
         else if [ os.platform ] = "MIPS32" { tmp = o32 ; }
         else if [ os.platform ] = "MIPS64" { tmp = n64 ; }