From 26dbadd82605e797b1151e04ba945b176ab1dfab Mon Sep 17 00:00:00 2001
From: Joseph Brill <48932340+jcbrill@users.noreply.github.com>
Date: Sun, 19 Mar 2023 09:32:08 -0400
Subject: Add arm64 to the MSVS supported architectures list for VS2017 and
 later to be consistent with the current documentation of MSVS_ARCH. Update
 the documentation for HOST_ARCH.

---
 CHANGES.txt                 | 2 ++
 SCons/Platform/Platform.xml | 4 ++--
 SCons/Tool/MSCommon/vs.py   | 8 ++++----
 doc/generated/variables.gen | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 82e6d0a..614aebe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -33,6 +33,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix an issue where test SConfTests.py would fail when mscommon debugging
       was enabled.  The mscommon debug filter class registered with the logging
       module was refactored.
+    - Add arm64 to the MSVS supported architectures list for VS2017 and later to be
+      consistent with the current documentation of MSVS_ARCH.
 
   From Michał Górny:
     - Remove the redundant `wheel` dependency from `pyproject.toml`,
diff --git a/SCons/Platform/Platform.xml b/SCons/Platform/Platform.xml
index 08199f4..c449fa5 100644
--- a/SCons/Platform/Platform.xml
+++ b/SCons/Platform/Platform.xml
@@ -173,8 +173,8 @@ else:
       Valid host arch values are
       <literal>x86</literal> and <literal>arm</literal>
       for 32-bit hosts and
-      <literal>amd64</literal> and <literal>x86_64</literal>
-      for 64-bit hosts.
+      <literal>amd64</literal>, <literal>arm64</literal>,
+      and <literal>x86_64</literal> for 64-bit hosts.
     </para>
     <para>
       Should be considered immutable. 
diff --git a/SCons/Tool/MSCommon/vs.py b/SCons/Tool/MSCommon/vs.py
index 08c3cf5..07fcdc4 100644
--- a/SCons/Tool/MSCommon/vs.py
+++ b/SCons/Tool/MSCommon/vs.py
@@ -207,7 +207,7 @@ SupportedVSList = [
                  executable_path=r'Common7\IDE\devenv.com',
                  # should be a fallback, prefer use vswhere installationPath
                  batch_file_path=r'Common7\Tools\VsDevCmd.bat',
-                 supported_arch=['x86', 'amd64', "arm"],
+                 supported_arch=['x86', 'amd64', "arm", 'arm64'],
                  ),
 
     # Visual Studio 2019
@@ -219,7 +219,7 @@ SupportedVSList = [
                  executable_path=r'Common7\IDE\devenv.com',
                  # should be a fallback, prefer use vswhere installationPath
                  batch_file_path=r'Common7\Tools\VsDevCmd.bat',
-                 supported_arch=['x86', 'amd64', "arm"],
+                 supported_arch=['x86', 'amd64', "arm", 'arm64'],
                  ),
 
     # Visual Studio 2017
@@ -231,7 +231,7 @@ SupportedVSList = [
                  executable_path=r'Common7\IDE\devenv.com',
                  # should be a fallback, prefer use vswhere installationPath
                  batch_file_path=r'Common7\Tools\VsDevCmd.bat',
-                 supported_arch=['x86', 'amd64', "arm"],
+                 supported_arch=['x86', 'amd64', "arm", 'arm64'],
                  ),
 
     # Visual C++ 2017 Express Edition (for Desktop)
@@ -243,7 +243,7 @@ SupportedVSList = [
                  executable_path=r'Common7\IDE\WDExpress.exe',
                  # should be a fallback, prefer use vswhere installationPath
                  batch_file_path=r'Common7\Tools\VsDevCmd.bat',
-                 supported_arch=['x86', 'amd64', "arm"],
+                 supported_arch=['x86', 'amd64', "arm", 'arm64'],
     ),
 
     # Visual Studio 2015
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 42935a3..86395a7 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -3179,8 +3179,8 @@ is <quote><literal>-dNOPAUSE -dBATCH -sDEVICE=pdfwrite</literal></quote>
       Valid host arch values are
       <literal>x86</literal> and <literal>arm</literal>
       for 32-bit hosts and
-      <literal>amd64</literal> and <literal>x86_64</literal>
-      for 64-bit hosts.
+      <literal>amd64</literal>, <literal>arm64</literal>,
+      and <literal>x86_64</literal> for 64-bit hosts.
     </para>
     <para>
       Should be considered immutable. 
-- 
cgit v0.12