diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 0901e415a8a..2ed04c19064 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -284,7 +284,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
   ifeq ($(MACOSX_CODESIGN_MODE), hardened)
     # Macosx release build and code signing available.
 
-    ################################################################################
+    ############################################################################
     # JDK bundle
     $(eval $(call SetupCopyFiles, CREATE_JDK_BUNDLE_DIR_SIGNED, \
         SRC := $(JDK_IMAGE_DIR), \
@@ -313,7 +313,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 
     PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
 
-    ################################################################################
+    ############################################################################
     # JRE bundle
     $(eval $(call SetupCopyFiles, CREATE_JRE_BUNDLE_DIR_SIGNED, \
         SRC := $(JRE_IMAGE_DIR), \
diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index feba5d8a902..41a19f90ace 100644
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -52,8 +52,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
         build/tools/deps \
         build/tools/docs \
         build/tools/jigsaw \
-        build/tools/depend \
-        , \
+        build/tools/depend, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
     DISABLED_WARNINGS := dangling-doc-comments options, \
     JAVAC_FLAGS := \
@@ -66,17 +65,19 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
 
 TARGETS += $(BUILD_TOOLS_JDK)
 
-$(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
+$(eval $(call SetupCopyFiles, COPY_NIMBUS_TEMPLATES, \
     SRC := $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
     DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources, \
-    FILES := $(wildcard $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
+    FILES := $(wildcard $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template), \
+))
 
 TARGETS += $(COPY_NIMBUS_TEMPLATES)
 
-$(eval $(call SetupCopyFiles,COPY_CLDRCONVERTER_PROPERTIES, \
+$(eval $(call SetupCopyFiles, COPY_CLDRCONVERTER_PROPERTIES, \
     SRC := $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter, \
     DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/cldrconverter, \
-    FILES := $(wildcard $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter/*.properties)))
+    FILES := $(wildcard $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter/*.properties), \
+))
 
 TARGETS += $(COPY_CLDRCONVERTER_PROPERTIES)
 
diff --git a/make/CopyInterimTZDB.gmk b/make/CopyInterimTZDB.gmk
index ac390580aa9..e2704b32975 100644
--- a/make/CopyInterimTZDB.gmk
+++ b/make/CopyInterimTZDB.gmk
@@ -30,7 +30,7 @@ include MakeBase.gmk
 
 include CopyFiles.gmk
 
-##########################################################################################
+################################################################################
 
 ### TZDB tool needs files from java.time.zone package
 
@@ -41,12 +41,13 @@ define tzdb_copyfiles
         < $(<) > $@
 endef
 
-$(eval $(call SetupCopyFiles,COPY_INTERIM_TZDB, \
+$(eval $(call SetupCopyFiles, COPY_INTERIM_TZDB, \
     SRC := $(TOPDIR)/src/java.base/share/classes/java/time/zone, \
     DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes/build/tools/tzdb, \
     FILES := ZoneRules.java ZoneOffsetTransition.java ZoneOffsetTransitionRule.java Ser.java, \
-    MACRO := tzdb_copyfiles))
+    MACRO := tzdb_copyfiles, \
+))
 
-##########################################################################################
+################################################################################
 
 all: $(COPY_INTERIM_TZDB)
diff --git a/make/Docs.gmk b/make/Docs.gmk
index 08a9ac662cd..e6a98c4fbd2 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -247,7 +247,7 @@ define create_overview_file
       <!DOCTYPE html> \
       <html><head></head><body> \
       #
-  ifneq ($$($1_GROUPS),)
+  ifneq ($$($1_GROUPS), )
     $1_OVERVIEW_TEXT += \
       <p>This document is divided into \
       $$(subst 2,two,$$(subst 3,three,$$(words $$($1_GROUPS)))) sections:</p> \
diff --git a/make/Global.gmk b/make/Global.gmk
index 998ba4d2bda..6b97b7ad059 100644
--- a/make/Global.gmk
+++ b/make/Global.gmk
@@ -28,7 +28,7 @@
 ###
 
 # Helper macro to allow $(info) to properly print strings beginning with spaces.
-_:=
+_ :=
 
 help:
 	$(info )
@@ -108,7 +108,7 @@ help:
 	$(info $(_) TEST_OPTS="OPT1=x;..." # Generic control of all test harnesses)
 	$(info $(_) TEST_VM_OPTS="ARG ..." # Same as setting TEST_OPTS to VM_OPTIONS="ARG ...")
 	$(info )
-	$(if $(all_confs), $(info Available configurations in $(build_dir):) $(foreach var,$(all_confs),$(info * $(var))),\
+	$(if $(all_confs), $(info Available configurations in $(build_dir):) $(foreach var,$(all_confs),$(info * $(var))), \
 	    $(info No configurations were found in $(build_dir).) $(info Run 'bash configure' to create a configuration.))
         # We need a dummy rule otherwise make will complain
 	@true
diff --git a/make/Images.gmk b/make/Images.gmk
index bfad1ad563c..5703a74afa5 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -134,11 +134,11 @@ CDS_DUMP_FLAGS = -Xmx128M -Xms128M
 # Param1 - VM variant (e.g., server, client, zero, ...)
 # Param2 - _nocoops, or empty
 define CreateCDSArchive
-  $1_$2_DUMP_EXTRA_ARG := $(if $(filter _nocoops, $2),-XX:-UseCompressedOops,)
-  $1_$2_DUMP_TYPE      := $(if $(filter _nocoops, $2),-NOCOOPS,)
+  $1_$2_DUMP_EXTRA_ARG := $(if $(filter _nocoops, $2), -XX:-UseCompressedOops, )
+  $1_$2_DUMP_TYPE      := $(if $(filter _nocoops, $2), -NOCOOPS, )
 
   # Only G1 supports dumping the shared heap, so explicitly use G1 if the JVM supports it.
-  $1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)),-XX:+UseG1GC)
+  $1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
 
   ifeq ($(OPENJDK_TARGET_OS), windows)
     $1_$2_CDS_ARCHIVE := bin/$1/classes$2.jsa
@@ -235,7 +235,7 @@ endif
 
 ifeq ($(GCOV_ENABLED), true)
 
-  $(eval $(call SetupCopyFiles,COPY_GCOV_GCNO, \
+  $(eval $(call SetupCopyFiles, COPY_GCOV_GCNO, \
       SRC := $(OUTPUTDIR), \
       DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
       FILES := $(call FindFiles, $(HOTSPOT_OUTPUTDIR) \
diff --git a/make/Init.gmk b/make/Init.gmk
index 61846217ecc..8918de7d16e 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -37,7 +37,7 @@ default:
 # serially, regardless of -j.
 .NOTPARALLEL:
 
-ifeq ($(HAS_SPEC),)
+ifeq ($(HAS_SPEC), )
   ##############################################################################
   # This is the default mode. We have not been recursively called with a SPEC.
   ##############################################################################
@@ -168,7 +168,7 @@ ifeq ($(HAS_SPEC),)
     endif
 
     make-info:
-        ifneq ($(findstring $(LOG_LEVEL),info debug trace),)
+        ifneq ($(findstring $(LOG_LEVEL), info debug trace), )
 	  $(info Running make as '$(strip $(MAKE) $(MFLAGS) \
 	      $(COMMAND_LINE_VARIABLES) $(MAKECMDGOALS))')
         endif
diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index 6dd29b1db10..2471d82d6db 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -32,7 +32,7 @@
 ifndef _INITSUPPORT_GMK
 _INITSUPPORT_GMK := 1
 
-ifeq ($(HAS_SPEC),)
+ifeq ($(HAS_SPEC), )
 
   # COMMA is defined in spec.gmk, but that is not included yet
   COMMA := ,
@@ -74,13 +74,13 @@ ifeq ($(HAS_SPEC),)
 
   # Setup information about available configurations, if any.
   ifneq ($(CUSTOM_ROOT), )
-    build_dir=$(CUSTOM_ROOT)/build
+    build_dir = $(CUSTOM_ROOT)/build
   else
-    build_dir=$(topdir)/build
+    build_dir = $(topdir)/build
   endif
-  all_spec_files=$(wildcard $(build_dir)/*/spec.gmk)
+  all_spec_files = $(wildcard $(build_dir)/*/spec.gmk)
   # Extract the configuration names from the path
-  all_confs=$(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
+  all_confs = $(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
 
   # Check for unknown command-line variables
   define CheckControlVariables
@@ -128,7 +128,7 @@ ifeq ($(HAS_SPEC),)
     ifeq ($$(CONF_CHECK), )
       # Default behavior is fail
       CONF_CHECK := fail
-    else ifneq ($$(filter-out auto fail ignore, $$(CONF_CHECK)),)
+    else ifneq ($$(filter-out auto fail ignore, $$(CONF_CHECK)), )
       $$(info Error: CONF_CHECK must be one of: auto, fail or ignore.)
       $$(error Cannot continue)
     endif
@@ -147,11 +147,11 @@ ifeq ($(HAS_SPEC),)
         $$(info Error: Cannot use CONF_NAME=$$(CONF_NAME) and SPEC=$$(SPEC) at the same time. Choose one.)
         $$(error Cannot continue)
       endif
-      ifeq ($$(wildcard $$(SPEC)),)
+      ifeq ($$(wildcard $$(SPEC)), )
         $$(info Error: Cannot locate spec.gmk, given by SPEC=$$(SPEC).)
         $$(error Cannot continue)
       endif
-      ifeq ($$(filter /%, $$(SPEC)),)
+      ifeq ($$(filter /%, $$(SPEC)), )
         # If given with relative path, make it absolute
         SPECS := $$(CURDIR)/$$(strip $$(SPEC))
       else
@@ -162,7 +162,7 @@ ifeq ($(HAS_SPEC),)
       override SPEC :=
     else
       # Use spec.gmk files in the build output directory
-      ifeq ($$(all_spec_files),)
+      ifeq ($$(all_spec_files), )
         ifneq ($(CUSTOM_ROOT), )
           $$(info Error: No configurations found for $$(CUSTOM_ROOT).)
         else
@@ -180,7 +180,7 @@ ifeq ($(HAS_SPEC),)
           $$(error Cannot continue)
         endif
         matching_conf := $$(strip $$(filter $$(CONF_NAME), $$(all_confs)))
-        ifeq ($$(matching_conf),)
+        ifeq ($$(matching_conf), )
           $$(info Error: No configurations found matching CONF_NAME=$$(CONF_NAME).)
           $$(info Available configurations in $$(build_dir):)
           $$(foreach var, $$(all_confs), $$(info * $$(var)))
@@ -197,12 +197,12 @@ ifeq ($(HAS_SPEC),)
         SPECS := $$(build_dir)/$$(matching_conf)/spec.gmk
       else ifneq ($$(origin CONF), undefined)
         # User have given a CONF= argument.
-        ifeq ($$(CONF),)
+        ifeq ($$(CONF), )
           # If given CONF=, match all configurations
           matching_confs := $$(strip $$(all_confs))
         else
           # Otherwise select those that contain the given CONF string
-          ifeq ($$(patsubst !%,,$$(CONF)),)
+          ifeq ($$(patsubst !%,,$$(CONF)), )
             # A CONF starting with ! means we should negate the search term
             matching_confs := $$(strip $$(foreach var, $$(all_confs), \
                 $$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var))))
@@ -215,12 +215,12 @@ ifeq ($(HAS_SPEC),)
             matching_confs := $$(CONF)
             # Don't repeat this output on make restarts caused by including
             # generated files.
-            ifeq ($$(MAKE_RESTARTS),)
+            ifeq ($$(MAKE_RESTARTS), )
               $$(info Using exact match for CONF=$$(CONF) (other matches are possible))
             endif
           endif
         endif
-        ifeq ($$(matching_confs),)
+        ifeq ($$(matching_confs), )
           $$(info Error: No configurations found matching CONF=$$(CONF).)
           $$(info Available configurations in $$(build_dir):)
           $$(foreach var, $$(all_confs), $$(info * $$(var)))
@@ -228,9 +228,9 @@ ifeq ($(HAS_SPEC),)
         else
           # Don't repeat this output on make restarts caused by including
           # generated files.
-          ifeq ($$(MAKE_RESTARTS),)
+          ifeq ($$(MAKE_RESTARTS), )
             ifeq ($$(words $$(matching_confs)), 1)
-              ifneq ($$(findstring $$(LOG_LEVEL), info debug trace),)
+              ifneq ($$(findstring $$(LOG_LEVEL), info debug trace), )
                 $$(info Building configuration '$$(matching_confs)' (matching CONF=$$(CONF)))
               endif
             else
@@ -272,7 +272,7 @@ ifeq ($(HAS_SPEC),)
     # count.
     main_targets_file := $$(dir $(strip $2))make-support/main-targets.gmk
 
-    ifeq ($$(MAKE_RESTARTS),)
+    ifeq ($$(MAKE_RESTARTS), )
       # Only do this if make has not been restarted, and if we do not force it.
       ifeq ($(strip $1), FORCE)
         $$(shell rm -f $$(main_targets_file))
@@ -316,9 +316,9 @@ else # $(HAS_SPEC)=true
   BUILD_LOG_PIPE_SIMPLE := | $(TEE) -a $(BUILD_LOG)
 
   ifneq ($(CUSTOM_ROOT), )
-    topdir=$(CUSTOM_ROOT)
+    topdir = $(CUSTOM_ROOT)
   else
-    topdir=$(TOPDIR)
+    topdir = $(TOPDIR)
   endif
 
   # Setup the build environment to match the requested specification on
@@ -349,39 +349,39 @@ else # $(HAS_SPEC)=true
       ifneq ($$(findstring :, $$(COMPARE_BUILD)), )
         $$(foreach part, $$(subst :, , $$(COMPARE_BUILD)), \
           $$(if $$(filter PATCH=%, $$(part)), \
-            $$(eval COMPARE_BUILD_PATCH=$$(strip $$(patsubst PATCH=%, %, $$(part)))) \
+            $$(eval COMPARE_BUILD_PATCH = $$(strip $$(patsubst PATCH=%, %, $$(part)))) \
           ) \
           $$(if $$(filter CONF=%, $$(part)), \
-            $$(eval COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(part))))) \
+            $$(eval COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(part))))) \
           ) \
           $$(if $$(filter MAKE=%, $$(part)), \
-            $$(eval COMPARE_BUILD_MAKE=$$(strip $$(subst +, , $$(patsubst MAKE=%, %, $$(part))))) \
+            $$(eval COMPARE_BUILD_MAKE = $$(strip $$(subst +, , $$(patsubst MAKE=%, %, $$(part))))) \
           ) \
           $$(if $$(filter COMP_OPTS=%, $$(part)), \
-            $$(eval COMPARE_BUILD_COMP_OPTS=$$(strip $$(subst +, , $$(patsubst COMP_OPTS=%, %, $$(part))))) \
+            $$(eval COMPARE_BUILD_COMP_OPTS = $$(strip $$(subst +, , $$(patsubst COMP_OPTS=%, %, $$(part))))) \
           ) \
           $$(if $$(filter COMP_DIR=%, $$(part)), \
-            $$(eval COMPARE_BUILD_COMP_DIR=$$(strip $$(subst +, , $$(patsubst COMP_DIR=%, %, $$(part))))) \
+            $$(eval COMPARE_BUILD_COMP_DIR = $$(strip $$(subst +, , $$(patsubst COMP_DIR=%, %, $$(part))))) \
           ) \
           $$(if $$(filter FAIL=%, $$(part)), \
-            $$(eval COMPARE_BUILD_FAIL=$$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \
+            $$(eval COMPARE_BUILD_FAIL = $$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \
           ) \
           $$(if $$(filter NODRYRUN=%, $$(part)), \
-            $$(eval COMPARE_BUILD_NODRYRUN=$$(strip $$(subst +, , $$(patsubst NODRYRUN=%, %, $$(part))))) \
+            $$(eval COMPARE_BUILD_NODRYRUN = $$(strip $$(subst +, , $$(patsubst NODRYRUN=%, %, $$(part))))) \
           ) \
         )
       else
         # Separate handling for single field case, to allow for spaces in values.
         ifneq ($$(filter PATCH=%, $$(COMPARE_BUILD)), )
-          COMPARE_BUILD_PATCH=$$(strip $$(patsubst PATCH=%, %, $$(COMPARE_BUILD)))
+          COMPARE_BUILD_PATCH = $$(strip $$(patsubst PATCH=%, %, $$(COMPARE_BUILD)))
         else ifneq ($$(filter CONF=%, $$(COMPARE_BUILD)), )
-          COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(COMPARE_BUILD))))
+          COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(COMPARE_BUILD))))
         else ifneq ($$(filter --%, $$(COMPARE_BUILD)), )
           # Assume CONF if value begins with --
-          COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(COMPARE_BUILD)))
+          COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(COMPARE_BUILD)))
         else
           # Otherwise assume patch file
-          COMPARE_BUILD_PATCH=$$(strip $$(COMPARE_BUILD))
+          COMPARE_BUILD_PATCH = $$(strip $$(COMPARE_BUILD))
         endif
       endif
       ifneq ($$(COMPARE_BUILD_PATCH), )
@@ -531,7 +531,7 @@ else # $(HAS_SPEC)=true
     # used by build comparisons.
     define WaitForJavacServerFinish
 	$(if $(JAVAC_SERVER_DIR), \
-	  sleep 5\
+	  sleep 5 \
 	)
     endef
   else
@@ -544,7 +544,7 @@ else # $(HAS_SPEC)=true
   ##############################################################################
 
   # Store the build times in this directory.
-  BUILDTIMESDIR=$(OUTPUTDIR)/make-support/build-times
+  BUILDTIMESDIR = $(OUTPUTDIR)/make-support/build-times
 
   # Record starting time for build of a sub repository.
   define RecordStartTime
@@ -605,7 +605,7 @@ endif # HAS_SPEC
 # $1: The option to look for
 # $2: The variable to set to "true" if the option is found
 define ParseLogOption
-  ifneq ($$(findstring $1, $$(LOG)),)
+  ifneq ($$(findstring $1, $$(LOG)), )
     override $2 := true
     # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
     LOG_STRIPPED := $$(subst $1,, $$(subst $$(COMMA)$$(strip $1),, $$(LOG)))
@@ -620,7 +620,7 @@ endef
 # $1: The option to look for
 # $2: The variable to set to the value of the option, if found
 define ParseLogValue
-  ifneq ($$(findstring $1=, $$(LOG)),)
+  ifneq ($$(findstring $1=, $$(LOG)), )
     # Make words of out comma-separated list and find the one with opt=val
     value := $$(strip $$(subst $$(strip $1)=,, $$(filter $$(strip $1)=%, $$(subst $$(COMMA), , $$(LOG)))))
     override $2 := $$(value)
@@ -673,7 +673,7 @@ define ParseLogLevel
 
   override LOG_LEVEL := $$(LOG)
 
-  ifeq ($$(LOG_LEVEL),)
+  ifeq ($$(LOG_LEVEL), )
     # Set LOG to "warn" as default if not set
     override LOG_LEVEL := warn
   endif
diff --git a/make/JrtfsJar.gmk b/make/JrtfsJar.gmk
index 990c8a7e1ed..55e0c150b3b 100644
--- a/make/JrtfsJar.gmk
+++ b/make/JrtfsJar.gmk
@@ -67,7 +67,8 @@ $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
 $(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
     SRC := $(TOPDIR)/src/java.base/share/classes, \
     DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
-    FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
+    FILES := META-INF/services/java.nio.file.spi.FileSystemProvider, \
+))
 
 $(eval $(call SetupJarArchive, BUILD_JRTFS_JAR, \
     DEPENDENCIES := $(BUILD_JRTFS) $(COPY_JIMAGE_SERVICE_PROVIDER), \
diff --git a/make/Main.gmk b/make/Main.gmk
index cdff43b82f3..46150839f80 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -31,7 +31,7 @@
 # Declare default target
 default:
 
-ifeq ($(wildcard $(SPEC)),)
+ifeq ($(wildcard $(SPEC)), )
   $(error Main.gmk needs SPEC set to a proper spec.gmk)
 endif
 
@@ -1414,7 +1414,7 @@ dist-clean: clean
 	($(CD) $(OUTPUTDIR) && \
 	    $(RM) -r *spec.gmk $(CONFIGURESUPPORT_OUTPUTDIR) Makefile compare.sh ide \
 	    configure.log* build.log*)
-	$(if $(filter $(CONF_NAME),$(notdir $(OUTPUTDIR))), \
+	$(if $(filter $(CONF_NAME), $(notdir $(OUTPUTDIR))), \
 	  if test "x`$(LS) $(OUTPUTDIR)`" != x; then \
 	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
 	  else \
diff --git a/make/MainSupport.gmk b/make/MainSupport.gmk
index 8c575423005..f1027a9b888 100644
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@@ -175,7 +175,7 @@ define DeclareRecipesForPhaseAndModule
       $$(foreach d, $$($1_$2_TOPDIRS), \
         $$(eval $1 += $2-$$($1_TARGET_SUFFIX)-$$(notdir $$d)))
     endif
-    ifeq ($(NO_RECIPES),)
+    ifeq ($(NO_RECIPES), )
       $$(eval $$(call DeclareRecipeForModuleMakefile,$1,$2))
     endif
     $1 += $2-$$($1_TARGET_SUFFIX)
@@ -197,8 +197,8 @@ endef
 # $1_MODULES : All modules that had rules generated
 # $1_TARGETS : All targets generated
 define DeclareRecipesForPhase
-  $(foreach i,2 3 4 5 6 7 8, $(if $(strip $($i)),$(strip $1)_$(strip $($i)))$(NEWLINE))
-  $(if $(9),$(error Internal makefile error: Too many arguments to \
+  $(foreach i, 2 3 4 5 6 7 8, $(if $(strip $($i)),$(strip $1)_$(strip $($i)))$(NEWLINE))
+  $(if $(9), $(error Internal makefile error: Too many arguments to \
       DeclareRecipesForPhase, please update MakeHelper.gmk))
 
   $$(foreach m, $$($(strip $1)_CHECK_MODULES), \
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 8cfee458923..a6a4bd343d5 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -104,7 +104,8 @@ ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
       -observerDir:$(JTREG_FAILURE_HANDLER) \
       -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \
       -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \
-      -timeoutHandlerTimeout:$(JTREG_FAILURE_HANDLER_TIMEOUT)
+      -timeoutHandlerTimeout:$(JTREG_FAILURE_HANDLER_TIMEOUT) \
+      #
 endif
 
 GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \
@@ -500,7 +501,7 @@ define SetupRunGtestTestBody
   endif
 
   ifneq ($$(GTEST_REPEAT), )
-    $1_GTEST_REPEAT :=--gtest_repeat=$$(GTEST_REPEAT)
+    $1_GTEST_REPEAT := --gtest_repeat=$$(GTEST_REPEAT)
   endif
 
   run-test-$1: pre-run-test
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index eea325184f3..ce5d254ccc4 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -34,7 +34,7 @@ ifneq ($(findstring :, $(MAKE)), )
 endif
 
 # Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
   makefile_path := $(CURDIR)/$(strip $(lastword $(MAKEFILE_LIST)))
 else
   makefile_path := $(lastword $(MAKEFILE_LIST))
@@ -67,7 +67,7 @@ define SetupVariable
       ifneq ($$(findstring $$(LOG), info debug trace), )
         $$(info Prebuilt variable $1=$2 (default value))
       endif
-      $1:=$2
+      $1 := $2
     endif
   else
     ifneq ($$(findstring $$(LOG), info debug trace), )
@@ -163,7 +163,7 @@ else ifeq ($(UNAME_OS), MINGW64)
   OPENJDK_TARGET_OS_TYPE := windows
   OPENJDK_TARGET_OS_ENV := windows.msys2
 else
-  OPENJDK_TARGET_OS_TYPE:=unix
+  OPENJDK_TARGET_OS_TYPE := unix
   ifeq ($(UNAME_OS), Linux)
     OPENJDK_TARGET_OS := linux
   else ifeq ($(UNAME_OS), Darwin)
diff --git a/make/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk
index 170a2c25553..6447da8cb6b 100644
--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@@ -70,9 +70,9 @@ BUILD_JAVA_FLAGS := $(JAVA_FLAGS_BIG)
 
 ################################################################################
 # Hard-coded values copied from spec.gmk.in.
-X:=
-SPACE:=$(X) $(X)
-COMMA:=,
+X :=
+SPACE := $(X) $(X)
+COMMA := ,
 MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
     MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" LOG_LEVEL=$(LOG_LEVEL)
 BASH_ARGS := -o pipefail -e
diff --git a/make/SourceRevision.gmk b/make/SourceRevision.gmk
index 63bbe5b62fb..79c438987f7 100644
--- a/make/SourceRevision.gmk
+++ b/make/SourceRevision.gmk
@@ -64,7 +64,7 @@ ifeq ($(USE_SCM), true)
 
   # Verify that the entire forest is consistent
   $(foreach repo, $(call FindAllReposRel), \
-    $(if $(wildcard $(TOPDIR)/$(repo)/$(SCM_DIR)),, \
+    $(if $(wildcard $(TOPDIR)/$(repo)/$(SCM_DIR)), , \
         $(error Inconsistent revision control: $(repo) is missing $(SCM_DIR) directory)) \
   )
 
@@ -72,7 +72,7 @@ ifeq ($(USE_SCM), true)
   MakeFilenameFromRepo = \
       $(strip $(subst .,top, $(subst /,-, $1)))
 
-  ################################################################################
+  ##############################################################################
   # SetupGetRevisionForRepo defines a make rule for creating a file containing
   # the name of the repository and the output of the scm command for that
   # repository.
diff --git a/make/StaticLibsImage.gmk b/make/StaticLibsImage.gmk
index 84e97b13b29..6a85701a788 100644
--- a/make/StaticLibsImage.gmk
+++ b/make/StaticLibsImage.gmk
@@ -41,9 +41,9 @@ ALL_MODULES = $(call FindAllModules)
 TARGETS :=
 
 ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
-  IMAGE_DEST_DIR=$(STATIC_LIBS_IMAGE_DIR)/lib
+  IMAGE_DEST_DIR = $(STATIC_LIBS_IMAGE_DIR)/lib
 else ifneq ($(filter static-libs-graal-image, $(MAKECMDGOALS)), )
-  IMAGE_DEST_DIR=$(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib
+  IMAGE_DEST_DIR = $(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib
 endif
 
 # Copy JDK static libs to the image.
diff --git a/make/TestImage.gmk b/make/TestImage.gmk
index f6d680fb690..e503f1cea2c 100644
--- a/make/TestImage.gmk
+++ b/make/TestImage.gmk
@@ -31,7 +31,7 @@ include MakeBase.gmk
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, TestImage-pre.gmk))
 
-############################################################################
+################################################################################
 
 BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties
 
diff --git a/make/ToolsHotspot.gmk b/make/ToolsHotspot.gmk
index 17963de7839..df779d961fd 100644
--- a/make/ToolsHotspot.gmk
+++ b/make/ToolsHotspot.gmk
@@ -42,6 +42,6 @@ BUILD_TOOLS_HOTSPOT := $(call SetupJavaCompilationCompileTarget, \
 TOOL_JFR_GEN := $(JAVA_SMALL) -cp $(HOTSPOT_TOOLS_OUTPUTDIR) \
     build.tools.jfr.GenerateJfrFiles
 
-##########################################################################################
+################################################################################
 
 endif # _TOOLS_HOTSPOT_GMK
diff --git a/make/ToolsJdk.gmk b/make/ToolsJdk.gmk
index e7cc3fc8711..402c6841191 100644
--- a/make/ToolsJdk.gmk
+++ b/make/ToolsJdk.gmk
@@ -128,14 +128,14 @@ TOOL_PUBLICSUFFIXLIST = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_clas
 TOOL_FIXUPPANDOC = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.fixuppandoc.Main
 
-##########################################################################################
+################################################################################
 
 # Executable javascript filter for man page generation using pandoc.
 
 PANDOC_TROFF_MANPAGE_FILTER := $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-troff-manpage-filter
 PANDOC_HTML_MANPAGE_FILTER := $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-html-manpage-filter
 
-##########################################################################################
+################################################################################
 
 # Hook to include the corresponding custom post file, if present.
 $(eval $(call IncludeCustomExtension, ToolsJdk-post.gmk))
diff --git a/make/ZipSecurity.gmk b/make/ZipSecurity.gmk
index 00b552fae0a..373ba13ecc6 100644
--- a/make/ZipSecurity.gmk
+++ b/make/ZipSecurity.gmk
@@ -29,11 +29,11 @@ include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
 
-##########################################################################################
+################################################################################
 #
 # sec-bin.zip is used by builds where the corresponding sources are not available
 #
-$(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
+$(eval $(call SetupZipArchive, BUILD_SEC_BIN_ZIP, \
     SRC := $(JDK_OUTPUTDIR), \
     INCLUDES := \
         modules/java.base/javax/crypto \
@@ -60,20 +60,22 @@ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
         modules/java.security.jgss/sun/security/krb5/internal/util, \
     INCLUDE_FILES := modules/java.security.jgss/sun/security/jgss/spi/GSSContextSpi.class, \
     EXCLUDES := modules/java.security.jgss/sun/security/krb5/internal/tools, \
-    ZIP := $(IMAGES_OUTPUTDIR)/sec-bin.zip))
+    ZIP := $(IMAGES_OUTPUTDIR)/sec-bin.zip, \
+))
 
 TARGETS += $(IMAGES_OUTPUTDIR)/sec-bin.zip
 
-##########################################################################################
+################################################################################
 #
 # Windows specific binary security packages.
 #
 ifeq ($(call isTargetOs, windows), true)
   # sec-windows-bin.zip is used by builds where the corresponding sources are not available
-  $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \
+  $(eval $(call SetupZipArchive, BUILD_SEC_WINDOWS_BIN_ZIP, \
       SRC := $(JDK_OUTPUTDIR), \
       INCLUDES := modules/java.security.jgss/sun/security/krb5/internal/tools, \
-      ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip))
+      ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip, \
+  ))
 
   TARGETS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
 
@@ -84,18 +86,19 @@ ifeq ($(call isTargetOs, windows), true)
     JGSS_ZIP_NAME = jgss-windows-i586-bin.zip
   endif
 
-  $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP, \
+  $(eval $(call SetupZipArchive, BUILD_JGSS_BIN_ZIP, \
       SRC := $(SUPPORT_OUTPUTDIR), \
       INCLUDE_FILES := modules_libs/java.security.jgss/w2k_lsa_auth.dll \
           modules_libs/java.security.jgss/w2k_lsa_auth.dll.diz \
           modules_libs/java.security.jgss/w2k_lsa_auth.dll.map \
           modules_libs/java.security.jgss/w2k_lsa_auth.dll.pdb, \
-      ZIP := $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
+      ZIP := $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME), \
+  ))
 
   TARGETS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)
 endif
 
-##########################################################################################
+################################################################################
 
 all: $(TARGETS)
 
diff --git a/make/autoconf/Makefile.template b/make/autoconf/Makefile.template
index 4cb5057c05c..ee33d0dfb9e 100644
--- a/make/autoconf/Makefile.template
+++ b/make/autoconf/Makefile.template
@@ -23,5 +23,5 @@
 
 # This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
 # GENERATED FILE, DO NOT EDIT
-SPEC:=@OUTPUTDIR@/spec.gmk
+SPEC := @OUTPUTDIR@/spec.gmk
 include @WORKSPACE_ROOT@/Makefile
diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index 91d7a550108..585575240ea 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -26,7 +26,7 @@
 m4_include([basic_tools.m4])
 m4_include([basic_windows.m4])
 
-###############################################################################
+################################################################################
 AC_DEFUN_ONCE([BASIC_INIT],
 [
   # Save the original command line. This is passed to us by the wrapper configure script.
@@ -46,7 +46,7 @@ AC_DEFUN_ONCE([BASIC_INIT],
   AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
 ])
 
-###############################################################################
+################################################################################
 # Check that there are no unprocessed overridden variables left.
 # If so, they are an incorrect argument and we will exit with an error.
 AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
@@ -58,7 +58,7 @@ AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
 # Make sure to only use tools set up in BASIC_SETUP_FUNDAMENTAL_TOOLS.
 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
@@ -102,7 +102,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   AUTOCONF_DIR=$TOPDIR/make/autoconf
 ])
 
-###############################################################################
+################################################################################
 # Setup what kind of build environment type we have (CI or local developer)
 AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
 [
@@ -141,7 +141,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
   AC_SUBST(LOCALE_USED)
 ])
 
-###############################################################################
+################################################################################
 # Evaluates platform specific overrides for devkit variables.
 # $1: Name of variable
 AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
@@ -151,7 +151,7 @@ AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Evaluates platform specific overrides for build devkit variables.
 # $1: Name of variable
 AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
@@ -161,7 +161,7 @@ AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
   fi
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN([BASIC_SETUP_XCODE_SYSROOT],
 [
   AC_MSG_CHECKING([for sdk name])
@@ -246,7 +246,7 @@ AC_DEFUN([BASIC_SETUP_XCODE_SYSROOT],
   fi
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
 [
   AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
@@ -380,7 +380,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   AC_MSG_RESULT([$EXTRA_PATH])
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
 [
 
@@ -477,7 +477,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
   AC_CONFIG_FILES([$OUTPUTDIR/Makefile:$AUTOCONF_DIR/Makefile.template])
 ])
 
-###############################################################################
+################################################################################
 # Check if build directory is on local disk. If not possible to determine,
 # we prefer to claim it's local.
 # Argument 1: directory to test
@@ -514,7 +514,7 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Check that source files have basic read permissions set. This might
 # not be the case in cygwin in certain conditions.
 AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
@@ -529,7 +529,7 @@ AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
   fi
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
 [
   AC_MSG_CHECKING([if build directory is on local disk])
@@ -572,7 +572,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_MAKE_TARGET],
   AC_SUBST(DEFAULT_MAKE_TARGET)
 ])
 
-###############################################################################
+################################################################################
 # Setup the default value for LOG=
 #
 AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_LOG],
@@ -591,7 +591,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_LOG],
   AC_SUBST(DEFAULT_LOG)
 ])
 
-###############################################################################
+################################################################################
 # Code to run after AC_OUTPUT
 AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
 [
diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4
index 884d0ea5aa5..6bfaecb2e69 100644
--- a/make/autoconf/basic_tools.m4
+++ b/make/autoconf/basic_tools.m4
@@ -23,12 +23,12 @@
 # questions.
 #
 
-###############################################################################
+################################################################################
 # It is recommended to use exactly this version of pandoc, especially for
 # re-generating checked in html files
 RECOMMENDED_PANDOC_VERSION=2.19.2
 
-###############################################################################
+################################################################################
 # Setup the most fundamental tools, used for setting up build platform and
 # path handling.
 AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
@@ -59,7 +59,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
 ])
 
-###############################################################################
+################################################################################
 # Setup further tools that should be resolved early but after setting up
 # build platform and path handling.
 AC_DEFUN_ONCE([BASIC_SETUP_TOOLS],
@@ -116,7 +116,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_TOOLS],
   RM="$RM -f"
 ])
 
-###############################################################################
+################################################################################
 # Check if we have found a usable version of make
 # $1: the path to a potential make binary (or empty)
 # $2: the description on how we found this
@@ -176,7 +176,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
   fi
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
 [
   # Check if make supports the output sync option and if so, setup using it.
@@ -201,7 +201,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
   AC_SUBST(OUTPUT_SYNC)
 ])
 
-###############################################################################
+################################################################################
 # Goes looking for a usable version of GNU make.
 AC_DEFUN([BASIC_CHECK_GNU_MAKE],
 [
@@ -249,7 +249,7 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
   BASIC_CHECK_MAKE_OUTPUT_SYNC
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN([BASIC_CHECK_FIND_DELETE],
 [
   # Test if find supports -delete
@@ -278,7 +278,7 @@ AC_DEFUN([BASIC_CHECK_FIND_DELETE],
   AC_SUBST(FIND_DELETE)
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN([BASIC_CHECK_TAR],
 [
   # Test which kind of tar was found
@@ -316,7 +316,7 @@ AC_DEFUN([BASIC_CHECK_TAR],
   AC_SUBST(TAR_SUPPORTS_TRANSFORM)
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN([BASIC_CHECK_GREP],
 [
   # Test that grep supports -Fx with a list of pattern which includes null pattern.
@@ -340,7 +340,7 @@ AC_DEFUN([BASIC_CHECK_GREP],
   fi
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 [
   BASIC_CHECK_GNU_MAKE
@@ -412,7 +412,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Check for support for specific options in bash
 AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS],
 [
diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
index 126eb45bb1a..d729012ad6a 100644
--- a/make/autoconf/boot-jdk.m4
+++ b/make/autoconf/boot-jdk.m4
@@ -23,7 +23,7 @@
 # questions.
 #
 
-########################################################################
+################################################################################
 # This file handles detection of the Boot JDK. The Boot JDK detection
 # process has been developed as a response to solve a complex real-world
 # problem. Initially, it was simple, but it has grown as platform after
@@ -49,7 +49,7 @@
 # JDK, and if one is found, check if it is acceptable. If not, we print
 # our reasons for rejecting it (useful when debugging non-working
 # configure situations) and continue checking the next one.
-########################################################################
+################################################################################
 
 # Execute the check given as argument, and verify the result
 # If the Boot JDK was previously found, do nothing
@@ -322,7 +322,7 @@ AC_DEFUN([BOOTJDK_SETUP_CLASSPATH],
   AC_SUBST(CLASSPATH)
 ])
 
-###############################################################################
+################################################################################
 #
 # We need a Boot JDK to bootstrap the build.
 #
diff --git a/make/autoconf/bootcycle-spec.gmk.template b/make/autoconf/bootcycle-spec.gmk.template
index d46621fd891..a476fe8a27e 100644
--- a/make/autoconf/bootcycle-spec.gmk.template
+++ b/make/autoconf/bootcycle-spec.gmk.template
@@ -34,10 +34,10 @@ include @SPEC@
 BOOT_JDK := $(JDK_IMAGE_DIR)
 
 # The bootcycle build has a different output directory
-OLD_OUTPUTDIR:=@OUTPUTDIR@
-OUTPUTDIR:=$(OLD_OUTPUTDIR)/bootcycle-build
+OLD_OUTPUTDIR := @OUTPUTDIR@
+OUTPUTDIR := $(OLD_OUTPUTDIR)/bootcycle-build
 # No spaces in patsubst to avoid leading space in variable
-JAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%,$(OUTPUTDIR)%,$(JAVAC_SERVER_DIR))
+JAVAC_SERVER_DIR := $(patsubst $(OLD_OUTPUTDIR)%,$(OUTPUTDIR)%,$(JAVAC_SERVER_DIR))
 
 JAVA_CMD := $(FIXPATH) $(BOOT_JDK)/bin/java
 JAVAC_CMD := $(FIXPATH) $(BOOT_JDK)/bin/javac
@@ -48,4 +48,3 @@ JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
 # By filtering out those JVM args, the bootcycle JVM will use its default
 # settings for CDS.
 JAVA_FLAGS := $(filter-out -XX:SharedArchiveFile% -Xshare%, $(JAVA_FLAGS))
-
diff --git a/make/autoconf/compare.sh.template b/make/autoconf/compare.sh.template
index ad53a44dc0e..bcb5608855a 100644
--- a/make/autoconf/compare.sh.template
+++ b/make/autoconf/compare.sh.template
@@ -26,7 +26,7 @@
 # the root of the build directory.
 
 
-##########################################################################################
+################################################################################
 # Substitutions from autoconf
 
 export LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index f7e9844a643..3ec95ba8181 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -23,11 +23,11 @@
 # questions.
 #
 
-###############################################################################
+################################################################################
 #
 # Includes and boilerplate
 #
-###############################################################################
+################################################################################
 
 
 AC_PREREQ([2.69])
@@ -63,14 +63,14 @@ m4_include([platform.m4])
 m4_include([source-dirs.m4])
 m4_include([toolchain.m4])
 
-###############################################################################
+################################################################################
 #
 # Initialization / Boot-strapping
 #
 # The bootstrapping process needs to solve the "chicken or the egg" problem,
 # thus it jumps back and forth, each time gaining something needed later on.
 #
-###############################################################################
+################################################################################
 
 # If we are requested to print additional help, do that and then exit.
 # This must be the very first call.
@@ -128,51 +128,51 @@ PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION
 BASIC_SETUP_DEFAULT_MAKE_TARGET
 BASIC_SETUP_DEFAULT_LOG
 
-###############################################################################
+################################################################################
 #
 # Determine OpenJDK variants and version numbers.
 #
-###############################################################################
+################################################################################
 
 # We need build & target for this.
 JDKOPT_SETUP_JMOD_OPTIONS
 JDKOPT_SETUP_JLINK_OPTIONS
 JDKVER_SETUP_JDK_VERSION_NUMBERS
 
-###############################################################################
+################################################################################
 #
 # Setup BootJDK, used to bootstrap the build.
 #
-###############################################################################
+################################################################################
 
 BOOTJDK_SETUP_BOOT_JDK
 BOOTJDK_SETUP_BUILD_JDK
 BOOTJDK_SETUP_DOCS_REFERENCE_JDK
 
-###############################################################################
+################################################################################
 #
 # Determine JDK specific build time options.
 #
-###############################################################################
+################################################################################
 
 JDKOPT_SETUP_REPRODUCIBLE_BUILD
 JDKOPT_SETUP_JDK_OPTIONS
 
-###############################################################################
+################################################################################
 #
 # Configure the sources to use. We can add or override individual directories.
 #
-###############################################################################
+################################################################################
 
 SRCDIRS_SETUP_DIRS
 SRCDIRS_SETUP_IMPORT_MODULES
 
-###############################################################################
+################################################################################
 #
 # Setup the toolchain (compilers etc), i.e. tools used to compile and process
 # native code.
 #
-###############################################################################
+################################################################################
 
 # See if we are doing a complete static build or not
 JDKOPT_SETUP_STATIC_BUILD
@@ -227,31 +227,31 @@ JDKOPT_SETUP_LEAK_SANITIZER
 # This needs to go before 'LIB_DETERMINE_DEPENDENCIES'
 JDKOPT_SETUP_FALLBACK_LINKER
 
-###############################################################################
+################################################################################
 #
 # Check dependencies for external and internal libraries.
 #
-###############################################################################
+################################################################################
 
 LIB_DETERMINE_DEPENDENCIES
 LIB_SETUP_LIBRARIES
 
-###############################################################################
+################################################################################
 #
 # Setup hotspot and JVM features (needs toolchain).
 #
-###############################################################################
+################################################################################
 
 JVM_FEATURES_PARSE_OPTIONS
 JVM_FEATURES_SETUP
 
 HOTSPOT_SETUP_MISC
 
-###############################################################################
+################################################################################
 #
 # We need to do some final tweaking, when everything else is done.
 #
-###############################################################################
+################################################################################
 
 LIB_TESTS_ENABLE_DISABLE_FAILURE_HANDLER
 LIB_TESTS_ENABLE_DISABLE_JTREG_TEST_THREAD_FACTORY
@@ -263,12 +263,12 @@ JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE
 JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT
 JDKOPT_SETUP_MACOSX_SIGNING
 
-###############################################################################
+################################################################################
 #
 # Configure parts of the build that only affect the build performance,
 # not the result.
 #
-###############################################################################
+################################################################################
 
 BPERF_SETUP_BUILD_CORES
 BPERF_SETUP_BUILD_MEMORY
@@ -288,11 +288,11 @@ BPERF_SETUP_PRECOMPILED_HEADERS
 # Setup use of ccache, if available
 BPERF_SETUP_CCACHE
 
-###############################################################################
+################################################################################
 #
 # And now the finish...
 #
-###############################################################################
+################################################################################
 
 # Check for some common pitfalls
 BASIC_TEST_USABILITY_ISSUES
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 074ddce89b7..992a0282c04 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -480,7 +480,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   # Always enable optional macros for VM.
   ALWAYS_CFLAGS_JVM="-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS"
 
-  ###############################################################################
+  ##############################################################################
 
   # Adjust flags according to debug level.
   # Setup debug/release defines
@@ -514,7 +514,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     ALWAYS_DEFINES_JVM="$ALWAYS_DEFINES -DNOMINMAX"
   fi
 
-  ###############################################################################
+  ##############################################################################
   #
   #
   # CFLAGS BASIC
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index adbf538fd7d..a95ed1fbacd 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -26,7 +26,7 @@
 # All valid JVM variants
 VALID_JVM_VARIANTS="server client minimal core zero custom"
 
-###############################################################################
+################################################################################
 # Check if the specified JVM variant should be built. To be used in shell if
 # constructs, like this:
 # if HOTSPOT_CHECK_JVM_VARIANT(server); then
@@ -38,7 +38,7 @@ VALID_JVM_VARIANTS="server client minimal core zero custom"
 AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT],
 [ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ])
 
-###############################################################################
+################################################################################
 # Check which variants of the JVM that we want to build. Available variants are:
 #   server: normal interpreter, and a tiered C1/C2 compiler
 #   client: normal interpreter, and C1 (no C2 compiler)
@@ -102,7 +102,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
   AC_SUBST(JVM_VARIANT_MAIN)
 ])
 
-###############################################################################
+################################################################################
 # Misc hotspot setup that does not fit elsewhere.
 #
 AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index fac7f76de23..11c55c78930 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -23,7 +23,7 @@
 # questions.
 #
 
-###############################################################################
+################################################################################
 # Set the debug level
 #    release: no debug information, all optimizations, no asserts.
 #    optimized: no debug information, all optimizations, no asserts, HotSpot target is 'optimized'.
@@ -81,7 +81,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL],
   AC_SUBST(DEBUG_LEVEL)
 ])
 
-###############################################################################
+################################################################################
 #
 # Should we build only OpenJDK even if closed sources are present?
 #
@@ -246,7 +246,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
 
 ])
 
-###############################################################################
+################################################################################
 
 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
 [
@@ -410,7 +410,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE],
   AC_SUBST(JCOV_FILTERS)
 ])
 
-###############################################################################
+################################################################################
 #
 # AddressSanitizer
 #
@@ -467,7 +467,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
   AC_SUBST(ASAN_ENABLED)
 ])
 
-###############################################################################
+################################################################################
 #
 # LeakSanitizer
 #
@@ -500,7 +500,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER],
   AC_SUBST(LSAN_ENABLED)
 ])
 
-###############################################################################
+################################################################################
 #
 # UndefinedBehaviorSanitizer
 #
diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4
index 7f73a085bd7..297a6e83b5c 100644
--- a/make/autoconf/jdk-version.m4
+++ b/make/autoconf/jdk-version.m4
@@ -23,7 +23,7 @@
 # questions.
 #
 
-###############################################################################
+################################################################################
 #
 # Setup version numbers
 #
diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
index bdf92d701b9..bd33315090f 100644
--- a/make/autoconf/jvm-features.m4
+++ b/make/autoconf/jvm-features.m4
@@ -23,7 +23,7 @@
 # questions.
 #
 
-###############################################################################
+################################################################################
 # Terminology used in this file:
 #
 # Valid features      == All possible features that the JVM knows about.
@@ -36,7 +36,7 @@
 #
 # All valid features are considered available, unless listed as unavailable.
 # All available features will be turned on as default, unless listed in a filter.
-###############################################################################
+################################################################################
 
 # We need these as m4 defines to be able to loop over them using m4 later on.
 
@@ -78,7 +78,7 @@ m4_define(jvm_feature_desc_vm_structs, [export JVM structures to the Serviceabli
 m4_define(jvm_feature_desc_zero, [support building variant 'zero'])
 m4_define(jvm_feature_desc_zgc, [include the Z garbage collector])
 
-###############################################################################
+################################################################################
 # Parse command line options for JVM feature selection. After this function
 # has run $JVM_FEATURES_ENABLED, $JVM_FEATURES_DISABLED and $JVM_FEATURES_VALID
 # can be used.
@@ -199,7 +199,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_PARSE_OPTIONS],
   AC_SUBST(VALID_JVM_FEATURES)
 ])
 
-###############################################################################
+################################################################################
 # Helper function for the JVM_FEATURES_CHECK_* suite.
 # The code in the code block should assign 'false' to the variable AVAILABLE
 # if the feature is not available, and this function will handle everything
@@ -225,7 +225,7 @@ AC_DEFUN([JVM_FEATURES_CHECK_AVAILABILITY],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Check if the feature 'cds' is available on this platform.
 #
 AC_DEFUN_ONCE([JVM_FEATURES_CHECK_CDS],
@@ -241,7 +241,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_CDS],
   ])
 ])
 
-###############################################################################
+################################################################################
 # Check if the feature 'dtrace' is available on this platform.
 #
 AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
@@ -270,7 +270,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
   ])
 ])
 
-###############################################################################
+################################################################################
 # Check if the feature 'jvmci' is available on this platform.
 #
 AC_DEFUN_ONCE([JVM_FEATURES_CHECK_JVMCI],
@@ -290,7 +290,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_JVMCI],
   ])
 ])
 
-###############################################################################
+################################################################################
 # Check if the feature 'shenandoahgc' is available on this platform.
 #
 AC_DEFUN_ONCE([JVM_FEATURES_CHECK_SHENANDOAHGC],
@@ -309,7 +309,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_SHENANDOAHGC],
   ])
 ])
 
-###############################################################################
+################################################################################
 # Check if the feature 'zgc' is available on this platform.
 #
 AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
@@ -365,7 +365,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
   ])
 ])
 
-###############################################################################
+################################################################################
 # Setup JVM_FEATURES_PLATFORM_UNAVAILABLE and JVM_FEATURES_PLATFORM_FILTER
 # to contain those features that are unavailable, or should be off by default,
 # for this platform, regardless of JVM variant.
@@ -383,7 +383,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_PREPARE_PLATFORM],
 
 ])
 
-###############################################################################
+################################################################################
 # Setup JVM_FEATURES_VARIANT_UNAVAILABLE and JVM_FEATURES_VARIANT_FILTER
 # to contain those features that are unavailable, or should be off by default,
 # for this particular JVM variant.
@@ -431,7 +431,7 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Calculate the actual set of active JVM features for this JVM variant. Store
 # the result in JVM_FEATURES_ACTIVE.
 #
@@ -479,7 +479,7 @@ AC_DEFUN([JVM_FEATURES_CALCULATE_ACTIVE],
       $JVM_FEATURES_ENABLED, $JVM_FEATURES_DISABLED)
 ])
 
-###############################################################################
+################################################################################
 # Helper function for JVM_FEATURES_VERIFY. Check if the specified JVM
 # feature is active. To be used in shell if constructs, like this:
 # 'if JVM_FEATURES_IS_ACTIVE(jvmti); then'
@@ -489,7 +489,7 @@ AC_DEFUN([JVM_FEATURES_CALCULATE_ACTIVE],
 AC_DEFUN([JVM_FEATURES_IS_ACTIVE],
 [ [ [[ " $JVM_FEATURES_ACTIVE " =~ ' '$1' ' ]] ] ])
 
-###############################################################################
+################################################################################
 # Verify that the resulting set of features is consistent and legal.
 #
 # arg 1: JVM variant
@@ -527,7 +527,7 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Set up all JVM features for each enabled JVM variant. Requires that
 # JVM_FEATURES_PARSE_OPTIONS has been called.
 #
diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4
index 955b8c9ba83..ffbc7d05310 100644
--- a/make/autoconf/lib-tests.m4
+++ b/make/autoconf/lib-tests.m4
@@ -31,7 +31,7 @@
 JTREG_MINIMUM_VERSION=7.4
 GTEST_MINIMUM_VERSION=1.14.0
 
-###############################################################################
+################################################################################
 #
 # Setup and check for gtest framework source files
 #
@@ -74,7 +74,7 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_GTEST],
   AC_SUBST(GTEST_FRAMEWORK_SRC)
 ])
 
-###############################################################################
+################################################################################
 #
 # Setup and check the Java Microbenchmark Harness
 #
diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index 4d84269d697..9ca808c4c17 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -678,7 +678,7 @@ AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
 [
-  ###############################################################################
+  ##############################################################################
 
   # Note that this is the build platform OS version!
 
@@ -693,7 +693,7 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
 [
-  ###############################################################################
+  ##############################################################################
   #
   # Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code.
   # (The JVM can use 32 or 64 bit Java pointers but that decision
@@ -739,7 +739,7 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS],
 [
-  ###############################################################################
+  ##############################################################################
   #
   # Is the target little or big endian?
   #
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 79a541dc78c..d5e08cdb640 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -272,7 +272,7 @@ VERSION_CFLAGS = \
     -DVERSION_CLASSFILE_MINOR=$(VERSION_CLASSFILE_MINOR) \
     #
 
-ifneq ($(COMPANY_NAME),)
+ifneq ($(COMPANY_NAME), )
   # COMPANY_NAME is set to "N/A" in make/conf/branding.conf by default,
   # but can be customized with the '--with-vendor-name' configure option.
   # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
@@ -288,13 +288,13 @@ endif
 # Only export VENDOR_URL, VENDOR_URL_BUG and VENDOR_VM_URL_BUG to the build if
 # they are not empty. Otherwise, default values which are defined in the sources
 # will be used.
-ifneq ($(VENDOR_URL),)
+ifneq ($(VENDOR_URL), )
   VERSION_CFLAGS += -DVENDOR_URL='"$(VENDOR_URL)"'
 endif
-ifneq ($(VENDOR_URL_BUG),)
+ifneq ($(VENDOR_URL_BUG), )
   VERSION_CFLAGS += -DVENDOR_URL_BUG='"$(VENDOR_URL_BUG)"'
 endif
-ifneq ($(VENDOR_URL_VM_BUG),)
+ifneq ($(VENDOR_URL_VM_BUG), )
   VERSION_CFLAGS += -DVENDOR_URL_VM_BUG='"$(VENDOR_URL_VM_BUG)"'
 endif
 
@@ -804,11 +804,7 @@ UCRT_DLL_DIR := @UCRT_DLL_DIR@
 ENABLE_PANDOC := @ENABLE_PANDOC@
 PANDOC_MARKDOWN_FLAG := @PANDOC_MARKDOWN_FLAG@
 
-####################################################
-#
 # Libraries
-#
-
 USE_EXTERNAL_LCMS := @USE_EXTERNAL_LCMS@
 LCMS_CFLAGS := @LCMS_CFLAGS@
 LCMS_LIBS := @LCMS_LIBS@
@@ -821,11 +817,7 @@ USE_EXTERNAL_LIBPNG := @USE_EXTERNAL_LIBPNG@
 PNG_LIBS := @PNG_LIBS@
 PNG_CFLAGS := @PNG_CFLAGS@
 
-####################################################
-#
 # Misc
-#
-
 INCLUDE_SA := @INCLUDE_SA@
 INCLUDE_JVMCI := @INCLUDE_JVMCI@
 INCLUDE_COMPILER2 := @INCLUDE_COMPILER2@
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index 12d450cc708..75c8d2b61d0 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -23,14 +23,14 @@
 # questions.
 #
 
-########################################################################
+################################################################################
 # This file is responsible for detecting, verifying and setting up the
 # toolchain, i.e. the compiler, linker and related utilities. It will setup
 # proper paths to the binaries, but it will not setup any flags.
 #
 # The binaries used is determined by the toolchain type, which is the family of
 # compilers and related tools that are used.
-########################################################################
+################################################################################
 
 m4_include([toolchain_microsoft.m4])
 
diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4
index 3fae951224e..6beadb4c942 100644
--- a/make/autoconf/util.m4
+++ b/make/autoconf/util.m4
@@ -25,7 +25,7 @@
 
 m4_include([util_paths.m4])
 
-###############################################################################
+################################################################################
 # Create a function/macro that takes a series of named arguments. The call is
 # similar to AC_DEFUN, but the setup of the function looks like this:
 # UTIL_DEFUN_NAMED([MYFUNC], [FOO *BAR], [$@], [
@@ -100,7 +100,7 @@ AC_DEFUN([UTIL_DEFUN_NAMED],
   ])
 ])
 
-###############################################################################
+################################################################################
 # Assert that a programmatic condition holds. If not, exit with an error message.
 # Check that a shell expression gives return code 0
 #
@@ -121,7 +121,7 @@ AC_DEFUN([UTIL_ASSERT_SHELL_TEST],
 ])
 
 
-###############################################################################
+################################################################################
 # Assert that a programmatic condition holds. If not, exit with an error message.
 # Check that two strings are equal.
 #
@@ -137,7 +137,7 @@ AC_DEFUN([UTIL_ASSERT_STRING_EQUALS],
       $3)
 ])
 
-###############################################################################
+################################################################################
 # Assert that a programmatic condition holds. If not, exit with an error message.
 # Check that two strings not are equal.
 #
@@ -153,7 +153,7 @@ AC_DEFUN([UTIL_ASSERT_STRING_NOT_EQUALS],
       $3)
 ])
 
-###############################################################################
+################################################################################
 # Assert that a programmatic condition holds. If not, exit with an error message.
 # Check that the given expression evaluates to the string 'true'
 #
@@ -165,7 +165,7 @@ AC_DEFUN([UTIL_ASSERT_TRUE],
   UTIL_ASSERT_STRING_EQUALS($1, true, $3)
 ])
 
-###############################################################################
+################################################################################
 # Assert that a programmatic condition holds. If not, exit with an error message.
 # Check that the given expression does not evaluate to the string 'true'
 #
@@ -177,7 +177,7 @@ AC_DEFUN([UTIL_ASSERT_NOT_TRUE],
   UTIL_ASSERT_STRING_NOT_EQUALS($1, true, $3)
 ])
 
-###############################################################################
+################################################################################
 # Check if a list of space-separated words are selected only from a list of
 # space-separated legal words. Typical use is to see if a user-specified
 # set of words is selected from a set of legal words.
@@ -204,7 +204,7 @@ AC_DEFUN([UTIL_GET_NON_MATCHING_VALUES],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Check if a list of space-separated words contains any word(s) from a list of
 # space-separated illegal words. Typical use is to see if a user-specified
 # set of words contains any from a set of illegal words.
@@ -231,7 +231,7 @@ AC_DEFUN([UTIL_GET_MATCHING_VALUES],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Converts an ISO-8601 date/time string to a unix epoch timestamp. If no
 # suitable conversion method was found, an empty string is returned.
 #
@@ -259,7 +259,7 @@ AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
   $1=$timestamp
 ])
 
-###############################################################################
+################################################################################
 # Sort a space-separated list, and remove duplicates.
 #
 # Sets the specified variable to the resulting list.
@@ -273,7 +273,7 @@ AC_DEFUN([UTIL_SORT_LIST],
   $1=${result//$'\n'/ }
 ])
 
-###############################################################################
+################################################################################
 # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
 # If so, then append $1 to $2 \
 # Also set JVM_ARG_OK to true/false depending on outcome.
@@ -294,7 +294,7 @@ AC_DEFUN([UTIL_ADD_JVM_ARG_IF_OK],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Register a --with argument but mark it as deprecated
 # $1: The name of the with argument to deprecate, not including --with-
 AC_DEFUN([UTIL_DEPRECATED_ARG_WITH],
@@ -304,7 +304,7 @@ AC_DEFUN([UTIL_DEPRECATED_ARG_WITH],
       [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
 ])
 
-###############################################################################
+################################################################################
 # Register a --enable argument but mark it as deprecated
 # $1: The name of the with argument to deprecate, not including --enable-
 AC_DEFUN([UTIL_DEPRECATED_ARG_ENABLE],
@@ -314,7 +314,7 @@ AC_DEFUN([UTIL_DEPRECATED_ARG_ENABLE],
       [AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])])
 ])
 
-###############################################################################
+################################################################################
 # Register an --enable-* argument as an alias for another argument.
 # $1: The name of the enable argument for the new alias, not including --enable-
 # $2: The full name of the argument of which to make this an alias, including
@@ -329,7 +329,7 @@ AC_DEFUN([UTIL_ALIASED_ARG_ENABLE],
   ])
 ])
 
-###############################################################################
+################################################################################
 # Creates a command-line option using the --enable-* pattern. Will return a
 # value of 'true' or 'false' in the RESULT variable, depending on whether the
 # option was enabled or not by the user. The option can not be turned on if it
@@ -471,7 +471,7 @@ UTIL_DEFUN_NAMED([UTIL_ARG_ENABLE],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Helper functions for ARG_WITH, to validate different types of argument
 
 # Dispatcher to call the correct UTIL_CHECK_TYPE_* function depending on the ARG_TYPE
@@ -575,7 +575,7 @@ AC_DEFUN([UTIL_CHECK_TYPE_features],
   ARG_RESULT=$($ECHO $feature_list)
 ])
 
-###############################################################################
+################################################################################
 # Creates a command-line option using the --with-* pattern. Will return a
 # string in the RESULT variable with the option provided by the user, or the
 # empty string if the --with-* option was not given. The option can not be given
@@ -810,7 +810,7 @@ UTIL_DEFUN_NAMED([UTIL_ARG_WITH],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Helper functions for CHECK_VALUE in ARG_WITH.
 AC_DEFUN([UTIL_CHECK_STRING_NON_EMPTY],
 [
diff --git a/make/autoconf/util_paths.m4 b/make/autoconf/util_paths.m4
index 8b2c776397b..d9277b7eb9c 100644
--- a/make/autoconf/util_paths.m4
+++ b/make/autoconf/util_paths.m4
@@ -23,7 +23,7 @@
 # questions.
 #
 
-###############################################################################
+################################################################################
 # Appends a string to a path variable, only adding the : when needed.
 AC_DEFUN([UTIL_APPEND_TO_PATH],
 [
@@ -36,7 +36,7 @@ AC_DEFUN([UTIL_APPEND_TO_PATH],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Prepends a string to a path variable, only adding the : when needed.
 AC_DEFUN([UTIL_PREPEND_TO_PATH],
 [
@@ -49,7 +49,7 @@ AC_DEFUN([UTIL_PREPEND_TO_PATH],
   fi
 ])
 
-###############################################################################
+################################################################################
 # This will make sure the given variable points to a full and proper
 # path. This means:
 # 1) There will be no spaces in the path. On unix platforms,
@@ -118,7 +118,7 @@ AC_DEFUN([UTIL_FIXUP_PATH],
   fi
 ])
 
-##############################################################################
+################################################################################
 # Fixup path to be a Windows full long path
 # Note: Only supported with cygwin/msys2 (cygpath tool)
 AC_DEFUN([UTIL_FIXUP_WIN_LONG_PATH],
@@ -136,7 +136,7 @@ AC_DEFUN([UTIL_FIXUP_WIN_LONG_PATH],
 ])
 
 
-###############################################################################
+################################################################################
 # Check if the given file is a unix-style or windows-style executable, that is,
 # if it expects paths in unix-style or windows-style.
 # Returns "windows" or "unix" in $RESULT.
@@ -170,7 +170,7 @@ AC_DEFUN([UTIL_CHECK_WINENV_EXEC_TYPE],
   fi
 ])
 
-###############################################################################
+################################################################################
 # This will make sure the given variable points to a executable
 # with a full and proper path. This means:
 # 1) There will be no spaces in the path. On unix platforms,
@@ -289,7 +289,7 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Setup a tool for the given variable. If correctly specified by the user,
 # use that value, otherwise search for the tool using the supplied code snippet.
 # $1: variable to set
@@ -369,7 +369,7 @@ AC_DEFUN([UTIL_SETUP_TOOL],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Locate a tool using proper methods.
 # $1: variable to set
 # $2: executable name (or list of names) to look for
@@ -436,7 +436,7 @@ AC_DEFUN([UTIL_LOOKUP_PROGS],
   ])
 ])
 
-###############################################################################
+################################################################################
 # Call UTIL_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool. This will look
 # first for cross-compilation tools.
 # $1: variable to set
@@ -452,7 +452,7 @@ AC_DEFUN([UTIL_LOOKUP_TOOLCHAIN_PROGS],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
 # $1: variable to check
 AC_DEFUN([UTIL_CHECK_NONEMPTY],
@@ -462,7 +462,7 @@ AC_DEFUN([UTIL_CHECK_NONEMPTY],
   fi
 ])
 
-###############################################################################
+################################################################################
 # Like UTIL_LOOKUP_PROGS but fails if no tool was found.
 # $1: variable to set
 # $2: executable name (or list of names) to look for
@@ -473,7 +473,7 @@ AC_DEFUN([UTIL_REQUIRE_PROGS],
   UTIL_CHECK_NONEMPTY($1)
 ])
 
-###############################################################################
+################################################################################
 # Like UTIL_LOOKUP_PROGS but fails if no tool was found.
 # $1: variable to set
 # $2: executable name (or list of names) to look for
@@ -485,7 +485,7 @@ AC_DEFUN([UTIL_REQUIRE_TOOLCHAIN_PROGS],
 ])
 
 
-###############################################################################
+################################################################################
 # Like UTIL_SETUP_TOOL but fails if no tool was found.
 # $1: variable to set
 # $2: autoconf macro to call to look for the special tool
@@ -497,7 +497,7 @@ AC_DEFUN([UTIL_REQUIRE_SPECIAL],
   # unix tools. No further processing needed.
 ])
 
-###############################################################################
+################################################################################
 # Add FIXPATH prefix to variable. Normally this is done by UTIL_LOOKUP_PROGS
 # or UTIL_FIXUP_EXECUTABLE, but in some circumstances this has to be done
 # explicitly, such as when the command in question does not exist yet.
@@ -510,7 +510,7 @@ AC_DEFUN([UTIL_ADD_FIXPATH],
   fi
 ])
 
-###############################################################################
+################################################################################
 AC_DEFUN([UTIL_REMOVE_SYMBOLIC_LINKS],
 [
   if test "x$OPENJDK_BUILD_OS" != xwindows; then
diff --git a/make/common/CopyFiles.gmk b/make/common/CopyFiles.gmk
index ac2ef69b4b1..4ed6c5906c7 100644
--- a/make/common/CopyFiles.gmk
+++ b/make/common/CopyFiles.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including CopyFiles.gmk)
 endif
 
diff --git a/make/common/Execute.gmk b/make/common/Execute.gmk
index 126e5066c49..abafe77a3c4 100644
--- a/make/common/Execute.gmk
+++ b/make/common/Execute.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including Execute.gmk)
 endif
 
diff --git a/make/common/FileUtils.gmk b/make/common/FileUtils.gmk
index ea1d0b6d4af..89cbe872721 100644
--- a/make/common/FileUtils.gmk
+++ b/make/common/FileUtils.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including FileUtils.gmk)
 endif
 
@@ -287,7 +287,7 @@ CacheFindFiles = \
 #
 # $1 - Directories to start search in
 FillFindCache = \
-    $(eval CacheFindFiles_NEW_DIRS := $$(filter-out $$(addsuffix /%,\
+    $(eval CacheFindFiles_NEW_DIRS := $$(filter-out $$(addsuffix /%, \
         $$(CacheFindFiles_CACHED_DIRS)) $$(CacheFindFiles_CACHED_DIRS), $1)) \
     $(if $(CacheFindFiles_NEW_DIRS), \
       $(eval CacheFindFiles_CACHED_DIRS += $$(patsubst %/,%,$$(CacheFindFiles_NEW_DIRS))) \
diff --git a/make/common/JarArchive.gmk b/make/common/JarArchive.gmk
index 25b42186666..68e9eaca32c 100644
--- a/make/common/JarArchive.gmk
+++ b/make/common/JarArchive.gmk
@@ -26,13 +26,13 @@
 ifndef _JAR_ARCHIVE_GMK
 _JAR_ARCHIVE_GMK := 1
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including JarArchive.gmk)
 endif
 
 include MakeIO.gmk
 
-FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
+FALSE_FIND_PATTERN := -name FILE_NAME_THAT_DOESNT_EXIST
 
 # Setup make rules for creating a jar archive.
 #
@@ -40,81 +40,81 @@ FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
 # and the targets generated are listed in a variable by that name.
 #
 # Remaining parameters are named arguments. These include:
-#   DEPENDENCIES:=List of dependencies for the jar target. If left empty,
+#   DEPENDENCIES List of dependencies for the jar target. If left empty,
 #       dependencies are calculated automatically from the source files found.
 #       For this to work, the source files must exist when the makefile is
 #       parsed.
-#   SRCS:=List of directories in where to find files to add to archive
-#   BIN:=Directory where to store build control files
-#   SUFFIXES:=File suffixes to include in jar
-#   INCLUDES:=List of directories/packages in SRCS that should be included
-#   EXCLUDES:=List of directories/packages in SRCS that should be excluded
-#   EXCLUDE_FILES:=List of files in SRCS that should be excluded
-#   EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
-#   JAR:=Jar file to create
-#   MANIFEST:=Optional manifest file template.
-#   JARMAIN:=Optional main class to add to manifest
-#   JARINDEX:=true means generate the index in the jar file.
-#   SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
+#   SRCS List of directories in where to find files to add to archive
+#   BIN Directory where to store build control files
+#   SUFFIXES File suffixes to include in jar
+#   INCLUDES List of directories/packages in SRCS that should be included
+#   EXCLUDES List of directories/packages in SRCS that should be excluded
+#   EXCLUDE_FILES List of files in SRCS that should be excluded
+#   EXTRA_FILES List of files in SRCS that should be included regardless of suffix match.
+#   JAR Jar file to create
+#   MANIFEST Optional manifest file template.
+#   JARMAIN Optional main class to add to manifest
+#   JARINDEX true means generate the index in the jar file.
+#   SKIP_METAINF Set to prevent contents of an META-INF directory to be automatically
 #       added to the archive.
-#   EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
+#   EXTRA_MANIFEST_ATTR Extra attribute to add to manifest.
 #   CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
-#   JAR_CMD:=Optionally override the jar command to use when creating the archive.
+#   JAR_CMD Optionally override the jar command to use when creating the archive.
 SetupJarArchive = $(NamedParamsMacroTemplate)
 define SetupJarArchiveBody
 
-  $1_JARMAIN:=$(strip $$($1_JARMAIN))
-  $1_JARNAME:=$$(notdir $$($1_JAR))
+  $1_JARMAIN := $(strip $$($1_JARMAIN))
+  $1_JARNAME := $$(notdir $$($1_JAR))
   $1_JAR_OUTPUT_DIR := $$(patsubst %/, %, $$(dir $$($1_JAR)))
   $$(call SetIfEmpty, $1_BIN, $$($1_JAR_OUTPUT_DIR))
-  $1_MANIFEST_FILE:=$$($1_BIN)/_the.$$($1_JARNAME)_manifest
-  $1_DELETESS_FILE:=$$($1_BIN)/_the.$$($1_JARNAME)_deletess
-  $1_DELETES_FILE:=$$($1_BIN)/_the.$$($1_JARNAME)_deletes
+  $1_MANIFEST_FILE := $$($1_BIN)/_the.$$($1_JARNAME)_manifest
+  $1_DELETESS_FILE := $$($1_BIN)/_the.$$($1_JARNAME)_deletess
+  $1_DELETES_FILE := $$($1_BIN)/_the.$$($1_JARNAME)_deletes
   $$(call SetIfEmpty, $1_JAR_CMD, $$(JAR))
 
-  ifeq (,$$($1_SUFFIXES))
+  ifeq ($$($1_SUFFIXES), )
     # No suffix was set, default to classes.
-    $1_SUFFIXES:=.class
+    $1_SUFFIXES := .class
   endif
   # Convert suffixes to a find expression
-  $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
+  $1_FIND_PATTERNS := $(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
   # On windows, a lot of includes/excludes risk making the command line too long, so
   # writing the grep patterns to files.
   # Grep returns 1 if nothing is matched. Do not fail the build for this.
-  ifneq (,$$($1_INCLUDES))
-    $1_GREP_INCLUDE_PATTERNS:=$$(call EscapeDollar, \
+  ifneq ($$($1_INCLUDES), )
+    $1_GREP_INCLUDE_PATTERNS := $$(call EscapeDollar, \
         $$(foreach src,$$($1_SRCS), $$(addprefix $$(src)/,$$($1_INCLUDES))))
     # If there are a lot of include patterns, output to file to shorten command lines
-    ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
-      $1_GREP_INCLUDES:=| ( $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) \
+    ifeq ($$(word 20, $$($1_GREP_INCLUDE_PATTERNS)), )
+      $1_GREP_INCLUDES := | ( $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) \
           || test "$$$$?" = "1" )
     else
       $1_GREP_INCLUDE_OUTPUT = \
-          $$(eval $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS, \
+          $$(eval $$(call ListPathsSafely, $1_GREP_INCLUDE_PATTERNS, \
               $$($1_BIN)/_the.$$($1_JARNAME)_include))
-      $1_GREP_INCLUDES:=| ( $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include \
+      $1_GREP_INCLUDES := | ( $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include \
           || test "$$$$?" = "1" )
     endif
   endif
-  ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
-    $1_GREP_EXCLUDE_PATTERNS:=$$(call EscapeDollar, \
-        $$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
+  ifneq ($$($1_EXCLUDES)$$($1_EXCLUDE_FILES), )
+    $1_GREP_EXCLUDE_PATTERNS := $$(call EscapeDollar, \
+        $$(foreach src, $$($1_SRCS), $$(addprefix $$(src)/, \
         $$($1_EXCLUDES) $$($1_EXCLUDE_FILES))))
     # If there are a lot of include patterns, output to file to shorten command lines
-    ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
-      $1_GREP_EXCLUDES:=| ( $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) \
+    ifeq ($$(word 20, $$($1_GREP_EXCLUDE_PATTERNS)), )
+      $1_GREP_EXCLUDES := | ( $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) \
           || test "$$$$?" = "1" )
     else
       $1_GREP_EXCLUDE_OUTPUT = \
-          $$(eval $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS, \
+          $$(eval $$(call ListPathsSafely, $1_GREP_EXCLUDE_PATTERNS, \
               $$($1_BIN)/_the.$$($1_JARNAME)_exclude))
-      $1_GREP_EXCLUDES:=| ( $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude \
+      $1_GREP_EXCLUDES := | ( $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude \
           || test "$$$$?" = "1" )
     endif
   endif
 
   # Check if this jar needs to have its index generated.
-  ifneq (,$$($1_JARINDEX))
+  ifneq ($$($1_JARINDEX), )
     $1_JARINDEX = (cd $$(dir $$@) && $$($1_JAR_CMD) -i $$(notdir $$@))
   else
     $1_JARINDEX = true
@@ -127,19 +127,19 @@ define SetupJarArchiveBody
     # Add all source roots to the find cache since we are likely going to run find
     # on these more than once. The cache will only be updated if necessary.
     $$(call FillFindCache, $$($1_FIND_LIST))
-    $1_DEPENDENCIES:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
-        $$(call FindFiles,$$($1_SRCS)))
-    ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
-      $1_DEPENDENCIES:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPENDENCIES))
+    $1_DEPENDENCIES := $$(filter $$(addprefix %, $$($1_SUFFIXES)), \
+        $$(call FindFiles, $$($1_SRCS)))
+    ifneq ($$($1_GREP_INCLUDE_PATTERNS), )
+      $1_DEPENDENCIES := $$(filter $$(addsuffix %, $$($1_GREP_INCLUDE_PATTERNS)), $$($1_DEPENDENCIES))
     endif
-    ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
-      $1_DEPENDENCIES:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPENDENCIES))
+    ifneq ($$($1_GREP_EXCLUDE_PATTERNS), )
+      $1_DEPENDENCIES := $$(filter-out $$(addsuffix %, $$($1_GREP_EXCLUDE_PATTERNS)), $$($1_DEPENDENCIES))
     endif
     # Look for EXTRA_FILES in all SRCS dirs and as absolute paths.
-    $1_DEPENDENCIES+=$$(wildcard $$(foreach src, $$($1_SRCS), \
+    $1_DEPENDENCIES += $$(wildcard $$(foreach src, $$($1_SRCS), \
         $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))
-    ifeq (,$$($1_SKIP_METAINF))
-      $1_DEPENDENCIES+=$$(call FindFiles,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
+    ifeq ($$($1_SKIP_METAINF), )
+      $1_DEPENDENCIES += $$(call FindFiles, $$(wildcard $$(addsuffix /META-INF, $$($1_SRCS))))
     endif
   endif
   # The dependency list should never be empty
@@ -156,23 +156,23 @@ define SetupJarArchiveBody
   # into -C <dir> <file> lines.
   # The EXTRA_FILES_RESOLVED variable must be set in the macro so that it's evaluated
   # in the recipe when the files are guaranteed to exist.
-  $1_CAPTURE_EXTRA_FILES=\
-      $$(eval $1_EXTRA_FILES_RESOLVED:=$$(call DoubleDollar, \
+  $1_CAPTURE_EXTRA_FILES = \
+      $$(eval $1_EXTRA_FILES_RESOLVED := $$(call DoubleDollar, \
           $$(wildcard $$(foreach src, $$($1_SRCS), \
           $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES)))) \
       $$(if $$($1_EXTRA_FILES_RESOLVED), \
-        $$(eval $$(call ListPathsSafely,$1_EXTRA_FILES_RESOLVED, \
+        $$(eval $$(call ListPathsSafely, $1_EXTRA_FILES_RESOLVED, \
             $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra)) \
-        $(SED) $$(foreach src,$$($1_SRCS), -e 's|$$(src)/|-C $$(src) |g') \
+        $(SED) $$(foreach src, $$($1_SRCS), -e 's|$$(src)/|-C $$(src) |g') \
             $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra \
             >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE))
 
   # The capture contents macro finds all files (matching the patterns, typically
   # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_CAPTURE_CONTENTS=\
+  $1_CAPTURE_CONTENTS = \
       $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \
-      $$(foreach src,$$($1_SRCS), \
+      $$(foreach src, $$($1_SRCS), \
         $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
           $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \
         >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \
@@ -180,19 +180,19 @@ define SetupJarArchiveBody
 
   # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
   # Find returns non zero if the META-INF dir does not exist, ignore this.
-  ifeq (,$$($1_SKIP_METAINF))
-    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS), \
+  ifeq ($$($1_SKIP_METAINF), )
+    $1_CAPTURE_METAINF = $$(foreach src, $$($1_SRCS), \
         ( ( $(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null || true ) \
             | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
         $$($1_BIN)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE) )
   endif
   # The capture deletes macro finds all deleted files and concatenates them. The resulting file
   # tells us what to remove from the jar-file.
-  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ \
+  $1_CAPTURE_DELETES = $$(foreach src, $$($1_SRCS), ($(FIND) $$(src) -name _the.package.deleted -newer $$@ \
       -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
   # The update contents macro updates the jar file with the previously capture contents.
   # Use 'wc -w' to see if the contents file is empty.
-  $1_UPDATE_CONTENTS=\
+  $1_UPDATE_CONTENTS = \
       if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
         $(ECHO) "  updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
         $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
@@ -200,27 +200,27 @@ define SetupJarArchiveBody
       fi $$(NEWLINE)
   # The s-variants of the above macros are used when the jar is created from scratch.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_SCAPTURE_CONTENTS=\
+  $1_SCAPTURE_CONTENTS = \
       $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \
-      $$(foreach src,$$($1_SRCS), \
+      $$(foreach src, $$($1_SRCS), \
         $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
             $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \
             >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \
       $$($1_CAPTURE_EXTRA_FILES)
 
   # Find returns non zero if the META-INF dir does not exist, ignore this.
-  ifeq (,$$($1_SKIP_METAINF))
-    $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
+  ifeq ($$($1_SKIP_METAINF), )
+    $1_SCAPTURE_METAINF = $$(foreach src, $$($1_SRCS), \
         ( ( $(FIND) $$(src)/META-INF -type f 2> /dev/null || true ) \
             | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
         $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
   endif
-  $1_SUPDATE_CONTENTS=\
+  $1_SUPDATE_CONTENTS = \
       $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
       $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted $$(NEWLINE)
 
   # Use a slightly shorter name for logging, but with enough path to identify this jar.
-  $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_JAR))
+  $1_NAME := $$(subst $$(OUTPUTDIR)/,,$$($1_JAR))
 
   # If reproducible build and the boot jdk jar supports --date option
   # then specify the --date using SOURCE_DATE in ISO-8601
@@ -228,7 +228,7 @@ define SetupJarArchiveBody
   ifeq ($$(BOOT_JDK_JAR_SUPPORTS_DATE), true)
     $1_JAR_OPTIONS += --date $(SOURCE_DATE_ISO_8601)
   endif
-  ifneq (,$$($1_CHECK_COMPRESS_JAR))
+  ifneq ($$($1_CHECK_COMPRESS_JAR), )
     ifneq ($(COMPRESS_JARS), true)
       $1_JAR_OPTIONS += --no-compress
     endif
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index 927def164be..59ea23d359b 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -26,7 +26,7 @@
 ifndef _JAVA_COMPILATION_GMK
 _JAVA_COMPILATION_GMK := 1
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
 endif
 
@@ -57,9 +57,9 @@ TARGET_RELEASE_NEWJDK_UPGRADED := $(TARGET_RELEASE_NEWJDK) \
 define add_file_to_copy
   # param 1 = BUILD_MYPACKAGE
   # parma 2 = The source file to copy.
-  $2_TARGET:=$2
+  $2_TARGET := $2
   # Remove the source prefix.
-  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
+  $$(foreach i, $$($1_SRC), $$(eval $$(call remove_string,$$i,$2_TARGET)))
   # To allow for automatic overrides, do not create a rule for a target file that
   # already has one
   ifneq ($$($1_COPY_$$($2_TARGET)), 1)
@@ -98,9 +98,9 @@ endef
 define add_file_to_clean
   # param 1 = BUILD_MYPACKAGE
   # parma 2 = The source file to copy and clean.
-  $2_TARGET:=$2
+  $2_TARGET := $2
   # Remove the source prefix.
-  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
+  $$(foreach i, $$($1_SRC), $$(eval $$(call remove_string,$$i,$2_TARGET)))
   # Now we can setup the dependency that will trigger the copying.
   # To allow for automatic overrides, do not create a rule for a target file that
   # already has one
@@ -138,44 +138,44 @@ endef
 # The target for public API digest is returned in $1_API_TARGET.
 #
 # Remaining parameters are named arguments. These include:
-#   SMALL_JAVA:=set to false to run javac as a "big" java app
-#   COMPILER:=bootjdk or interim, the latter is default
-#   TARGET_RELEASE:=javac flags to set the targeted jdk release (-source/-target or --release)
+#   SMALL_JAVA set to false to run javac as a "big" java app
+#   COMPILER bootjdk or interim, the latter is default
+#   TARGET_RELEASE javac flags to set the targeted jdk release (-source/-target or --release)
 #   Defaults to $(TARGET_RELEASE_NEWJDK).
-#   JAVAC_FLAGS:=javac flags to append to the default ones.
-#   JAVA_FLAGS:=flags to be appended to the java launching the compiler
-#   DISABLED_WARNINGS:=list of Xlint warnings that should be disabled
-#   SRC:=one or more directories to search for sources. The order of the source roots
+#   JAVAC_FLAGS javac flags to append to the default ones.
+#   JAVA_FLAGS flags to be appended to the java launching the compiler
+#   DISABLED_WARNINGS list of Xlint warnings that should be disabled
+#   SRC one or more directories to search for sources. The order of the source roots
 #        is significant. The first found file of a certain name has priority.
-#   BIN:=store classes here
-#   MODULE:=Name of module being compiled. If set, classes are put in BIN/MODULE.
-#   CLASSPATH:=a list of additional entries to set as classpath to javac
-#   INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
-#   EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
-#   COPY:=.prp means copy all prp files to the corresponding package in BIN.
-#   COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
-#   CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
-#   CLEAN_FILES:=myapp/foo/setting.txt means clean this file over to the package myapp/foo
-#   SRCZIP:=Create a src.zip based on the found sources and copied files.
-#   INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
-#   EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
+#   BIN store classes here
+#   MODULE Name of module being compiled. If set, classes are put in BIN/MODULE.
+#   CLASSPATH a list of additional entries to set as classpath to javac
+#   INCLUDES myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
+#   EXCLUDES myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
+#   COPY .prp means copy all prp files to the corresponding package in BIN.
+#   COPY_FILES myapp/foo/setting.txt means copy this file over to the package myapp/foo
+#   CLEAN .properties means copy and clean all properties file to the corresponding package in BIN.
+#   CLEAN_FILES myapp/foo/setting.txt means clean this file over to the package myapp/foo
+#   SRCZIP Create a src.zip based on the found sources and copied files.
+#   INCLUDE_FILES "com/sun/SolarisFoobar.java" means only compile this file!
+#   EXCLUDE_FILES "com/sun/SolarisFoobar.java" means do not compile this particular file!
 #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
-#   EXTRA_FILES:=List of extra source files to include in compilation. Can be used to
+#   EXTRA_FILES List of extra source files to include in compilation. Can be used to
 #       specify files that need to be generated by other rules first.
-#   HEADERS:=path to directory where all generated c-headers are written.
-#   DEPENDS:=Extra dependency
-#   KEEP_DUPS:=Do not remove duplicate file names from different source roots.
-#   FAIL_NO_SRC:=Set to false to not fail the build if no source files are found,
+#   HEADERS path to directory where all generated c-headers are written.
+#   DEPENDS Extra dependency
+#   KEEP_DUPS Do not remove duplicate file names from different source roots.
+#   FAIL_NO_SRC Set to false to not fail the build if no source files are found,
 #        default is true.
-#   CREATE_API_DIGEST:=Set to true to use a javac plugin to generate a public API
+#   CREATE_API_DIGEST Set to true to use a javac plugin to generate a public API
 #        hash which can be used for down stream dependencies to only rebuild
 #        when the API changes.
-#   KEEP_ALL_TRANSLATIONS:=Set to true to skip translation filtering
+#   KEEP_ALL_TRANSLATIONS Set to true to skip translation filtering
 SetupJavaCompilation = $(NamedParamsMacroTemplate)
 define SetupJavaCompilationBody
 
   # Verify arguments
-  ifeq ($$($1_BIN),)
+  ifeq ($$($1_BIN), )
     $$(error Must specify BIN (in $1))
   endif
 
@@ -313,7 +313,7 @@ define SetupJavaCompilationBody
       ) \
     ) \
   )
-  $$(call MakeDir,$$($1_BIN))
+  $$(call MakeDir, $$($1_BIN))
   # Order src files according to the order of the src dirs. Correct ordering is
   # needed for correct overriding between different source roots.
   $1_ALL_SRC_RAW := $$(call FindFiles, $$($1_SRC))
@@ -369,60 +369,60 @@ define SetupJavaCompilationBody
     endif
   else
     # All files below META-INF are always copied.
-    $1_ALL_COPIES := $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
+    $1_ALL_COPIES := $$(filter $$(addsuffix /META-INF%, $$($1_SRC)), $$($1_ALL_SRCS))
     # Find all files to be copied from source to bin.
-    ifneq (,$$($1_COPY)$$($1_COPY_FILES))
+    ifneq ($$($1_COPY)$$($1_COPY_FILES), )
       # Search for all files to be copied.
-      $1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
+      $1_ALL_COPIES += $$(filter $$(addprefix %, $$($1_COPY)), $$($1_ALL_SRCS))
       # Copy these explicitly
       $1_ALL_COPIES += $$($1_COPY_FILES)
     endif
     # Copy must also respect filters.
-    ifneq (,$$($1_INCLUDE_PATTERN))
-      $1_ALL_COPIES := $$(filter $$($1_INCLUDE_PATTERN),$$($1_ALL_COPIES))
+    ifneq ($$($1_INCLUDE_PATTERN), )
+      $1_ALL_COPIES := $$(filter $$($1_INCLUDE_PATTERN), $$($1_ALL_COPIES))
     endif
-    ifneq (,$$($1_EXCLUDE_PATTERN))
-      $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_PATTERN),$$($1_ALL_COPIES))
+    ifneq ($$($1_EXCLUDE_PATTERN), )
+      $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_ALL_COPIES))
     endif
     # Filter out any excluded translations
     ifneq ($$($1_KEEP_ALL_TRANSLATIONS), true)
       $1_ALL_COPIES := $$(call FilterExcludedTranslations, $$($1_ALL_COPIES), .properties)
     endif
-    ifneq (,$$($1_ALL_COPIES))
+    ifneq ($$($1_ALL_COPIES), )
       # Yep, there are files to be copied!
-      $1_ALL_COPY_TARGETS:=
-          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
+      $1_ALL_COPY_TARGETS :=
+          $$(foreach i, $$($1_ALL_COPIES), $$(eval $$(call add_file_to_copy,$1,$$i)))
       # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
     endif
 
     # Find all property files to be copied and cleaned from source to bin.
-    ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES))
+    ifneq ($$($1_CLEAN)$$($1_CLEAN_FILES), )
       # Search for all files to be copied.
-      $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
+      $1_ALL_CLEANS := $$(filter $$(addprefix %, $$($1_CLEAN)), $$($1_ALL_SRCS))
       # Clean these explicitly
       $1_ALL_CLEANS += $$($1_CLEAN_FILES)
       # Copy and clean must also respect filters.
-      ifneq (,$$($1_INCLUDE_PATTERN))
-        $1_ALL_CLEANS := $$(filter $$($1_INCLUDE_PATTERN),$$($1_ALL_CLEANS))
+      ifneq ($$($1_INCLUDE_PATTERN), )
+        $1_ALL_CLEANS := $$(filter $$($1_INCLUDE_PATTERN), $$($1_ALL_CLEANS))
       endif
-      ifneq (,$$($1_EXCLUDE_PATTERN))
-        $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_PATTERN),$$($1_ALL_CLEANS))
+      ifneq ($$($1_EXCLUDE_PATTERN), )
+        $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_ALL_CLEANS))
       endif
       # Filter out any excluded translations
       ifneq ($$($1_KEEP_ALL_TRANSLATIONS), true)
         $1_ALL_CLEANS := $$(call FilterExcludedTranslations, $$($1_ALL_CLEANS), .properties)
       endif
-      ifneq (,$$($1_ALL_CLEANS))
+      ifneq ($$($1_ALL_CLEANS), )
         # Yep, there are files to be copied and cleaned!
-        $1_ALL_COPY_CLEAN_TARGETS:=
-            $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_clean,$1,$$i)))
+        $1_ALL_COPY_CLEAN_TARGETS :=
+            $$(foreach i, $$($1_ALL_CLEANS), $$(eval $$(call add_file_to_clean,$1,$$i)))
         # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
       endif
     endif
 
     # Create a sed expression to remove the source roots and to replace / with .
     # and remove .java at the end.
-    $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
+    $1_REWRITE_INTO_CLASSES := $$(foreach i, $$($1_SRC), -e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
 
     $1_COMPILE_TARGET := $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_batch
     $1_FILELIST := $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_batch.filelist
@@ -431,7 +431,7 @@ define SetupJavaCompilationBody
 
     # Put headers in a temp dir to filter out those that actually
     # changed before copying them to the real header dir.
-    ifneq (,$$($1_HEADERS))
+    ifneq ($$($1_HEADERS), )
       $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp
 
       $$($1_HEADERS)/_the.$1_headers: $$($1_COMPILE_TARGET)
@@ -503,27 +503,27 @@ define SetupJavaCompilationBody
         $$($1_HEADER_TARGETS)
 
     # Check if a jar file was specified, then setup the rules for the jar.
-    ifneq (,$$($1_JAR))
+    ifneq ($$($1_JAR), )
       # If no suffixes was explicitly set for this jar file.
       # Use class and the cleaned/copied properties file suffixes as the default
       # for the types of files to be put into the jar.
-      ifeq (,$$($1_SUFFIXES))
-        $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
+      ifeq ($$($1_SUFFIXES), )
+        $1_SUFFIXES := .class $$($1_CLEAN) $$($1_COPY)
       endif
 
       $$(eval $$(call SetupJarArchive, ARCHIVE_$1, \
-          DEPENDENCIES:=$$($1), \
-          SRCS:=$$($1_BIN)$$($1_MODULE_SUBDIR), \
-          SUFFIXES:=$$($1_SUFFIXES), \
-          EXCLUDE:=$$($1_EXCLUDES), \
-          INCLUDES:=$$($1_INCLUDES), \
-          EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
-          JAR:=$$($1_JAR), \
-          JARMAIN:=$$($1_JARMAIN), \
-          MANIFEST:=$$($1_MANIFEST), \
-          EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
-          JARINDEX:=$$($1_JARINDEX), \
-          HEADERS:=$$($1_HEADERS), \
+          DEPENDENCIES := $$($1), \
+          SRCS := $$($1_BIN)$$($1_MODULE_SUBDIR), \
+          SUFFIXES := $$($1_SUFFIXES), \
+          EXCLUDE := $$($1_EXCLUDES), \
+          INCLUDES := $$($1_INCLUDES), \
+          EXTRA_FILES := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
+          JAR := $$($1_JAR), \
+          JARMAIN := $$($1_JARMAIN), \
+          MANIFEST := $$($1_MANIFEST), \
+          EXTRA_MANIFEST_ATTR := $$($1_EXTRA_MANIFEST_ATTR), \
+          JARINDEX := $$($1_JARINDEX), \
+          HEADERS := $$($1_HEADERS), \
       ))
 
       # Add jar to target list
@@ -531,13 +531,13 @@ define SetupJavaCompilationBody
     endif
 
     # Check if a srczip was specified, then setup the rules for the srczip.
-    ifneq (,$$($1_SRCZIP))
+    ifneq ($$($1_SRCZIP), )
       $$(eval $$(call SetupZipArchive, ZIP_ARCHIVE_$1, \
-          SRC:=$$($1_SRC), \
-          ZIP:=$$($1_SRCZIP), \
-          INCLUDES:=$$($1_INCLUDES), \
-          EXCLUDES:=$$($1_EXCLUDES), \
-          EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
+          SRC := $$($1_SRC), \
+          ZIP := $$($1_SRCZIP), \
+          INCLUDES := $$($1_INCLUDES), \
+          EXCLUDES := $$($1_EXCLUDES), \
+          EXCLUDE_FILES := $$($1_EXCLUDE_FILES)))
 
       # Add zip to target list
       $1 += $$($1_SRCZIP)
diff --git a/make/common/JdkNativeCompilation.gmk b/make/common/JdkNativeCompilation.gmk
index 78b2444e3ba..52b6dea6725 100644
--- a/make/common/JdkNativeCompilation.gmk
+++ b/make/common/JdkNativeCompilation.gmk
@@ -182,12 +182,12 @@ define AddJdkLibrary
   $1_$2_NAME := $$(strip $$(lastword $$(subst :, , $3)))
   $1_$2_MODULE := $$(strip $$(patsubst %$$($1_$2_NAME), %, $3))
 
-  ifeq ($$(filter lib%, $$($1_$2_NAME)),)
+  ifeq ($$(filter lib%, $$($1_$2_NAME)), )
     $$(error Library name $$($1_$2_NAME) missing lib prefix in $1)
   endif
   $1_$2_NAME := $$(strip $$(patsubst lib%, %, $$($1_$2_NAME)))
 
-  ifeq ($$($1_$2_MODULE),)
+  ifeq ($$($1_$2_MODULE), )
     $1_$2_MODULE := $$(MODULE)
   else
     $1_$2_MODULE := $$(strip $$(patsubst %:, %, $$($1_$2_MODULE)))
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index c780a6c1728..aec7396cd65 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -23,17 +23,17 @@
 # questions.
 #
 
-################################################################
+################################################################################
 # MakeBase provides the core functionality needed and used by all makefiles. It
 # should be included by all makefiles. MakeBase provides essential
 # functionality for named parameter functions, variable dependency, tool
 # execution, logging and fixpath functionality.
-################################################################
+################################################################################
 
 ifndef _MAKEBASE_GMK
 _MAKEBASE_GMK := 1
 
-ifeq ($(wildcard $(SPEC)),)
+ifeq ($(wildcard $(SPEC)), )
   $(error MakeBase.gmk needs SPEC set to a proper spec.gmk)
 endif
 
@@ -49,16 +49,16 @@ endif
 # When calling macros, the spaces between arguments are
 # often semantically important! Sometimes we need to subst
 # spaces and commas, therefore we need the following macros.
-X:=
-SPACE:=$(X) $(X)
-COMMA:=,
-DOLLAR:=$$
-HASH:=\#
-LEFT_PAREN:=(
-RIGHT_PAREN:=)
-SQUOTE:='
+X :=
+SPACE := $(X) $(X)
+COMMA := ,
+DOLLAR := $$
+HASH := \#
+LEFT_PAREN := (
+RIGHT_PAREN := )
+SQUOTE := '
 #'
-DQUOTE:="
+DQUOTE := "
 #"
 define NEWLINE
 
@@ -99,7 +99,7 @@ define SetupLogging
     endif
   endif
 
-  ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
+  ifneq ($$(findstring $$(LOG_LEVEL), debug trace), )
     SHELL := $$(SHELL) -x
   endif
 
@@ -117,21 +117,21 @@ define SetupLogging
   # The warn level can never be turned off
   LogWarn = $$(info $(LOG_PREFIX)$$(strip $$1))
   LOG_WARN :=
-  ifneq ($$(findstring $$(LOG_LEVEL), info debug trace),)
+  ifneq ($$(findstring $$(LOG_LEVEL), info debug trace), )
     LogInfo = $$(info $(LOG_PREFIX)$$(strip $$1))
     LOG_INFO :=
   else
     LogInfo =
     LOG_INFO := > /dev/null
   endif
-  ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
+  ifneq ($$(findstring $$(LOG_LEVEL), debug trace), )
     LogDebug = $$(info $(LOG_PREFIX)$$(strip $$1))
     LOG_DEBUG :=
   else
     LogDebug =
     LOG_DEBUG := > /dev/null
   endif
-  ifneq ($$(findstring $$(LOG_LEVEL), trace),)
+  ifneq ($$(findstring $$(LOG_LEVEL), trace), )
     LogTrace = $$(info $(LOG_PREFIX)$$(strip $$1))
     LOG_TRACE :=
   else
@@ -164,14 +164,14 @@ PARAM_SEQUENCE := $(call sequence, 2, $(MAX_PARAMS))
 #     BAR := some parameter value, \
 # ))
 define NamedParamsMacroTemplate
-  $(if $($(MAX_PARAMS)),$(error Internal makefile error: \
+  $(if $($(MAX_PARAMS)), $(error Internal makefile error: \
       Too many named arguments to macro, please update MAX_PARAMS in MakeBase.gmk))
   # Iterate over 2 3 4... and evaluate the named parameters with $1_ as prefix
-  $(foreach i,$(PARAM_SEQUENCE), $(if $(strip $($i)),\
+  $(foreach i, $(PARAM_SEQUENCE), $(if $(strip $($i)), \
     $(strip $1)_$(strip $(call EscapeHash, $(call DoubleDollar, $($i))))$(NEWLINE)))
   # Debug print all named parameter names and values
   $(if $(findstring $(LOG_LEVEL), trace), \
-    $(info $0 $(strip $1) $(foreach i,$(PARAM_SEQUENCE), \
+    $(info $0 $(strip $1) $(foreach i, $(PARAM_SEQUENCE), \
       $(if $(strip $($i)),$(NEWLINE) $(strip [$i] $(if $(filter $(LOG_LEVEL), trace), \
         $($i), $(wordlist 1, 20, $($(i))) $(if $(word 21, $($(i))), ...)))))))
 
@@ -246,7 +246,7 @@ DependOnVariableFileName = \
 # Param 1 - Name of variable
 DependOnVariableWriteFile = \
     $(call MakeDir, $(dir $($1_filename))) \
-    $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+    $(call WriteFile, $1_old := $(call DoubleDollar,$(call EscapeHash,$($1))), \
         $($1_filename)) \
 
 # Does the actual work with parameters stripped.
@@ -260,7 +260,7 @@ DependOnVariableHelper = \
         $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
         $(if $(wildcard $($1_filename)), \
           $(eval include $($1_filename)) \
-          $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+          $(if $(call equals, $(strip $($1)), $(strip $($1_old))),, \
             $(if $(findstring $(LOG_LEVEL), trace), \
                 $(info NewVariable $1: >$(strip $($1))<) \
                 $(info OldVariable $1: >$(strip $($1_old))<) \
diff --git a/make/common/MakeIO.gmk b/make/common/MakeIO.gmk
index 865c5cae2e5..b7843817b5e 100644
--- a/make/common/MakeIO.gmk
+++ b/make/common/MakeIO.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including MakeIO.gmk)
 endif
 
@@ -67,22 +67,22 @@ else # HAS_FILE_FUNCTION = false
   $(eval compress_paths += \
       $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-post-compress.incl)))
 
-  decompress_paths=$(SED) -f $(TOPDIR)/make/common/support/ListPathsSafely-uncompress.sed \
+  decompress_paths = $(SED) -f $(TOPDIR)/make/common/support/ListPathsSafely-uncompress.sed \
       -e 's|X99|\\n|g' \
       -e 's|X98|$(OUTPUTDIR)|g' -e 's|X97|$(TOPDIR)|g' \
       -e 's|X00|X|g'
 
   ListPathsSafely_IfPrintf = \
-      $(if $(word $3,$($(strip $1))), \
+      $(if $(word $3, $($(strip $1))), \
           $(shell $(PRINTF) -- "$(strip $(call EscapeDollar, \
-              $(call compress_paths, $(wordlist $3,$4,$($(strip $1))))))\n" \
+              $(call compress_paths, $(wordlist $3, $4, $($(strip $1))))))\n" \
               | $(decompress_paths) >> $2))
 
   # Param 1 - Name of variable containing paths/arguments to output
   # Param 2 - File to print to
   # Param 3 - Set to true to append to file instead of overwriting
   define ListPathsSafely
-    ifneq (,$$(word 30001,$$($$(strip $1))))
+    ifneq ($$(word 30001, $$($$(strip $1))), )
       $$(error Cannot list safely more than 30000 paths. $1 has $$(words $$($$(strip $1))) paths!)
     endif
     $$(call MakeDir, $$(dir $2))
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index e6c1609cecb..fd6b9b4ec10 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -177,8 +177,8 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
 	$(call MakeTargetDir)
 	$(RM) $@
 	$(foreach m, $(MODULE_INFOS), \
-	    ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \
-	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
+	    ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) := " && \
+	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
 	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
 	          /^ *requires/ { sub(/;/, ""); \
 	                          sub(/requires /, " "); \
@@ -191,8 +191,8 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
 	                          gsub(/\r/, ""); \
 	                          printf(" %s", $$0) } \
 	          END           { printf("\n") }' $m && \
-	      $(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \
-	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
+	      $(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) := " && \
+	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
 	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
 	          /^ *requires  *transitive/ { \
 	                          sub(/;/, ""); \
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 5f1c6539cdb..265400e900c 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -182,7 +182,7 @@ define SetupNativeCompilationBody
 
   # Now call CreateCompiledNativeFile for each source file we are going to compile.
   $$(foreach file, $$($1_SRCS), \
-      $$(eval $$(call CreateCompiledNativeFile,$1_$$(notdir $$(file)),\
+      $$(eval $$(call CreateCompiledNativeFile,$1_$$(notdir $$(file)), \
           FILE := $$(file), \
           BASE := $1, \
       )) \
diff --git a/make/common/ProcessMarkdown.gmk b/make/common/ProcessMarkdown.gmk
index 125892504f9..960c4d66c30 100644
--- a/make/common/ProcessMarkdown.gmk
+++ b/make/common/ProcessMarkdown.gmk
@@ -22,7 +22,7 @@
 # questions.
 #
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including ProcessMarkdown.gmk)
 endif
 
@@ -92,7 +92,7 @@ define ProcessMarkdown
 	    -t $$($1_FORMAT) --eol=lf --standalone \
 	    $$($1_$2_CSS_OPTION) $$($1_$2_OPTIONS_FROM_SRC) $$($1_$2_OPTIONS) \
 	    '$$($1_$2_PANDOC_INPUT)' -o '$$($1_$2_PANDOC_OUTPUT)')
-        ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
+        ifneq ($$(findstring $$(LOG_LEVEL), debug trace), )
 	  TOO_LONG_LINES=`$$(GREP) -E -e '^.{80}.+$$$$' $$<` || true ; \
 	  if [ "x$$$$TOO_LONG_LINES" != x ]; then \
 	    $$(ECHO) "Warning: Unsuitable markdown in $$<:" ; \
diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk
index b7cb4f40e5c..e09e144fa06 100644
--- a/make/common/TestFilesCompilation.gmk
+++ b/make/common/TestFilesCompilation.gmk
@@ -26,7 +26,7 @@
 ifndef _TEST_FILES_COMPILATION_GMK
 _TEST_FILES_COMPILATION_GMK := 1
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including TestFilesCompilation.gmk)
 endif
 
@@ -95,7 +95,7 @@ define SetupTestFilesCompilationBody
   TEST_CFLAGS := -I$(TOPDIR)/test/lib/native
 
   # Setup a compilation for each and every one of them
-  $$(foreach file, $$($1_FILTERED_FILE_LIST),\
+  $$(foreach file, $$($1_FILTERED_FILE_LIST), \
     $$(eval name := $$(strip $$(basename $$(notdir $$(file))))) \
     $$(eval unprefixed_name := $$(patsubst $$($1_PREFIX)%, %, $$(name))) \
     $$(eval $$(call SetupJdkNativeCompilation, BUILD_TEST_$$(name), \
@@ -122,9 +122,9 @@ define SetupTestFilesCompilationBody
         JDK_LIBS := $$($1_JDK_LIBS_$$(name)), \
         LIBS := $$($1_LIBS_$$(name)), \
         DEFAULT_VERSIONINFO_RESOURCE := false, \
-        OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)),$$($1_OPTIMIZATION_$$(name)),LOW), \
+        OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)), $$($1_OPTIMIZATION_$$(name)), LOW), \
         COPY_DEBUG_SYMBOLS := $$($1_COPY_DEBUG_SYMBOLS), \
-        STRIP_SYMBOLS := $$(if $$($1_STRIP_SYMBOLS_$$(name)),$$($1_STRIP_SYMBOLS_$$(name)),false), \
+        STRIP_SYMBOLS := $$(if $$($1_STRIP_SYMBOLS_$$(name)), $$($1_STRIP_SYMBOLS_$$(name)), false), \
         BUILD_INFO_LOG_MACRO := LogInfo, \
     )) \
     $$(eval $1 += $$(BUILD_TEST_$$(name)) ) \
diff --git a/make/common/TextFileProcessing.gmk b/make/common/TextFileProcessing.gmk
index 1bb32242652..6746296df24 100644
--- a/make/common/TextFileProcessing.gmk
+++ b/make/common/TextFileProcessing.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including TextFileProcessing.gmk)
 endif
 
@@ -80,47 +80,47 @@ endef
 SetupTextFileProcessing = $(NamedParamsMacroTemplate)
 define SetupTextFileProcessingBody
 
-  ifneq ($$($1_SOURCE_FILES),)
-    ifneq ($$($1_SOURCE_DIRS),)
+  ifneq ($$($1_SOURCE_FILES), )
+    ifneq ($$($1_SOURCE_DIRS), )
       $$(error Cannot use both SOURCE_FILES and SOURCE_DIRS (in $1))
     endif
-    ifneq ($$($1_EXCLUDE_FILES)$$($1_INCLUDE_FILES),)
+    ifneq ($$($1_EXCLUDE_FILES)$$($1_INCLUDE_FILES), )
       $$(error Cannot INCLUDE/EXCLUDE_FILES with SOURCE_FILES (in $1))
     endif
   else
-    ifeq ($$($1_SOURCE_DIRS),)
+    ifeq ($$($1_SOURCE_DIRS), )
       $$(error Must specify either SOURCE_FILES or SOURCE_DIRS (in $1))
     endif
     # Find all files in the source trees. Sort to remove duplicates.
     $$(foreach src, $$($1_SOURCE_DIRS), $$(if $$(wildcard $$(src)), , \
         $$(error SOURCE_DIRS contains missing directory $$(src) (in $1))))
-    ifneq ($$($1_SOURCE_BASE_DIR),)
+    ifneq ($$($1_SOURCE_BASE_DIR), )
       $$(foreach src, $$($1_SOURCE_DIRS), \
           $$(if $$(findstring $$($1_SOURCE_BASE_DIR), $$(src)), , \
           $$(error SOURCE_DIRS contains directory $$(src) outside \
               SOURCE_BASE_DIR $$($1_SOURCE_BASE_DIR) (in $1))))
     endif
     $1_SOURCE_FILES := $$(sort $$(call FindFiles,$$($1_SOURCE_DIRS)))
-    $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SOURCE_DIRS),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
-    $1_INCLUDE_FILES:=$$(foreach i,$$($1_SOURCE_DIRS),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
-    $1_SOURCE_FILES := $$(filter-out $$($1_EXCLUDE_FILES),$$($1_SOURCE_FILES))
-    ifneq (,$$(strip $$($1_INCLUDE_FILES)))
-      $1_SOURCE_FILES := $$(filter $$($1_INCLUDE_FILES),$$($1_SOURCE_FILES))
+    $1_EXCLUDE_FILES := $$(foreach i, $$($1_SOURCE_DIRS), $$(addprefix $$i/, $$($1_EXCLUDE_FILES)))
+    $1_INCLUDE_FILES := $$(foreach i, $$($1_SOURCE_DIRS), $$(addprefix $$i/, $$($1_INCLUDE_FILES)))
+    $1_SOURCE_FILES := $$(filter-out $$($1_EXCLUDE_FILES), $$($1_SOURCE_FILES))
+    ifneq ($$(strip $$($1_INCLUDE_FILES)), )
+      $1_SOURCE_FILES := $$(filter $$($1_INCLUDE_FILES), $$($1_SOURCE_FILES))
     endif
-    ifeq (,$$($1_SOURCE_FILES))
+    ifeq ($$($1_SOURCE_FILES), )
       $$(info No sources found for $1 when looking inside the dirs $$($1_SRC))
     endif
   endif
 
-  ifneq ($$($1_REPLACEMENTS),)
+  ifneq ($$($1_REPLACEMENTS), )
     # We have a replacement request, prepare it for the recipe
-    ifneq ($$(findstring /,$$($1_REPLACEMENTS)),)
+    ifneq ($$(findstring /, $$($1_REPLACEMENTS)), )
       # Cannot use / as separator
-      ifneq ($$(findstring @,$$($1_REPLACEMENTS)),)
+      ifneq ($$(findstring @, $$($1_REPLACEMENTS)), )
         # Cannot use @ as separator
-        ifneq ($$(findstring |,$$($1_REPLACEMENTS)),)
+        ifneq ($$(findstring |, $$($1_REPLACEMENTS)), )
           # Cannot use | as separator
-          ifneq ($$(findstring !,$$($1_REPLACEMENTS)),)
+          ifneq ($$(findstring !, $$($1_REPLACEMENTS)), )
             # Cannot use ! as separator. Give up.
             $$(error No suitable sed separator can be found for $1. Tested /, @, | and !)
           else
@@ -161,7 +161,7 @@ define SetupTextFileProcessingBody
     $1_REPLACEMENTS_COMMAND_LINE := $(CAT)
   endif
 
-  ifneq ($$($1_INCLUDES),)
+  ifneq ($$($1_INCLUDES), )
     # We have a include request, prepare it for the recipe.
     # Convert an INCLUDE like this PATTERN_1 => file1 ; PATTERN_2 => file2 ;
     # into an awk script fragment like this:
@@ -190,7 +190,7 @@ define SetupTextFileProcessingBody
   # Reset target list before populating it
   $1 :=
 
-  ifneq ($$($1_OUTPUT_FILE),)
+  ifneq ($$($1_OUTPUT_FILE), )
     ifneq ($$(words $$($1_SOURCE_FILES)), 1)
       $$(error Cannot use OUTPUT_FILE for more than one source file (in $1))
     endif
@@ -199,12 +199,12 @@ define SetupTextFileProcessingBody
     $$(eval $$(call SetupSingleTextFileForProcessing,$1, $$($1_SOURCE_FILES), \
         $$(patsubst %/, %, $$(dir $$($1_OUTPUT_FILE))), $$(notdir $$($1_OUTPUT_FILE))))
   else
-    ifeq ($$($1_OUTPUT_DIR),)
+    ifeq ($$($1_OUTPUT_DIR), )
       $$(error Neither OUTPUT_FILE nor OUTPUT_DIR was specified (in $1))
     endif
 
     # Now call add_native_source for each source file we are going to process.
-    ifeq ($$($1_SOURCE_BASE_DIR),)
+    ifeq ($$($1_SOURCE_BASE_DIR), )
       # With no base dir specified, put all files in target dir, flattening any
       # hierarchies. Note that $1 is space sensitive and must disobey whitespace
       # rules.
diff --git a/make/common/Utils.gmk b/make/common/Utils.gmk
index ea853919de5..26d05ed91be 100644
--- a/make/common/Utils.gmk
+++ b/make/common/Utils.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including Utils.gmk)
 endif
 
@@ -36,7 +36,7 @@ endif
 # String equals
 equals = \
     $(if $(strip $1)$(strip $2),$(strip \
-      $(and $(findstring $(strip $1),$(strip $2)),\
+      $(and $(findstring $(strip $1),$(strip $2)), \
         $(findstring $(strip $2),$(strip $1)))), \
       true \
     )
@@ -64,7 +64,7 @@ uppercase = \
 # Param 2 - ending number
 sequence = \
     $(wordlist $1, $2, $(strip \
-        $(eval SEQUENCE_COUNT :=) \
+        $(eval SEQUENCE_COUNT := ) \
         $(call _sequence-do,$(strip $2))))
 
 _sequence-do = \
@@ -225,7 +225,7 @@ uniq = \
 # whitespace-separated words in $1 is a substring.
 containing = \
     $(strip \
-        $(foreach v,$(strip $2),\
+        $(foreach v,$(strip $2), \
           $(call uniq,$(foreach p,$(strip $1),$(if $(findstring $p,$v),$v)))))
 
 # Returns all whitespace-separated words in $2 where none of the
@@ -242,7 +242,7 @@ dups = \
 # $1 - List of prefixes
 # $2 - List of elements to process
 remove-prefixes = \
-    $(strip $(if $1,$(patsubst $(firstword $1)%,%,\
+    $(strip $(if $1,$(patsubst $(firstword $1)%,%, \
       $(call remove-prefixes,$(filter-out $(firstword $1),$1),$2)),$2))
 
 ################################################################################
diff --git a/make/common/ZipArchive.gmk b/make/common/ZipArchive.gmk
index 480f4c5effd..928bff9bd84 100644
--- a/make/common/ZipArchive.gmk
+++ b/make/common/ZipArchive.gmk
@@ -29,7 +29,7 @@ _ZIP_ARCHIVE_GMK := 1
 # Depends on build tools for MakeZipReproducible
 include ../ToolsJdk.gmk
 
-ifeq (,$(_MAKEBASE_GMK))
+ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including ZipArchive.gmk)
 endif
 
@@ -65,9 +65,9 @@ define SetupZipArchiveBody
   # To avoid running find over too large sets of files, which causes make to crash
   # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
   # of directories to run find in, if available.
-  ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
-    $1_FIND_LIST := $$(wildcard $$(foreach s,$$($1_SRC_SLASH), \
-        $$(addprefix $$s,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
+  ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES), )
+    $1_FIND_LIST := $$(wildcard $$(foreach s, $$($1_SRC_SLASH), \
+        $$(addprefix $$s, $$($1_INCLUDES) $$($1_INCLUDE_FILES))))
   else
     $1_FIND_LIST := $$($1_SRC_SLASH)
   endif
@@ -76,38 +76,38 @@ define SetupZipArchiveBody
   # If asked to, follow symlinks in this find since that is what zip does. To do
   # this, we need to call ShellFindFiles directly.
   ifeq ($$($1_FOLLOW_SYMLINKS), true)
-    $1_ALL_SRCS := $$(call not-containing,_the.,$$(call ShellFindFiles,$$($1_FIND_LIST), , -L))
+    $1_ALL_SRCS := $$(call not-containing, _the., $$(call ShellFindFiles, $$($1_FIND_LIST), , -L))
   else
-    $1_ALL_SRCS := $$(call not-containing,_the.,$$(call FindFiles,$$($1_FIND_LIST)))
+    $1_ALL_SRCS := $$(call not-containing, _the., $$(call FindFiles, $$($1_FIND_LIST)))
   endif
 
   # Filter on suffixes if set
-  ifneq ($$($1_SUFFIXES),)
+  ifneq ($$($1_SUFFIXES), )
     $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
   endif
 
-  ifneq ($$($1_INCLUDES),)
-    ifneq ($$($1_SUFFIXES),)
-      $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
-          $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
+  ifneq ($$($1_INCLUDES), )
+    ifneq ($$($1_SUFFIXES), )
+      $1_ZIP_INCLUDES := $$(foreach s, $$($1_SUFFIXES), \
+          $$(addprefix -i$(SPACE)$(DQUOTE), $$(addsuffix /*$$s$(DQUOTE), $$($1_INCLUDES))))
     else
-      $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
+      $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE), $$(addsuffix /*$(DQUOTE), $$($1_INCLUDES)))
     endif
   else
-    ifneq ($$($1_SUFFIXES),)
-      $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
-          $$(addprefix -i$(SPACE)$(DQUOTE),*$$s$(DQUOTE)))
+    ifneq ($$($1_SUFFIXES), )
+      $1_ZIP_INCLUDES := $$(foreach s, $$($1_SUFFIXES), \
+          $$(addprefix -i$(SPACE)$(DQUOTE), *$$s$(DQUOTE)))
     endif
   endif
-  ifneq ($$($1_INCLUDE_FILES),)
-    $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
+  ifneq ($$($1_INCLUDE_FILES), )
+    $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE), $$($1_INCLUDE_FILES))
   endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
-    $1_SRC_EXCLUDES := $$(foreach s,$$($1_SRC_SLASH),$$(addprefix $$s,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
+  ifneq ($$($1_EXCLUDES), )
+    $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE), $$(addsuffix /*$(DQUOTE), $$($1_EXCLUDES)))
+    $1_SRC_EXCLUDES := $$(foreach s, $$($1_SRC_SLASH), $$(addprefix $$s, $$(addsuffix /%, $$($1_EXCLUDES))))
+    $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES), $$($1_ALL_SRCS))
   endif
-  ifneq ($$($1_EXCLUDE_FILES),)
+  ifneq ($$($1_EXCLUDE_FILES), )
     $1_SRC_EXCLUDE_FILES := $$(addprefix %, $$($1_EXCLUDE_FILES)) $$($1_EXCLUDE_FILES)
     $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDE_FILES), $$($1_ALL_SRCS))
     $$(foreach s, $$($1_SRC_SLASH), \
@@ -134,7 +134,7 @@ define SetupZipArchiveBody
   endif
 
   # Use a slightly shorter name for logging, but with enough path to identify this zip.
-  $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_ZIP))
+  $1_NAME := $$(subst $$(OUTPUTDIR)/,,$$($1_ZIP))
 
   # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
   # I.e. the zip -i and -x options should match the filtering done in the makefile.
@@ -167,7 +167,7 @@ define SetupZipArchiveBody
 	    ) \
 	  ) \
 	)
-	$$(foreach s,$$($1_SRC_SLASH), $$(call ExecuteWithLog, \
+	$$(foreach s, $$($1_SRC_SLASH), $$(call ExecuteWithLog, \
 	    $$(SUPPORT_OUTPUTDIR)/zip/$$(patsubst $$(OUTPUTDIR)/%,%, $$@), \
 	    (cd $$s && $(ZIPEXE) -qru $$($1_ZIP_OPTIONS) $$@ . \
 	        $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* \
diff --git a/make/common/native/CompileFile.gmk b/make/common/native/CompileFile.gmk
index a9384fb0cf5..0c67a337acf 100644
--- a/make/common/native/CompileFile.gmk
+++ b/make/common/native/CompileFile.gmk
@@ -41,10 +41,10 @@
 define WriteCompileCommandsFragment
   $(call LogInfo, Creating compile commands fragment for $(notdir $3))
   $(call MakeDir, $(dir $1))
-  $(call WriteFile,{ \
+  $(call WriteFile, { \
       "directory": "$(strip $(call FixPath, $2))"$(COMMA) \
       "file": "$(strip $(call FixPath, $3))"$(COMMA) \
-      "command": "$(strip $(subst $(DQUOTE),\$(DQUOTE),$(subst \,\\,\
+      "command": "$(strip $(subst $(DQUOTE),\$(DQUOTE),$(subst \,\\, \
         $(subst $(FIXPATH),,$(call FixPath, $4)))))" \
     }$(COMMA), \
     $1)
@@ -344,7 +344,7 @@ define CreateWindowsResourceFile
 		$(ECHO) $$($1_RES): \\ > $$($1_RES_DEPS_FILE) ; \
 		$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEPS_FILE)$(OBJ_SUFFIX).log \
 		    >> $$($1_RES_DEPS_FILE) ; \
-		$(ECHO) >> $$($1_RES_DEPS_FILE) ;\
+		$(ECHO) >> $$($1_RES_DEPS_FILE) ; \
 		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEPS_FILE) \
 		    > $$($1_RES_DEPS_TARGETS_FILE)
   endif
diff --git a/make/devkit/Makefile b/make/devkit/Makefile
index c85a7c21d29..9c498807a54 100644
--- a/make/devkit/Makefile
+++ b/make/devkit/Makefile
@@ -81,7 +81,7 @@ $(info target_platforms $(target_platforms))
 
 all compile : $(platforms)
 
-ifeq (,$(SKIP_ME))
+ifeq ($(SKIP_ME), )
   $(foreach p,$(filter-out $(me),$(platforms)),$(eval $(p) : $$(me)))
 endif
 
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
index 5c29ee4db75..300501f5f35 100644
--- a/make/devkit/Tools.gmk
+++ b/make/devkit/Tools.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-##########################################################################################
+################################################################################
 #
 # Workhorse makefile for creating ONE cross compiler
 # Needs either to be from BUILD -> BUILD OR have
@@ -92,7 +92,7 @@ else
   $(error Unknown base OS $(BASE_OS))
 endif
 
-##########################################################################################
+################################################################################
 # Define external dependencies
 
 # Latest that could be made to work.
@@ -223,7 +223,7 @@ RPM_LIST := \
     systemtap-sdt-devel \
     #
 
-##########################################################################################
+################################################################################
 # Define common directories and files
 
 # Ensure we have 32-bit libs also for x64. We enable mixed-mode.
@@ -258,7 +258,7 @@ download-rpms:
 	      wget -r -np -nd $(patsubst %, -A "*%*.rpm", $(RPM_LIST)) $(BASE_URL)
         endif
 
-##########################################################################################
+################################################################################
 # Unpack source packages
 
 # Generate downloading + unpacking of sources.
@@ -285,7 +285,7 @@ endef
 # Download and unpack all source packages
 $(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC GDB,$(eval $(call Download,$(p))))
 
-##########################################################################################
+################################################################################
 # Unpack RPMS
 
 RPM_ARCHS := $(ARCH) noarch
@@ -324,7 +324,7 @@ endef
 
 $(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
 
-##########################################################################################
+################################################################################
 
 # Note: MUST create a <sysroot>/usr/lib even if not really needed.
 # gcc will use a path relative to it to resolve lib64. (x86_64).
@@ -344,7 +344,7 @@ $(libs) : $(rpms)
 	@mkdir -p $(SYSROOT)/usr/lib
 	@touch $@
 
-##########################################################################################
+################################################################################
 # Create links for ffi header files so that they become visible by default when using the
 # devkit.
 ifeq ($(ARCH), x86_64)
@@ -357,12 +357,12 @@ ifeq ($(ARCH), x86_64)
   SYSROOT_LINKS += $(SYSROOT)/usr/include/ffi.h $(SYSROOT)/usr/include/ffitarget.h
 endif
 
-##########################################################################################
+################################################################################
 
 # Define marker files for each source package to be compiled
 $(foreach t,binutils mpfr gmp mpc gcc ccache gdb,$(eval $(t) = $(TARGETDIR)/$($(t)_ver).done))
 
-##########################################################################################
+################################################################################
 
 # Default base config
 CONFIG = --target=$(TARGET) \
@@ -390,7 +390,7 @@ endif
 
 TOOLS ?= $(call declare_tools,_FOR_TARGET,$(TARGET)-)
 
-##########################################################################################
+################################################################################
 
 # Create a TARGET bfd + libiberty only.
 # Configure one or two times depending on mulitlib arch.
@@ -424,7 +424,7 @@ $(bfdmakes) : CONFIG = --target=$(TARGET) \
 
 $(bfdmakes) : TOOLS = $(call declare_tools,_FOR_TARGET,$(TARGET)-) $(call declare_tools,,$(TARGET)-)
 
-##########################################################################################
+################################################################################
 
 $(gcc) \
     $(binutils) \
@@ -591,7 +591,7 @@ else
 	@echo 'done'
 endif
 
-##########################################################################################
+################################################################################
 # very straightforward. just build a ccache. it is only for host.
 $(BUILDDIR)/$(ccache_ver)/Makefile \
     : $(CCACHE_CFG)
@@ -606,7 +606,7 @@ $(BUILDDIR)/$(ccache_ver)/Makefile \
 
 gccpatch = $(TARGETDIR)/gcc-patched
 
-##########################################################################################
+################################################################################
 # For some reason cpp is not created as a target-compiler
 ifeq ($(HOST),$(TARGET))
   $(gccpatch) : $(gcc) link_libs
@@ -621,7 +621,7 @@ ifeq ($(HOST),$(TARGET))
 	@touch $@
 	@echo 'done'
 
-  ##########################################################################################
+  ##############################################################################
   # Ugly at best. Seems that when we compile host->host compiler, that are NOT
   # the BUILD compiler, the result will not try searching for libs in package root.
   # "Solve" this by create links from the target libdirs to where they are.
@@ -641,7 +641,7 @@ else
 	@echo 'done'
 endif
 
-##########################################################################################
+################################################################################
 # Build in two steps.
 # make <default>
 # make install.
@@ -656,7 +656,7 @@ $(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile
 	@touch $@
 	@echo 'done'
 
-##########################################################################################
+################################################################################
 
 $(PREFIX)/devkit.info:
 	@echo 'Creating devkit.info in the root of the kit'
@@ -670,7 +670,7 @@ $(PREFIX)/devkit.info:
 	echo 'DEVKIT_SYSROOT="$$DEVKIT_ROOT/$(TARGET)/sysroot"' >> $@
 	echo 'DEVKIT_EXTRA_PATH="$$DEVKIT_ROOT/bin"' >> $@
 
-##########################################################################################
+################################################################################
 # Copy these makefiles into the root of the kit
 $(PREFIX)/Makefile: ./Makefile
 	rm -rf $@
@@ -686,7 +686,7 @@ $(PREFIX)/Tars.gmk: ./Tars.gmk
 
 THESE_MAKEFILES := $(PREFIX)/Makefile $(PREFIX)/Tools.gmk $(PREFIX)/Tars.gmk
 
-##########################################################################################
+################################################################################
 
 ifeq ($(TARGET), $(HOST))
   # To build with dtrace support, the build needs access to the dtrace executable from the
@@ -706,7 +706,7 @@ ifeq ($(TARGET), $(HOST))
       ld.gold nm objcopy objdump ranlib readelf size strings strip)
 endif
 
-##########################################################################################
+################################################################################
 
 bfdlib : $(bfdlib)
 binutils : $(binutils)
diff --git a/make/hotspot/CopyToExplodedJdk.gmk b/make/hotspot/CopyToExplodedJdk.gmk
index 4462af0dc3b..280224de19e 100644
--- a/make/hotspot/CopyToExplodedJdk.gmk
+++ b/make/hotspot/CopyToExplodedJdk.gmk
@@ -37,7 +37,8 @@ ifeq ($(call isTargetOs, windows), true)
   $(eval $(call SetupCopyFiles, COPY_LIBS_LIB, \
       SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \
       DEST := $(JDK_OUTPUTDIR)/lib, \
-      FILES := $(filter %.lib, $(LIB_TARGETS))))
+      FILES := $(filter %.lib, $(LIB_TARGETS)), \
+  ))
 
   TARGETS += $(COPY_LIBS_BIN) $(COPY_LIBS_LIB)
 else
diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index 899badadd2a..8e55c9b669b 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -95,7 +95,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
     CFLAGS := $(JVM_CFLAGS) \
         -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock/include \
-        $(addprefix -I,$(GTEST_TEST_SRC)), \
+        $(addprefix -I, $(GTEST_TEST_SRC)), \
     CFLAGS_windows := -EHsc, \
     CFLAGS_macosx := -DGTEST_OS_MAC=1, \
     DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc) \
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index 7b5ee7ce48e..49a96ec3273 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -282,7 +282,7 @@ ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
     ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN))
       $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
           DEST := $(LIB_OUTPUTDIR), \
-          FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \
+          FILES := $(BUILD_LIBJVM_IMPORT_LIBRARY), \
       ))
       TARGETS += $(COPY_JVM_LIB)
     endif
diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
index 92e0f9e861e..63169b4d672 100644
--- a/make/hotspot/lib/JvmOverrideFiles.gmk
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk
@@ -124,7 +124,7 @@ else ifeq ($(call isTargetOs, aix), true)
   # mode, so don't optimize sharedRuntimeTrig.cpp at all.
   BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
 
-  ifneq ($(DEBUG_LEVEL),slowdebug)
+  ifneq ($(DEBUG_LEVEL), slowdebug)
     # Compiling jvmtiEnterTrace.cpp with full optimization needs more than 30min
     # (mostly because of '-qhot=level=1' and the more than 1300 'log_trace' calls
     # which cause a lot of template expansion).
diff --git a/make/ide/eclipse/CreateWorkspace.gmk b/make/ide/eclipse/CreateWorkspace.gmk
index 2849303d570..793377ec51e 100644
--- a/make/ide/eclipse/CreateWorkspace.gmk
+++ b/make/ide/eclipse/CreateWorkspace.gmk
@@ -55,7 +55,7 @@ FindModuleNativeDirs = \
 
 # Taken from JdkNativeCompilation.gmk
 FindJavaHeaderDir = \
-    $(if $(strip $1),$(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)))
+    $(if $(strip $1), $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)))
 
 JAVA_DIRS := $(strip $(foreach module, $(call FindAllModules), \
     $(patsubst $(TOPDIR)/%,%,$(filter-out $(OUTPUTDIR)%, \
@@ -112,7 +112,7 @@ define SetupEclipseWorkspaceBody
 
     # Eclipse crashes when processing multiple module-info.java files
     # This is an annoying bug that has not been fixed for some time now
-    $1_CLASSPATH += $$(foreach src,$(JAVA_DIRS), \
+    $1_CLASSPATH += $$(foreach src, $(JAVA_DIRS), \
         <classpathentry excluding="module-info.java|module-info.java.extra" kind="src" path="$$(src)"/>$$(NEWLINE))
 
     $$(eval $$(call SetupTextFileProcessing, $1_CREATE_CLASSPATH_FILE, \
@@ -157,7 +157,7 @@ define SetupEclipseWorkspaceBody
         <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hotspot"/>$$(NEWLINE)
 
     ifneq ($$(findstring $$($1_NATURE), NATIVE MIXED), )
-      $1_NATIVE_SRCS += $$(foreach src,$(NATIVE_DIRS), \
+      $1_NATIVE_SRCS += $$(foreach src, $(NATIVE_DIRS), \
           <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="$$(strip $$(src))"/>$$(NEWLINE))
     endif
 
@@ -188,7 +188,7 @@ define SetupEclipseWorkspaceBody
     $1_PLAIN_MAKE_TARGETS := update-build-docs docs gensrc gendata copy java \
         launchers libs hotspot jdk product-images product-bundles all-images test-image clean
 
-    $1_MATCHING_MAKE_TARGETS += $$(foreach name,$$($1_PLAIN_MAKE_TARGETS), \
+    $1_MATCHING_MAKE_TARGETS += $$(foreach name, $$($1_PLAIN_MAKE_TARGETS), \
       <target name="$$(strip $$(name))" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> \
           <buildCommand>$$($1_MAKE)</buildCommand> \
           <buildArguments>-C $$(call FixPath, $(TOPDIR))</buildArguments> \
@@ -292,7 +292,7 @@ define SetupEclipseWorkspaceBody
   endif
 
   ifneq ($$(findstring $$($1_NATURE), JAVA MIXED), )
-    $1_LINKED_RESOURCES += $$(foreach src,$(JAVA_DIRS), \
+    $1_LINKED_RESOURCES += $$(foreach src, $(JAVA_DIRS), \
         <link> \
             <name>$$(strip $$(src))</name> \
             <type>2</type> \
@@ -317,7 +317,7 @@ define SetupEclipseWorkspaceBody
   endif
 
   ifneq ($$(findstring $$($1_NATURE), NATIVE MIXED), )
-    $1_LINKED_RESOURCES += $$(foreach src,$(NATIVE_DIRS), \
+    $1_LINKED_RESOURCES += $$(foreach src, $(NATIVE_DIRS), \
         <link> \
             <name>$$(strip $$(src))</name> \
             <type>2</type> \
diff --git a/make/ide/idea/jdk/idea.gmk b/make/ide/idea/jdk/idea.gmk
index 310b582591c..cc4d0a174cd 100644
--- a/make/ide/idea/jdk/idea.gmk
+++ b/make/ide/idea/jdk/idea.gmk
@@ -28,8 +28,8 @@ include make/MainSupport.gmk
 
 .PHONY: idea
 
-ifeq ($(SPEC),)
-  ifneq ($(words $(SPECS)),1)
+ifeq ($(SPEC), )
+  ifneq ($(words $(SPECS)), 1)
 	@echo "Error: Multiple build specification files found. Please select one explicitly."
 	@exit 2
   endif
@@ -39,7 +39,7 @@ ifeq ($(SPEC),)
 else #with SPEC
   include make/common/Modules.gmk
 
-  ifeq ($(MODULES),)
+  ifeq ($(MODULES), )
     SEL_MODULES := $(call FindAllModules)
   else
     SEL_MODULES := $(MODULES)
@@ -47,7 +47,7 @@ else #with SPEC
 
   idea:
 	$(ECHO) "SUPPORT=$(SUPPORT_OUTPUTDIR)" >> $(OUT)
-	$(ECHO) "MODULE_ROOTS=\"$(foreach mod, $(SEL_MODULES), $(call FindModuleSrcDirs,$(mod)))\"" >> $(OUT)
+	$(ECHO) "MODULE_ROOTS=\"$(foreach mod, $(SEL_MODULES), $(call FindModuleSrcDirs, $(mod)))\"" >> $(OUT)
 	$(ECHO) "MODULE_NAMES=\"$(strip $(foreach mod, $(SEL_MODULES), $(mod)))\"" >> $(OUT)
 	$(ECHO) "SEL_MODULES=\"$(SEL_MODULES)\"" >> $(OUT)
 	$(ECHO) "BOOT_JDK=\"$(BOOT_JDK)\"" >> $(OUT)
diff --git a/make/ide/visualstudio/hotspot/CreateVSProject.gmk b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
index 11efad2b4f2..db48cdea9f7 100644
--- a/make/ide/visualstudio/hotspot/CreateVSProject.gmk
+++ b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
@@ -80,7 +80,7 @@ ifeq ($(call isTargetOs, windows), true)
     -ignorePath zero \
       #
 
-  ################################################################################
+  ##############################################################################
   # Build the ProjectCreator java tool.
 
   TOOLS_OUTPUTDIR := $(MAKESUPPORT_OUTPUTDIR)/ide/visualstudio
diff --git a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
index bc56e878de6..5ceef111086 100644
--- a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
+++ b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
@@ -47,7 +47,7 @@ GetIndexerFragment = \
 ################################################################################
 # Show indexer-specific notes if they exist, otherwise do nothing
 ################################################################################
-ifneq (,$(wildcard $(call GetIndexerFragment,notes)))
+ifneq ($(wildcard $(call GetIndexerFragment,notes)), )
   ShowIndexerNotes = $(CAT) $(call GetIndexerFragment,notes)
 else
   ShowIndexerNotes =
@@ -66,7 +66,7 @@ endif
 # Return an additional configuration fragment if the WORKSPACE_ROOT is different
 # from TOPDIR.
 ################################################################################
-ifneq ($(WORKSPACE_ROOT),$(TOPDIR))
+ifneq ($(WORKSPACE_ROOT), $(TOPDIR))
   GetExtraWorkspaceRoot = $(TOPDIR)/make/ide/vscode/hotspot/template-workspace-folder.txt
 else
   GetExtraWorkspaceRoot = /dev/null
diff --git a/make/modules/java.base/Copy.gmk b/make/modules/java.base/Copy.gmk
index 5a4a5d400f2..fea544a47a1 100644
--- a/make/modules/java.base/Copy.gmk
+++ b/make/modules/java.base/Copy.gmk
@@ -131,7 +131,7 @@ POLICY_SRC_LIST := $(POLICY_SRC)
 $(POLICY_DST): $(POLICY_SRC_LIST)
 	$(call MakeTargetDir)
 	$(RM) $@ $@.tmp
-	$(foreach f,$(POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;)
+	$(foreach f, $(POLICY_SRC_LIST), $(CAT) $(f) >> $@.tmp;)
 	$(MV) $@.tmp $@
 
 TARGETS += $(POLICY_DST)
@@ -156,7 +156,7 @@ endif
 $(DEF_POLICY_DST): $(DEF_POLICY_SRC_LIST)
 	$(call MakeTargetDir)
 	$(RM) $@ $@.tmp
-	$(foreach f,$(DEF_POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;)
+	$(foreach f, $(DEF_POLICY_SRC_LIST), $(CAT) $(f) >> $@.tmp;)
 	$(MV) $@.tmp $@
 
 TARGETS += $(DEF_POLICY_DST)
diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index 978825ab0bd..2c3df4622b1 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -58,7 +58,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
         -delayload:winhttp.dll, \
     JDK_LIBS := libjava libjvm, \
     LIBS_linux := $(LIBDL), \
-    LIBS_aix := $(LIBDL),\
+    LIBS_aix := $(LIBDL), \
     LIBS_windows := advapi32.lib delayimp.lib iphlpapi.lib secur32.lib \
         winhttp.lib ws2_32.lib, \
     LIBS_macosx := \
diff --git a/make/modules/java.base/gensrc/GensrcBuffer.gmk b/make/modules/java.base/gensrc/GensrcBuffer.gmk
index ce22230a8e1..8255cc62eec 100644
--- a/make/modules/java.base/gensrc/GensrcBuffer.gmk
+++ b/make/modules/java.base/gensrc/GensrcBuffer.gmk
@@ -279,101 +279,101 @@ endef
 
 X_BUF := X-Buffer
 
-$(eval $(call SetupGenBuffer,ByteBuffer,  $(X_BUF), type:=byte, BIN:=1))
-$(eval $(call SetupGenBuffer,CharBuffer,  $(X_BUF), type:=char))
-$(eval $(call SetupGenBuffer,ShortBuffer, $(X_BUF), type:=short))
-$(eval $(call SetupGenBuffer,IntBuffer,   $(X_BUF), type:=int))
-$(eval $(call SetupGenBuffer,LongBuffer,  $(X_BUF), type:=long))
-$(eval $(call SetupGenBuffer,FloatBuffer, $(X_BUF), type:=float))
-$(eval $(call SetupGenBuffer,DoubleBuffer,$(X_BUF), type:=double))
+$(eval $(call SetupGenBuffer,ByteBuffer,  $(X_BUF), type := byte, BIN := 1))
+$(eval $(call SetupGenBuffer,CharBuffer,  $(X_BUF), type := char))
+$(eval $(call SetupGenBuffer,ShortBuffer, $(X_BUF), type := short))
+$(eval $(call SetupGenBuffer,IntBuffer,   $(X_BUF), type := int))
+$(eval $(call SetupGenBuffer,LongBuffer,  $(X_BUF), type := long))
+$(eval $(call SetupGenBuffer,FloatBuffer, $(X_BUF), type := float))
+$(eval $(call SetupGenBuffer,DoubleBuffer,$(X_BUF), type := double))
 
 # Buffers whose contents are heap-allocated
 #
 HEAP_X_BUF := Heap-X-Buffer
 
-$(eval $(call SetupGenBuffer,HeapByteBuffer,   $(HEAP_X_BUF), type:=byte))
-$(eval $(call SetupGenBuffer,HeapByteBufferR,  $(HEAP_X_BUF), type:=byte, RW:=R))
-$(eval $(call SetupGenBuffer,HeapCharBuffer,   $(HEAP_X_BUF), type:=char))
-$(eval $(call SetupGenBuffer,HeapCharBufferR,  $(HEAP_X_BUF), type:=char, RW:=R))
-$(eval $(call SetupGenBuffer,HeapShortBuffer,  $(HEAP_X_BUF), type:=short))
-$(eval $(call SetupGenBuffer,HeapShortBufferR, $(HEAP_X_BUF), type:=short, RW:=R))
-$(eval $(call SetupGenBuffer,HeapIntBuffer,    $(HEAP_X_BUF), type:=int))
-$(eval $(call SetupGenBuffer,HeapIntBufferR,   $(HEAP_X_BUF), type:=int, RW:=R))
-$(eval $(call SetupGenBuffer,HeapLongBuffer,   $(HEAP_X_BUF), type:=long))
-$(eval $(call SetupGenBuffer,HeapLongBufferR,  $(HEAP_X_BUF), type:=long, RW:=R))
-$(eval $(call SetupGenBuffer,HeapFloatBuffer,  $(HEAP_X_BUF), type:=float))
-$(eval $(call SetupGenBuffer,HeapFloatBufferR, $(HEAP_X_BUF), type:=float, RW:=R))
-$(eval $(call SetupGenBuffer,HeapDoubleBuffer, $(HEAP_X_BUF), type:=double))
-$(eval $(call SetupGenBuffer,HeapDoubleBufferR,$(HEAP_X_BUF), type:=double, RW:=R))
+$(eval $(call SetupGenBuffer,HeapByteBuffer,   $(HEAP_X_BUF), type := byte))
+$(eval $(call SetupGenBuffer,HeapByteBufferR,  $(HEAP_X_BUF), type := byte, RW := R))
+$(eval $(call SetupGenBuffer,HeapCharBuffer,   $(HEAP_X_BUF), type := char))
+$(eval $(call SetupGenBuffer,HeapCharBufferR,  $(HEAP_X_BUF), type := char, RW := R))
+$(eval $(call SetupGenBuffer,HeapShortBuffer,  $(HEAP_X_BUF), type := short))
+$(eval $(call SetupGenBuffer,HeapShortBufferR, $(HEAP_X_BUF), type := short, RW := R))
+$(eval $(call SetupGenBuffer,HeapIntBuffer,    $(HEAP_X_BUF), type := int))
+$(eval $(call SetupGenBuffer,HeapIntBufferR,   $(HEAP_X_BUF), type := int, RW := R))
+$(eval $(call SetupGenBuffer,HeapLongBuffer,   $(HEAP_X_BUF), type := long))
+$(eval $(call SetupGenBuffer,HeapLongBufferR,  $(HEAP_X_BUF), type := long, RW := R))
+$(eval $(call SetupGenBuffer,HeapFloatBuffer,  $(HEAP_X_BUF), type := float))
+$(eval $(call SetupGenBuffer,HeapFloatBufferR, $(HEAP_X_BUF), type := float, RW := R))
+$(eval $(call SetupGenBuffer,HeapDoubleBuffer, $(HEAP_X_BUF), type := double))
+$(eval $(call SetupGenBuffer,HeapDoubleBufferR,$(HEAP_X_BUF), type := double, RW := R))
 
 # Direct byte buffer
 #
 DIRECT_X_BUF := Direct-X-Buffer
 
-$(eval $(call SetupGenBuffer,DirectByteBuffer, $(DIRECT_X_BUF), type:=byte, BIN:=1))
-$(eval $(call SetupGenBuffer,DirectByteBufferR,$(DIRECT_X_BUF), type:=byte, BIN:=1, RW:=R))
+$(eval $(call SetupGenBuffer,DirectByteBuffer, $(DIRECT_X_BUF), type := byte, BIN := 1))
+$(eval $(call SetupGenBuffer,DirectByteBufferR,$(DIRECT_X_BUF), type := byte, BIN := 1, RW := R))
 
 # Unswapped views of direct byte buffers
 #
-$(eval $(call SetupGenBuffer,DirectCharBufferU,   $(DIRECT_X_BUF), type:=char, BO:=U))
-$(eval $(call SetupGenBuffer,DirectCharBufferRU,  $(DIRECT_X_BUF), type:=char, RW:=R, BO:=U))
-$(eval $(call SetupGenBuffer,DirectShortBufferU,  $(DIRECT_X_BUF), type:=short, BO:=U))
-$(eval $(call SetupGenBuffer,DirectShortBufferRU, $(DIRECT_X_BUF), type:=short, RW:=R, BO:=U))
-$(eval $(call SetupGenBuffer,DirectIntBufferU,    $(DIRECT_X_BUF), type:=int, BO:=U))
-$(eval $(call SetupGenBuffer,DirectIntBufferRU,   $(DIRECT_X_BUF), type:=int, RW:=R, BO:=U))
-$(eval $(call SetupGenBuffer,DirectLongBufferU,   $(DIRECT_X_BUF), type:=long, BO:=U))
-$(eval $(call SetupGenBuffer,DirectLongBufferRU,  $(DIRECT_X_BUF), type:=long, RW:=R, BO:=U))
-$(eval $(call SetupGenBuffer,DirectFloatBufferU,  $(DIRECT_X_BUF), type:=float, BO:=U))
-$(eval $(call SetupGenBuffer,DirectFloatBufferRU, $(DIRECT_X_BUF), type:=float, RW:=R, BO:=U))
-$(eval $(call SetupGenBuffer,DirectDoubleBufferU, $(DIRECT_X_BUF), type:=double, BO:=U))
-$(eval $(call SetupGenBuffer,DirectDoubleBufferRU,$(DIRECT_X_BUF), type:=double, RW:=R, BO:=U))
+$(eval $(call SetupGenBuffer,DirectCharBufferU,   $(DIRECT_X_BUF), type := char, BO := U))
+$(eval $(call SetupGenBuffer,DirectCharBufferRU,  $(DIRECT_X_BUF), type := char, RW := R, BO := U))
+$(eval $(call SetupGenBuffer,DirectShortBufferU,  $(DIRECT_X_BUF), type := short, BO := U))
+$(eval $(call SetupGenBuffer,DirectShortBufferRU, $(DIRECT_X_BUF), type := short, RW := R, BO := U))
+$(eval $(call SetupGenBuffer,DirectIntBufferU,    $(DIRECT_X_BUF), type := int, BO := U))
+$(eval $(call SetupGenBuffer,DirectIntBufferRU,   $(DIRECT_X_BUF), type := int, RW := R, BO := U))
+$(eval $(call SetupGenBuffer,DirectLongBufferU,   $(DIRECT_X_BUF), type := long, BO := U))
+$(eval $(call SetupGenBuffer,DirectLongBufferRU,  $(DIRECT_X_BUF), type := long, RW := R, BO := U))
+$(eval $(call SetupGenBuffer,DirectFloatBufferU,  $(DIRECT_X_BUF), type := float, BO := U))
+$(eval $(call SetupGenBuffer,DirectFloatBufferRU, $(DIRECT_X_BUF), type := float, RW := R, BO := U))
+$(eval $(call SetupGenBuffer,DirectDoubleBufferU, $(DIRECT_X_BUF), type := double, BO := U))
+$(eval $(call SetupGenBuffer,DirectDoubleBufferRU,$(DIRECT_X_BUF), type := double, RW := R, BO := U))
 
 # Swapped views of direct byte buffers
 #
-$(eval $(call SetupGenBuffer,DirectCharBufferS,   $(DIRECT_X_BUF), type:=char, BO:=S))
-$(eval $(call SetupGenBuffer,DirectCharBufferRS,  $(DIRECT_X_BUF), type:=char, RW:=R, BO:=S))
-$(eval $(call SetupGenBuffer,DirectShortBufferS,  $(DIRECT_X_BUF), type:=short, BO:=S))
-$(eval $(call SetupGenBuffer,DirectShortBufferRS, $(DIRECT_X_BUF), type:=short, RW:=R, BO:=S))
-$(eval $(call SetupGenBuffer,DirectIntBufferS,    $(DIRECT_X_BUF), type:=int, BO:=S))
-$(eval $(call SetupGenBuffer,DirectIntBufferRS,   $(DIRECT_X_BUF), type:=int, RW:=R, BO:=S))
-$(eval $(call SetupGenBuffer,DirectLongBufferS,   $(DIRECT_X_BUF), type:=long, BO:=S))
-$(eval $(call SetupGenBuffer,DirectLongBufferRS,  $(DIRECT_X_BUF), type:=long, RW:=R, BO:=S))
-$(eval $(call SetupGenBuffer,DirectFloatBufferS,  $(DIRECT_X_BUF), type:=float, BO:=S))
-$(eval $(call SetupGenBuffer,DirectFloatBufferRS, $(DIRECT_X_BUF), type:=float, RW:=R, BO:=S))
-$(eval $(call SetupGenBuffer,DirectDoubleBufferS, $(DIRECT_X_BUF), type:=double, BO:=S))
-$(eval $(call SetupGenBuffer,DirectDoubleBufferRS,$(DIRECT_X_BUF), type:=double, RW:=R, BO:=S))
+$(eval $(call SetupGenBuffer,DirectCharBufferS,   $(DIRECT_X_BUF), type := char, BO := S))
+$(eval $(call SetupGenBuffer,DirectCharBufferRS,  $(DIRECT_X_BUF), type := char, RW := R, BO := S))
+$(eval $(call SetupGenBuffer,DirectShortBufferS,  $(DIRECT_X_BUF), type := short, BO := S))
+$(eval $(call SetupGenBuffer,DirectShortBufferRS, $(DIRECT_X_BUF), type := short, RW := R, BO := S))
+$(eval $(call SetupGenBuffer,DirectIntBufferS,    $(DIRECT_X_BUF), type := int, BO := S))
+$(eval $(call SetupGenBuffer,DirectIntBufferRS,   $(DIRECT_X_BUF), type := int, RW := R, BO := S))
+$(eval $(call SetupGenBuffer,DirectLongBufferS,   $(DIRECT_X_BUF), type := long, BO := S))
+$(eval $(call SetupGenBuffer,DirectLongBufferRS,  $(DIRECT_X_BUF), type := long, RW := R, BO := S))
+$(eval $(call SetupGenBuffer,DirectFloatBufferS,  $(DIRECT_X_BUF), type := float, BO := S))
+$(eval $(call SetupGenBuffer,DirectFloatBufferRS, $(DIRECT_X_BUF), type := float, RW := R, BO := S))
+$(eval $(call SetupGenBuffer,DirectDoubleBufferS, $(DIRECT_X_BUF), type := double, BO := S))
+$(eval $(call SetupGenBuffer,DirectDoubleBufferRS,$(DIRECT_X_BUF), type := double, RW := R, BO := S))
 
 # Big-endian views of byte buffers
 #
 BYTE_X_BUF := ByteBufferAs-X-Buffer
 
-$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferB,   $(BYTE_X_BUF), type:=char, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRB,  $(BYTE_X_BUF), type:=char, RW:=R, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferB,  $(BYTE_X_BUF), type:=short, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRB, $(BYTE_X_BUF), type:=short, RW:=R, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferB,    $(BYTE_X_BUF), type:=int, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRB,   $(BYTE_X_BUF), type:=int, RW:=R, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferB,   $(BYTE_X_BUF), type:=long, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRB,  $(BYTE_X_BUF), type:=long, RW:=R, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferB,  $(BYTE_X_BUF), type:=float, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRB, $(BYTE_X_BUF), type:=float, RW:=R, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferB, $(BYTE_X_BUF), type:=double, BO:=B))
-$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRB,$(BYTE_X_BUF), type:=double, RW:=R, BO:=B))
+$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferB,   $(BYTE_X_BUF), type := char, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRB,  $(BYTE_X_BUF), type := char, RW := R, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferB,  $(BYTE_X_BUF), type := short, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRB, $(BYTE_X_BUF), type := short, RW := R, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferB,    $(BYTE_X_BUF), type := int, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRB,   $(BYTE_X_BUF), type := int, RW := R, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferB,   $(BYTE_X_BUF), type := long, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRB,  $(BYTE_X_BUF), type := long, RW := R, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferB,  $(BYTE_X_BUF), type := float, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRB, $(BYTE_X_BUF), type := float, RW := R, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferB, $(BYTE_X_BUF), type := double, BO := B))
+$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRB,$(BYTE_X_BUF), type := double, RW := R, BO := B))
 
 # Little-endian views of byte buffers
 #
-$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferL,   $(BYTE_X_BUF), type:=char, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRL,  $(BYTE_X_BUF), type:=char, RW:=R, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferL,  $(BYTE_X_BUF), type:=short, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRL, $(BYTE_X_BUF), type:=short, RW:=R, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferL,    $(BYTE_X_BUF), type:=int, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRL,   $(BYTE_X_BUF), type:=int, RW:=R, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferL,   $(BYTE_X_BUF), type:=long, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRL,  $(BYTE_X_BUF), type:=long, RW:=R, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferL,  $(BYTE_X_BUF), type:=float, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRL, $(BYTE_X_BUF), type:=float, RW:=R, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferL, $(BYTE_X_BUF), type:=double, BO:=L))
-$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF), type:=double, RW:=R, BO:=L))
+$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferL,   $(BYTE_X_BUF), type := char, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRL,  $(BYTE_X_BUF), type := char, RW := R, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferL,  $(BYTE_X_BUF), type := short, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRL, $(BYTE_X_BUF), type := short, RW := R, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferL,    $(BYTE_X_BUF), type := int, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRL,   $(BYTE_X_BUF), type := int, RW := R, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferL,   $(BYTE_X_BUF), type := long, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRL,  $(BYTE_X_BUF), type := long, RW := R, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferL,  $(BYTE_X_BUF), type := float, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRL, $(BYTE_X_BUF), type := float, RW := R, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferL, $(BYTE_X_BUF), type := double, BO := L))
+$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF), type := double, RW := R, BO := L))
 
 ###
 
diff --git a/make/modules/java.base/gensrc/GensrcExceptions.gmk b/make/modules/java.base/gensrc/GensrcExceptions.gmk
index 1c4974b4a28..f3509710a37 100644
--- a/make/modules/java.base/gensrc/GensrcExceptions.gmk
+++ b/make/modules/java.base/gensrc/GensrcExceptions.gmk
@@ -40,7 +40,7 @@ $(GENSRC_EXCEPTIONS_DST)/_the.%.marker: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
 	    $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_DEBUG)
 	$(TOUCH) $@
 
-GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D).marker)
+GENSRC_EXCEPTIONS += $(foreach D, $(GENSRC_EXCEPTIONS_SRC_DIRS), $(GENSRC_EXCEPTIONS_DST)/_the.$(D).marker)
 
 $(GENSRC_EXCEPTIONS): $(BUILD_TOOLS_JDK)
 
diff --git a/make/modules/java.base/gensrc/GensrcMisc.gmk b/make/modules/java.base/gensrc/GensrcMisc.gmk
index 578adce4e9d..19d7c6dee9d 100644
--- a/make/modules/java.base/gensrc/GensrcMisc.gmk
+++ b/make/modules/java.base/gensrc/GensrcMisc.gmk
@@ -87,7 +87,7 @@ ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
 else ifeq ($(TOOLCHAIN_TYPE), microsoft)
   CPP_FLAGS += -nologo
 
-  ifeq ($(OPENJDK_TARGET_CPU),aarch64)
+  ifeq ($(OPENJDK_TARGET_CPU), aarch64)
     # cl.exe does only recognize few file extensions as valid (ex: .c, .h, .cpp), so
     # make sure *.java.template files are recognized as valid input files
     CPP_FILEPREFIX = -Tc
diff --git a/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk b/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
index 4ec9ee587cc..ce91cdc861c 100644
--- a/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
+++ b/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
@@ -42,7 +42,7 @@ NATIVE_ACCESS_MODULES_LIST := $(call SubstComma, $(NATIVE_ACCESS_MODULES))
 VARDEPS_VALUE := $(BOOT_MODULES_LIST) $(PLATFORM_MODULES_LIST) $(NATIVE_ACCESS_MODULES_LIST)
 VARDEPS_FILE := $(call DependOnVariable, VARDEPS_VALUE)
 
-############################################################################
+################################################################################
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java: \
     $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java \
diff --git a/make/modules/java.base/lib/CoreLibraries.gmk b/make/modules/java.base/lib/CoreLibraries.gmk
index fb12547113a..61ac495968a 100644
--- a/make/modules/java.base/lib/CoreLibraries.gmk
+++ b/make/modules/java.base/lib/CoreLibraries.gmk
@@ -63,7 +63,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
     DISABLED_WARNINGS_clang_TimeZone_md.c := unused-variable, \
     JDK_LIBS := libjvm, \
     LIBS_linux := $(LIBDL), \
-    LIBS_aix := $(LIBDL) $(LIBM),\
+    LIBS_aix := $(LIBDL) $(LIBM), \
     LIBS_macosx := \
         -framework CoreFoundation \
         -framework Foundation \
diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
index aaf5100d83b..b2904f961fd 100644
--- a/make/modules/java.desktop/lib/AwtLibraries.gmk
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -127,7 +127,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_unix := $(LIBM), \
     LIBS_linux := $(LIBDL), \
-    LIBS_aix := $(LIBDL),\
+    LIBS_aix := $(LIBDL), \
     LIBS_macosx := \
         -framework ApplicationServices \
         -framework AudioToolbox \
diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index 5f3ae8ce214..31323021780 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -101,7 +101,8 @@ TARGETS += $(BUILD_LIBLCMS)
 ifeq ($(USE_EXTERNAL_LIBJPEG), true)
   LIBJAVAJPEG_INCLUDE_FILES := \
       imageioJPEG.c \
-      jpegdecoder.c
+      jpegdecoder.c \
+      #
   # If we're using an external library, we can't include our own SRC path
   # as includes, instead the system headers should be used.
   LIBJAVAJPEG_HEADERS_FROM_SRC := false
@@ -391,7 +392,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     DISABLED_WARNINGS_clang := $(HARFBUZZ_DISABLED_WARNINGS_clang), \
     DISABLED_WARNINGS_microsoft := $(HARFBUZZ_DISABLED_WARNINGS_microsoft), \
     LDFLAGS := $(LDFLAGS_CXX_JDK), \
-    LDFLAGS_FILTER_OUT :=-Wl$(COMMA)-z$(COMMA)defs, \
+    LDFLAGS_FILTER_OUT := -Wl$(COMMA)-z$(COMMA)defs, \
     LDFLAGS_aix := -Wl$(COMMA)-berok, \
     JDK_LIBS := libawt java.base:libjava $(LIBFONTMANAGER_JDK_LIBS), \
     JDK_LIBS_macosx := libawt_lwawt, \
diff --git a/make/modules/java.management/Lib.gmk b/make/modules/java.management/Lib.gmk
index b75278489ad..b9f79da4516 100644
--- a/make/modules/java.management/Lib.gmk
+++ b/make/modules/java.management/Lib.gmk
@@ -40,7 +40,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
     DISABLED_WARNINGS_gcc_VMManagementImpl.c := unused-variable, \
     DISABLED_WARNINGS_clang_VMManagementImpl.c := unused-variable, \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
-    LIBS_aix := -lperfstat,\
+    LIBS_aix := -lperfstat, \
     LIBS_windows := advapi32.lib psapi.lib, \
 ))
 
diff --git a/make/modules/jdk.javadoc/Gensrc.gmk b/make/modules/jdk.javadoc/Gensrc.gmk
index 7aa92545fee..0d25ff61e92 100644
--- a/make/modules/jdk.javadoc/Gensrc.gmk
+++ b/make/modules/jdk.javadoc/Gensrc.gmk
@@ -26,7 +26,7 @@
 include GensrcCommon.gmk
 include GensrcProperties.gmk
 
-$(eval $(call SetupVersionProperties, JAVADOC_VERSION,\
+$(eval $(call SetupVersionProperties, JAVADOC_VERSION, \
     jdk/javadoc/internal/tool/resources/version.properties))
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
diff --git a/make/modules/jdk.jdeps/Gensrc.gmk b/make/modules/jdk.jdeps/Gensrc.gmk
index a81297348f3..cb9a27908ce 100644
--- a/make/modules/jdk.jdeps/Gensrc.gmk
+++ b/make/modules/jdk.jdeps/Gensrc.gmk
@@ -29,7 +29,7 @@ include GensrcProperties.gmk
 $(eval $(call SetupVersionProperties, JAVAP_VERSION, \
     com/sun/tools/javap/resources/version.properties))
 
-$(eval $(call SetupVersionProperties, JDEPS_VERSION,\
+$(eval $(call SetupVersionProperties, JDEPS_VERSION, \
     com/sun/tools/jdeps/resources/version.properties))
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
diff --git a/make/modules/jdk.jlink/Launcher.gmk b/make/modules/jdk.jlink/Launcher.gmk
index f0543ef73b8..d4279065193 100644
--- a/make/modules/jdk.jlink/Launcher.gmk
+++ b/make/modules/jdk.jlink/Launcher.gmk
@@ -29,7 +29,7 @@ include LauncherCommon.gmk
 ## Build jimage
 ################################################################################
 
-$(eval $(call SetupBuildLauncher, jimage,\
+$(eval $(call SetupBuildLauncher, jimage, \
     MAIN_CLASS := jdk.tools.jimage.Main, \
     CFLAGS := -DENABLE_ARG_FILES, \
 ))
@@ -38,7 +38,7 @@ $(eval $(call SetupBuildLauncher, jimage,\
 ## Build jlink
 ################################################################################
 
-$(eval $(call SetupBuildLauncher, jlink,\
+$(eval $(call SetupBuildLauncher, jlink, \
     MAIN_CLASS := jdk.tools.jlink.internal.Main, \
     JAVA_ARGS := --add-modules ALL-DEFAULT, \
     CFLAGS := -DENABLE_ARG_FILES -DEXPAND_CLASSPATH_WILDCARDS, \
@@ -48,7 +48,7 @@ $(eval $(call SetupBuildLauncher, jlink,\
 ## Build jmod
 ################################################################################
 
-$(eval $(call SetupBuildLauncher, jmod,\
+$(eval $(call SetupBuildLauncher, jmod, \
     MAIN_CLASS := jdk.tools.jmod.Main, \
     CFLAGS := -DENABLE_ARG_FILES -DEXPAND_CLASSPATH_WILDCARDS, \
 ))
diff --git a/make/modules/jdk.management/Lib.gmk b/make/modules/jdk.management/Lib.gmk
index a16925ca192..cb65b37bda8 100644
--- a/make/modules/jdk.management/Lib.gmk
+++ b/make/modules/jdk.management/Lib.gmk
@@ -49,7 +49,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
     DISABLED_WARNINGS_clang_UnixOperatingSystem.c := format-nonliteral, \
     CFLAGS := $(LIBMANAGEMENT_EXT_CFLAGS), \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
-    LIBS_aix := -lperfstat,\
+    LIBS_aix := -lperfstat, \
     LIBS_windows := advapi32.lib psapi.lib, \
 ))
 
diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index 61c84b31a22..700aac3c9c6 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -149,7 +149,7 @@ $(eval $(call SetupJarArchive, BUILD_JDK_JAR, \
     SRCS := $(MICROBENCHMARK_CLASSES) $(JMH_UNPACKED_DIR), \
     BIN := $(MICROBENCHMARK_JAR_BIN), \
     SUFFIXES := .*, \
-    EXCLUDE_FILES:= _the.BUILD_JDK_MICROBENCHMARK_batch \
+    EXCLUDE_FILES := _the.BUILD_JDK_MICROBENCHMARK_batch \
         _the.BUILD_JDK_MICROBENCHMARK.vardeps _unpacked.marker, \
     EXTRA_MANIFEST_ATTR := $(MICROBENCHMARK_MANIFEST), \
     JARMAIN := org.openjdk.jmh.Main, \
diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index fee5fe86031..8916eee90d7 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -59,77 +59,93 @@ VM_TESTBASE_DIR := $(TOPDIR)/test/hotspot/jtreg/vmTestbase
 VM_SHARE_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/vm/share \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
+    #
 
 NSK_MONITORING_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
+    #
 
 NSK_JDI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native
+    -I$(VM_TESTBASE_DIR)/nsk/share/native \
+    #
 
 NSK_SHARE_JDI_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jdi
+    -I$(VM_TESTBASE_DIR)/nsk/share/jdi \
+    #
 
 NSK_SHARE_JNI_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
+    #
 
 RUNTIME_DEFMETH_INCLUDES := \
     -I$(TOPDIR)/test/hotspot/jtreg/vmTestbase/nsk/share/jni \
     -I$(TOPDIR)/test/hotspot/jtreg/vmTestbase/nsk/share/native \
-    -I$(TOPDIR)/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti
+    -I$(TOPDIR)/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti \
+    #
 
 NSK_SHARE_LOCKS_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/locks
+    -I$(VM_TESTBASE_DIR)/nsk/share/locks \
+    #
 
 MLVM_JVMTI_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
     -I$(VM_TESTBASE_DIR)/nsk/share/jni \
     -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \
     -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/agent_common \
-    -I$(VM_TESTBASE_DIR)/vm/mlvm/share
+    -I$(VM_TESTBASE_DIR)/vm/mlvm/share \
+    #
 
 MLVM_STRESS_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
+    #
 
 NSK_GC_LOCK_JNI_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/jni \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
+    #
 
 NSK_GC_LOCK_REF_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/jniref \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
+    #
 
 NSK_STRACE_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
+    #
 
 NSK_STRESS_JNI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/stress/jni
+    -I$(VM_TESTBASE_DIR)/nsk/stress/jni \
+    #
 
 NSK_JVMTI_AGENT_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/jni \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
     -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/agent_common
+    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/agent_common \
+    #
 
 NSK_JVMTI_AOD_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/jni \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
     -I$(VM_TESTBASE_DIR)/nsk/share/aod \
     -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/aod
+    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/aod \
+    #
 
 NSK_AOD_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/aod \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
+    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
+    #
 
 NO_FRAMEPOINTER_CFLAGS :=
 ifeq ($(call isTargetOs, linux), true)
@@ -140,7 +156,7 @@ BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libNoFramePointer := $(NO_FRAMEPOINTER_CFLA
 # Optimization -O3 needed, HIGH == -O3
 BUILD_HOTSPOT_JTREG_LIBRARIES_OPTIMIZATION_libNoFramePointer := HIGH
 
-JVMTI_COMMON_INCLUDES=-I$(TOPDIR)/test/lib/jdk/test/lib/jvmti
+JVMTI_COMMON_INCLUDES = -I$(TOPDIR)/test/lib/jdk/test/lib/jvmti
 
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libProcessUtils := $(VM_SHARE_INCLUDES)
 
@@ -762,7 +778,7 @@ BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libretransform002 := $(NSK_JVMTI_AGENT_INCL
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libretransform004 := $(NSK_JVMTI_AGENT_INCLUDES)
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libretransform003 := $(NSK_JVMTI_AGENT_INCLUDES)
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf006 :=$(NSK_JVMTI_AGENT_INCLUDES)
+BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf006 := $(NSK_JVMTI_AGENT_INCLUDES)
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf004 := $(NSK_JVMTI_AGENT_INCLUDES)
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf005 := $(NSK_JVMTI_AGENT_INCLUDES)
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetlocal001 := $(NSK_JVMTI_AGENT_INCLUDES)
@@ -1559,7 +1575,7 @@ build-test-hotspot-jtreg-native: $(BUILD_HOTSPOT_JTREG_LIBRARIES) $(BUILD_HOTSPO
 ################################################################################
 
 # Copy to hotspot jtreg test image
-$(eval $(call SetupCopyFiles,COPY_HOTSPOT_JTREG_NATIVE, \
+$(eval $(call SetupCopyFiles, COPY_HOTSPOT_JTREG_NATIVE, \
     SRC := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
     DEST := $(TEST_IMAGE_DIR)/hotspot/jtreg/native, \
     FILES := $(wildcard $(addprefix $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), /bin/* /lib/*)), \
diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index 46eeb7684b6..d9f1e334a5c 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -53,7 +53,8 @@ BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg
 BUILD_JDK_JTREG_EXECUTABLES_CFLAGS_exeJliLaunchTest := \
     -I$(TOPDIR)/src/java.base/share/native/libjli \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
-    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli
+    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
+    #
 
 BUILD_JDK_JTREG_EXECUTABLES_JDK_LIBS_exeJliLaunchTest := java.base:libjli
 BUILD_JDK_JTREG_EXECUTABLES_JDK_LIBS_exeCallerAccessTest := java.base:libjvm
@@ -154,7 +155,7 @@ build-test-jdk-jtreg-native: $(BUILD_JDK_JTREG_LIBRARIES) $(BUILD_JDK_JTREG_EXEC
 ################################################################################
 
 # Copy to jdk jtreg test image
-$(eval $(call SetupCopyFiles,COPY_JDK_JTREG_NATIVE, \
+$(eval $(call SetupCopyFiles, COPY_JDK_JTREG_NATIVE, \
     SRC := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
     DEST := $(TEST_IMAGE_DIR)/jdk/jtreg/native, \
     FILES := $(wildcard $(addprefix $(BUILD_JDK_JTREG_OUTPUT_DIR), /bin/* /lib/*)), \