From bab93729c26907dc51d15dbb5651f860f0cb58ab Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Tue, 25 Mar 2025 10:58:10 +0000 Subject: [PATCH] 8352618: Remove old deprecated functionality in the build system Reviewed-by: erikj, kbarrett, jwaters --- make/PreInit.gmk | 1 - make/PreInitSupport.gmk | 12 ------------ make/RunTestsPrebuilt.gmk | 3 +-- make/autoconf/basic.m4 | 3 --- make/autoconf/configure.ac | 6 +----- make/autoconf/help.m4 | 10 +--------- make/autoconf/jdk-options.m4 | 21 --------------------- make/autoconf/jvm-features.m4 | 7 +++---- make/autoconf/util.m4 | 2 +- make/common/LogUtils.gmk | 6 ------ 10 files changed, 7 insertions(+), 64 deletions(-) diff --git a/make/PreInit.gmk b/make/PreInit.gmk index b4c0402da3d..b70e15a3b8c 100644 --- a/make/PreInit.gmk +++ b/make/PreInit.gmk @@ -75,7 +75,6 @@ ifneq ($(SKIP_SPEC), true) # Basic checks on environment and command line. $(eval $(call CheckControlVariables)) - $(eval $(call CheckDeprecatedEnvironment)) $(eval $(call CheckInvalidMakeFlags)) # Check that CONF_CHECK is valid. diff --git a/make/PreInitSupport.gmk b/make/PreInitSupport.gmk index c3741589330..66bcbd2209c 100644 --- a/make/PreInitSupport.gmk +++ b/make/PreInitSupport.gmk @@ -94,18 +94,6 @@ define CheckControlVariables endif endef -# Check for deprecated ALT_ variables -define CheckDeprecatedEnvironment - defined_alt_variables := $$(filter ALT_%, $$(.VARIABLES)) - ifneq ($$(defined_alt_variables), ) - $$(info Warning: You have the following ALT_ variables set:) - $$(foreach var, $$(defined_alt_variables), $$(info * $$(var)=$$($$(var)))) - $$(info ALT_ variables are deprecated, and may result in a failed build.) - $$(info Please clean your environment.) - $$(info ) - endif -endef - # Check for invalid make flags like -j define CheckInvalidMakeFlags # This is a trick to get this rule to execute before any other rules diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk index 1ca22276c75..ea38e73d49c 100644 --- a/make/RunTestsPrebuilt.gmk +++ b/make/RunTestsPrebuilt.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -140,7 +140,6 @@ $(eval $(call SetupVariable,JIB_JAR,OPTIONAL)) include $(TOPDIR)/make/PreInitSupport.gmk include $(TOPDIR)/make/common/LogUtils.gmk -$(eval $(call CheckDeprecatedEnvironment)) $(eval $(call CheckInvalidMakeFlags)) $(eval $(call ParseLogLevel)) diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4 index de3613e1cc2..19e6641b94d 100644 --- a/make/autoconf/basic.m4 +++ b/make/autoconf/basic.m4 @@ -549,9 +549,6 @@ AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES], BASIC_CHECK_SRC_PERMS - # Check if the user has any old-style ALT_ variables set. - FOUND_ALT_VARIABLES=`env | grep ^ALT_` - # Before generating output files, test if they exist. If they do, this is a reconfigure. # Since we can't properly handle the dependencies for this, warn the user about the situation if test -e $OUTPUTDIR/spec.gmk; then diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac index 66809127a75..9eeded48fed 100644 --- a/make/autoconf/configure.ac +++ b/make/autoconf/configure.ac @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -174,9 +174,6 @@ SRCDIRS_SETUP_IMPORT_MODULES # ################################################################################ -# See if we are doing a complete static build or not -JDKOPT_SETUP_STATIC_BUILD - # First determine the toolchain type (compiler family) TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE @@ -259,7 +256,6 @@ LIB_TESTS_ENABLE_DISABLE_JTREG_TEST_THREAD_FACTORY JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST JDKOPT_EXCLUDE_TRANSLATIONS -JDKOPT_ENABLE_DISABLE_MANPAGES JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT diff --git a/make/autoconf/help.m4 b/make/autoconf/help.m4 index 4d1b3c37bbb..400acf11a63 100644 --- a/make/autoconf/help.m4 +++ b/make/autoconf/help.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -341,14 +341,6 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS], printf "\n" fi - if test "x$FOUND_ALT_VARIABLES" != "x"; then - printf "WARNING: You have old-style ALT_ environment variables set.\n" - printf "These are not respected, and will be ignored. It is recommended\n" - printf "that you clean your environment. The following variables are set:\n" - printf "$FOUND_ALT_VARIABLES\n" - printf "\n" - fi - if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then printf "WARNING: Your build output directory is not on a local disk.\n" printf "This will severely degrade build performance!\n" diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index 991f57505dc..f8ce5392df9 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -554,16 +554,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER], AC_SUBST(UBSAN_ENABLED) ]) -################################################################################ -# -# Static build support. When enabled will generate static -# libraries instead of shared libraries for all JDK libs. -# -AC_DEFUN_ONCE([JDKOPT_SETUP_STATIC_BUILD], -[ - UTIL_DEPRECATED_ARG_ENABLE(static-build) -]) - ################################################################################ # # jmod options. @@ -671,15 +661,6 @@ AC_DEFUN([JDKOPT_EXCLUDE_TRANSLATIONS], AC_SUBST(EXCLUDE_TRANSLATIONS) ]) -################################################################################ -# -# Optionally disable man pages (deprecated) -# -AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES], -[ - UTIL_DEPRECATED_ARG_ENABLE(manpages) -]) - ################################################################################ # # Disable the default CDS archive generation @@ -866,8 +847,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD], AC_SUBST(SOURCE_DATE) AC_SUBST(ISO_8601_FORMAT_STRING) AC_SUBST(SOURCE_DATE_ISO_8601) - - UTIL_DEPRECATED_ARG_ENABLE(reproducible-build) ]) ################################################################################ diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4 index 9695644bafe..668de019469 100644 --- a/make/autoconf/jvm-features.m4 +++ b/make/autoconf/jvm-features.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -50,9 +50,8 @@ m4_define(jvm_features_valid, m4_normalize( \ )) # Deprecated JVM features (these are ignored, but with a warning) -m4_define(jvm_features_deprecated, m4_normalize( - cmsgc trace \ -)) +# This list is empty at the moment. +m4_define(jvm_features_deprecated, m4_normalize( )) # Feature descriptions m4_define(jvm_feature_desc_cds, [enable class data sharing (CDS)]) diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4 index aa9662e2100..4d98d06355a 100644 --- a/make/autoconf/util.m4 +++ b/make/autoconf/util.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/common/LogUtils.gmk b/make/common/LogUtils.gmk index b32f6179ac7..50969733320 100644 --- a/make/common/LogUtils.gmk +++ b/make/common/LogUtils.gmk @@ -64,12 +64,6 @@ define ParseLogValue endef define ParseLogLevel - # Catch old-style VERBOSE= command lines. - ifneq ($$(origin VERBOSE), undefined) - $$(info Error: VERBOSE is deprecated. Use LOG= instead.) - $$(error Cannot continue) - endif - # Setup logging according to LOG # If "nofile" is present, do not log to a file