Mercurial > nginx

changeset 9396:4abf4913f74f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: added detection of ARM64 target. This extends the target selection implemented in dad6ec3aa63f to support Windows ARM64 platforms. OpenSSL support for VC-WIN64-ARM target first appeared in 1.1.1 and is present in all currently supported (3.x) branches. As a side effect, ARM64 Windows builds will get 16-byte alignment along with the rest of non-x86 platforms. This is safe, as malloc on 64-bit Windows guarantees the fundamental alignment of allocations, 16 bytes.
author Aleksei Bavshin <a.bavshin@nginx.com>
date Tue, 14 Jan 2025 11:11:28 -0800
parents 46ef886e2cd8
children aba3924c04ba
files auto/cc/msvc auto/lib/openssl/make
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/auto/cc/msvc	Tue Jan 14 10:32:24 2025 -0800
+++ b/auto/cc/msvc	Tue Jan 14 11:11:28 2025 -0800
@@ -26,6 +26,10 @@
 
 case "$NGX_MSVC_VER" in
 
+    *ARM64)
+        NGX_MACHINE=arm64
+    ;;
+
     *x64)
         NGX_MACHINE=amd64
     ;;
--- a/auto/lib/openssl/make	Tue Jan 14 10:32:24 2025 -0800
+++ b/auto/lib/openssl/make	Tue Jan 14 11:11:28 2025 -0800
@@ -13,6 +13,10 @@
                 OPENSSL_TARGET=VC-WIN64A
             ;;
 
+            arm64)
+                OPENSSL_TARGET=VC-WIN64-ARM
+            ;;
+
             *)
                 OPENSSL_TARGET=VC-WIN32
             ;;