This is an automated email from the ASF dual-hosted git repository.
rainerjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 357c69d21 Update architecture support for Windows builds
357c69d21 is described below
commit 357c69d21121ba6e68d19e7bb4d4e549fde924e2
Author: Rainer Jung <[email protected]>
AuthorDate: Mon Jun 22 22:31:38 2026 +0200
Update architecture support for Windows builds
- Remove support for IA64 architecture (Itanium).
- Make x64 the default architecture.
---
native/NMAKEmakefile.inc | 19 +++----------------
xdocs/miscellaneous/changelog.xml | 6 ++++++
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index a8488aa29..bd80b4c13 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -25,10 +25,9 @@
# CPU Compile for specified CPU. Supported CPU's are:
# X86 (Common x86 architecture)
# X64 (AMD64/EMT64 architecture)
-# I64 (Intel IA64 architecture)
# If not specified it will default to the
# PROCESSOR_ARCHITECTURE environment variable
-# or to the X86 if not specified.
+# or to the X64 if not specified.
# WINVER Compile for specified Windows version
# WIN10 for Windows 10 and up
# WIN81 for Windows 8.1 and up
@@ -102,15 +101,12 @@ CPU=X86
!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)"
== "x64"
CPU=X64
!ENDIF
-!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64"
-CPU=I64
-!ENDIF
!ENDIF
# Figure out CPU from the current host
!IF !DEFINED(CPU) || "$(CPU)" == ""
!IF "$(PROCESSOR_ARCHITECTURE)" == ""
!IF "$(PROCESSOR_ARCHITEW6432)" == ""
-CPU=X86
+CPU=X64
!ELSE
CPU=$(PROCESSOR_ARCHITEW6432)
!ENDIF
@@ -125,8 +121,7 @@ CPU=$(PROCESSOR_ARCHITECTURE)
!IF "$(CPU)" != "X86"
!IF "$(CPU)" != "X64"
-!IF "$(CPU)" != "I64"
-!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU)
+!ERROR Must specify CPU environment variable (X86, X64) $(CPU)
!ENDIF
!ENDIF
!ENDIF
@@ -206,10 +201,6 @@ MACHINE_LC=i386
CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64
MACHINE=AMD64
MACHINE_LC=amd64
-!ELSEIF "$(CPU)" == "I64"
-CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64
-MACHINE=IA64
-MACHINE_LC=ia64
!ENDIF
!IF "$(BUILD)" == "RELEASE"
@@ -330,9 +321,5 @@ AFLAGS = /coff /Zi /c
!ELSEIF "$(CPU)" == "X64"
ML = ml64.exe
AFLAGS = /Zi /c
-!ELSEIF "$(CPU)" == "I64"
-ML = ml64.exe
-AFLAGS = /coff /Zi /c
-!ENDIF
!ENDIF
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 24596eef7..fd7452eb6 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -38,6 +38,12 @@
allow building with OpenSSL 4.0.x. ERR_remove_thread_state() is a no-op
in OpenSSL 1.1+ and got removed in OpenSSL 4. (rjung)
</scode>
+ <update>
+ Remove support for Windows build on IA64 architecture (Itanium). (rjung)
+ </update>
+ <update>
+ Make x64 the default architecture for Windows build. (rjung)
+ </update>
</changelog>
</section>
<section name="2.0.15" rtext="2026-06-15">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
