Skip to content

Commit 29b8d3d

Browse files
gdamsJesperIRL
authored andcommitted
8307573: Implementation of JEP 449: Deprecate the Windows 32-bit x86 Port for Removal
Reviewed-by: erikj
1 parent 5fc9b57 commit 29b8d3d

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

doc/building.html

+2
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ <h3 id="building-on-x86">Building on x86</h3>
324324
<p>Even for 32-bit builds, it is recommended to use a 64-bit build
325325
machine, and instead create a 32-bit target using
326326
<code>--with-target-bits=32</code>.</p>
327+
<p>Note: The Windows 32-bit x86 port is deprecated and may be removed in a future release.</p>
327328
<h3 id="building-on-aarch64">Building on aarch64</h3>
328329
<p>At a minimum, a machine with 8 cores is advisable, as well as 8 GB of
329330
RAM. (The more cores to use, the more memory you need.) At least 6 GB of
@@ -400,6 +401,7 @@ <h3 id="windows">Windows</h3>
400401
use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than
401402
<code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this
402403
conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
404+
<p>Note: The Windows 32-bit x86 port is deprecated and may be removed in a future release.</p>
403405
<h4 id="cygwin">Cygwin</h4>
404406
<p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment
405407
is required for building the JDK on Windows. If you have a 64-bit OS, we

doc/building.md

+4
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ space is required.
126126
Even for 32-bit builds, it is recommended to use a 64-bit build machine, and
127127
instead create a 32-bit target using `--with-target-bits=32`.
128128

129+
Note: The Windows 32-bit x86 port is deprecated and may be removed in a future release.
130+
129131
### Building on aarch64
130132

131133
At a minimum, a machine with 8 cores is advisable, as well as 8 GB of RAM.
@@ -199,6 +201,8 @@ rule also applies to input to the build system, e.g. in arguments to
199201
`--with-msvcr-dll=c:\msvcr100.dll`. For details on this conversion, see the section
200202
on [Fixpath](#fixpath).
201203

204+
Note: The Windows 32-bit x86 port is deprecated and may be removed in a future release.
205+
202206
#### Cygwin
203207

204208
A functioning [Cygwin](http://www.cygwin.com/) environment is required for

make/autoconf/platform.m4

+16
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,22 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
657657
PLATFORM_SET_MODULE_TARGET_OS_VALUES
658658
PLATFORM_SET_RELEASE_FILE_OS_VALUES
659659
PLATFORM_SETUP_LEGACY_VARS
660+
PLATFORM_CHECK_DEPRECATION
661+
])
662+
663+
AC_DEFUN_ONCE([PLATFORM_CHECK_DEPRECATION],
664+
[
665+
AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
666+
[Suppress the error when configuring for a deprecated port @<:@no@:>@])])
667+
AC_REQUIRE([PLATFORM_EXTRACT_TARGET_AND_BUILD])
668+
if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then
669+
if test "x$enable_deprecated_ports" = "xyes"; then
670+
AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.])
671+
else
672+
AC_MSG_ERROR(m4_normalize([The Windows 32-bit x86 port is deprecated and may be removed in a future release.
673+
Use --enable-deprecated-ports=yes to suppress this error.]))
674+
fi
675+
fi
660676
])
661677

662678
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],

0 commit comments

Comments
 (0)