From cf57d72fe8f40810f386413fe6e8c3c5dafab01f Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 24 May 2022 07:53:46 +0000
Subject: [PATCH] 8287174: Remove deprecated configure arguments

Reviewed-by: shade, dholmes
---
 make/autoconf/hotspot.m4     |  6 ------
 make/autoconf/jdk-options.m4 | 14 --------------
 make/autoconf/platform.m4    |  3 ---
 3 files changed, 23 deletions(-)

diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 18f46036fe5..adbf538fd7d 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -142,10 +142,4 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
     HOTSPOT_TARGET_CPU=arm_32
     HOTSPOT_TARGET_CPU_DEFINE="ARM32"
   fi
-
-  # --with-cpu-port is no longer supported
-  UTIL_DEPRECATED_ARG_WITH(with-cpu-port)
-
-  # in jdk15 hotspot-gtest was replaced with --with-gtest
-  UTIL_DEPRECATED_ARG_ENABLE(hotspot-gtest)
 ])
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 2034934cd73..0413a50270c 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -23,20 +23,6 @@
 # questions.
 #
 
-###############################################################################
-# Check which variant of the JDK that we want to build.
-# Currently we have:
-#    normal:   standard edition
-# but the custom make system may add other variants
-#
-# Effectively the JDK variant gives a name to a specific set of
-# modules to compile into the JDK.
-AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT],
-[
-  # Deprecated in JDK 12
-  UTIL_DEPRECATED_ARG_WITH([jdk-variant])
-])
-
 ###############################################################################
 # Set the debug level
 #    release: no debug information, all optimizations, no asserts.
diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index 2e068442828..3e1b7d91269 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -656,9 +656,6 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
   PLATFORM_SET_MODULE_TARGET_OS_VALUES
   PLATFORM_SET_RELEASE_FILE_OS_VALUES
   PLATFORM_SETUP_LEGACY_VARS
-
-  # Deprecated in JDK 15
-  UTIL_DEPRECATED_ARG_ENABLE(deprecated-ports)
 ])
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],