From 56f1e4ef0524515c7f1ad65bc3f08a0e8dd0a29a Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Thu, 28 Nov 2024 09:35:51 +0000 Subject: [PATCH] 8344093: Implement JEP 501: Deprecate the 32-bit x86 Port for Removal Reviewed-by: ihse, simonis, dholmes --- .github/workflows/main.yml | 22 +--------------------- doc/building.html | 7 +++---- doc/building.md | 6 ++---- make/autoconf/platform.m4 | 16 ++++++++-------- 4 files changed, 14 insertions(+), 37 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aed03f55536..210d53be658 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ on: platforms: description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")' required: true - default: 'linux-x64, linux-x86-hs, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs' + default: 'linux-x64, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs' configure-arguments: description: 'Additional configure arguments' required: false @@ -62,7 +62,6 @@ jobs: EXCLUDED_PLATFORMS: 'alpine-linux-x64' outputs: linux-x64: ${{ steps.include.outputs.linux-x64 }} - linux-x86-hs: ${{ steps.include.outputs.linux-x86-hs }} linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }} linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }} alpine-linux-x64: ${{ steps.include.outputs.alpine-linux-x64 }} @@ -145,7 +144,6 @@ jobs: } echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT - echo "linux-x86-hs=$(check_platform linux-x86-hs linux x86)" >> $GITHUB_OUTPUT echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT echo "alpine-linux-x64=$(check_platform alpine-linux-x64 alpine-linux x64)" >> $GITHUB_OUTPUT @@ -170,24 +168,6 @@ jobs: make-arguments: ${{ github.event.inputs.make-arguments }} if: needs.prepare.outputs.linux-x64 == 'true' - build-linux-x86-hs: - name: linux-x86-hs - needs: prepare - uses: ./.github/workflows/build-linux.yml - with: - platform: linux-x86 - make-target: 'hotspot' - gcc-major-version: '10' - gcc-package-suffix: '-multilib' - apt-architecture: 'i386' - # Some multilib libraries do not have proper inter-dependencies, so we have to - # install their dependencies manually. - apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libffi-dev:i386' - extra-conf-options: '--with-target-bits=32 --enable-fallback-linker --enable-libffi-bundling' - configure-arguments: ${{ github.event.inputs.configure-arguments }} - make-arguments: ${{ github.event.inputs.make-arguments }} - if: needs.prepare.outputs.linux-x86-hs == 'true' - build-linux-x64-hs-nopch: name: linux-x64-hs-nopch needs: prepare diff --git a/doc/building.html b/doc/building.html index 63af224584a..cd73863f879 100644 --- a/doc/building.html +++ b/doc/building.html @@ -329,8 +329,8 @@ GB of free disk space is required.

Even for 32-bit builds, it is recommended to use a 64-bit build machine, and instead create a 32-bit target using --with-target-bits=32.

-

Note: The Windows 32-bit x86 port is deprecated and may be removed in -a future release.

+

Note: The 32-bit x86 port is deprecated and may be removed in a +future release.

Building on aarch64

At a minimum, a machine with 8 cores is advisable, as well as 8 GB of RAM. (The more cores to use, the more memory you need.) At least 6 GB of @@ -393,8 +393,7 @@ Build Platforms. From time to time, this is updated by contributors to list successes or failures of building on different platforms.

Windows

Windows XP is not a supported platform, but all newer Windows should -be able to build the JDK. (Note: The Windows 32-bit x86 port is -deprecated and may be removed in a future release.)

+be able to build the JDK.

On Windows, it is important that you pay attention to the instructions in the Special Considerations.

diff --git a/doc/building.md b/doc/building.md index 466e8d7edf8..99bc509dc70 100644 --- a/doc/building.md +++ b/doc/building.md @@ -134,8 +134,7 @@ space is required. Even for 32-bit builds, it is recommended to use a 64-bit build machine, and instead create a 32-bit target using `--with-target-bits=32`. -Note: The Windows 32-bit x86 port is deprecated and may be removed in a future -release. +Note: The 32-bit x86 port is deprecated and may be removed in a future release. ### Building on aarch64 @@ -191,8 +190,7 @@ on different platforms. ### Windows Windows XP is not a supported platform, but all newer Windows should be able to -build the JDK. (Note: The Windows 32-bit x86 port is deprecated and may be -removed in a future release.) +build the JDK. On Windows, it is important that you pay attention to the instructions in the [Special Considerations](#special-considerations). diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4 index 3f977058a51..5b363e0704a 100644 --- a/make/autoconf/platform.m4 +++ b/make/autoconf/platform.m4 @@ -666,14 +666,14 @@ AC_DEFUN([PLATFORM_CHECK_DEPRECATION], [ AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@], [Suppress the error when configuring for a deprecated port @<:@no@:>@])]) - # if test "x$OPENJDK_TARGET_CPU" = xx86; then - # if test "x$enable_deprecated_ports" = "xyes"; then - # AC_MSG_WARN([The x86 port is deprecated and may be removed in a future release.]) - # else - # AC_MSG_ERROR(m4_normalize([The 32-bit x86 port is deprecated and may be removed in a future release. - # Use --enable-deprecated-ports=yes to suppress this error.])) - # fi - # fi + if test "x$OPENJDK_TARGET_CPU" = xx86; then + if test "x$enable_deprecated_ports" = "xyes"; then + AC_MSG_WARN([The 32-bit x86 port is deprecated and may be removed in a future release.]) + else + AC_MSG_ERROR(m4_normalize([The 32-bit x86 port is deprecated and may be removed in a future release. + Use --enable-deprecated-ports=yes to suppress this error.])) + fi + fi ]) AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],