From 2beb2b602bf20f1ec36e6244eca1a2eb50baccb4 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 29 Nov 2024 17:00:03 +0000
Subject: [PATCH] 8345234: Build system erroneously treats 32-bit x86 Zero as
 deprecated

Reviewed-by: ihse
---
 make/autoconf/platform.m4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index 5b363e0704a..937d8c37927 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -666,7 +666,10 @@ 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
+  # Unfortunately, variants have not been parsed yet, so we have to check the configure option
+  # directly. Allow only the directly specified Zero variant, treat any other mix as containing
+  # something non-Zero.
+  if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$with_jvm_variants" != xzero; 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