8320763: Fix spacing arround assignment in spec.gmk.in

Reviewed-by: erikj, iris

Author: magicus

make/autoconf/spec.gmk.in

@@ -31,27 +31,27 @@
 # using 'configure @CONFIGURE_COMMAND_LINE@'
 
 # The command line given to configure.
-CONFIGURE_COMMAND_LINE:=@CONFIGURE_COMMAND_LINE@
+CONFIGURE_COMMAND_LINE := @CONFIGURE_COMMAND_LINE@
 # The current directory when configure was run
-CONFIGURE_START_DIR:=@CONFIGURE_START_DIR@
+CONFIGURE_START_DIR := @CONFIGURE_START_DIR@
 
 # How configure was originally called, if not called directly
 REAL_CONFIGURE_COMMAND_EXEC_SHORT := @REAL_CONFIGURE_COMMAND_EXEC_SHORT@
 REAL_CONFIGURE_COMMAND_EXEC_FULL := @REAL_CONFIGURE_COMMAND_EXEC_FULL@
 REAL_CONFIGURE_COMMAND_LINE := @REAL_CONFIGURE_COMMAND_LINE@
 
 # A self-referential reference to this file.
-SPEC:=@SPEC@
+SPEC := @SPEC@
 
 # Path to autoconf if overridden by the user, to be used by "make reconfigure"
 AUTOCONF := @AUTOCONF@
 
 # SPACE and COMMA are defined in MakeBase.gmk, but they are also used in
 # some definitions here, and are needed if MakeBase.gmk is not included before
 # this file.
-X:=
-SPACE:=$(X) $(X)
-COMMA:=,
+X :=
+SPACE := $(X) $(X)
+COMMA := ,
 
 # What make to use for main processing, after bootstrapping top-level Makefile.
 MAKE := @MAKE@
@@ -66,37 +66,37 @@ export CLASSPATH := @CLASSPATH@
 MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
     MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" $(MAKE_LOG_VARS)
 
-OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
-OUTPUT_SYNC:=@OUTPUT_SYNC@
+OUTPUT_SYNC_SUPPORTED := @OUTPUT_SYNC_SUPPORTED@
+OUTPUT_SYNC := @OUTPUT_SYNC@
 
 # Override the shell with bash
-BASH:=@BASH@
-BASH_ARGS:=@BASH_ARGS@
-SHELL:=$(BASH) $(BASH_ARGS)
+BASH := @BASH@
+BASH_ARGS := @BASH_ARGS@
+SHELL := $(BASH) $(BASH_ARGS)
 
 # The "human readable" name of this configuration
-CONF_NAME:=@CONF_NAME@
+CONF_NAME := @CONF_NAME@
 
 # The built jdk will run in this target system.
-OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
-OPENJDK_TARGET_OS_TYPE:=@OPENJDK_TARGET_OS_TYPE@
-OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
-OPENJDK_TARGET_OS_UPPERCASE:=@OPENJDK_TARGET_OS_UPPERCASE@
+OPENJDK_TARGET_OS := @OPENJDK_TARGET_OS@
+OPENJDK_TARGET_OS_TYPE := @OPENJDK_TARGET_OS_TYPE@
+OPENJDK_TARGET_OS_ENV := @OPENJDK_TARGET_OS_ENV@
+OPENJDK_TARGET_OS_UPPERCASE := @OPENJDK_TARGET_OS_UPPERCASE@
 
-OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
-OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
-OPENJDK_TARGET_CPU_BITS:=@OPENJDK_TARGET_CPU_BITS@
-OPENJDK_TARGET_CPU_ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
+OPENJDK_TARGET_CPU := @OPENJDK_TARGET_CPU@
+OPENJDK_TARGET_CPU_ARCH := @OPENJDK_TARGET_CPU_ARCH@
+OPENJDK_TARGET_CPU_BITS := @OPENJDK_TARGET_CPU_BITS@
+OPENJDK_TARGET_CPU_ENDIAN := @OPENJDK_TARGET_CPU_ENDIAN@
 
-OPENJDK_TARGET_LIBC:=@OPENJDK_TARGET_LIBC@
+OPENJDK_TARGET_LIBC := @OPENJDK_TARGET_LIBC@
 
-COMPILE_TYPE:=@COMPILE_TYPE@
+COMPILE_TYPE := @COMPILE_TYPE@
 
 # Legacy support
-OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
-OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
-OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
-OPENJDK_TARGET_OS_INCLUDE_SUBDIR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
+OPENJDK_TARGET_CPU_LEGACY := @OPENJDK_TARGET_CPU_LEGACY@
+OPENJDK_TARGET_CPU_LEGACY_LIB := @OPENJDK_TARGET_CPU_LEGACY_LIB@
+OPENJDK_TARGET_CPU_OSARCH := @OPENJDK_TARGET_CPU_OSARCH@
+OPENJDK_TARGET_OS_INCLUDE_SUBDIR := @OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
 
 HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@
 HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_TARGET_OS_TYPE@
@@ -107,31 +107,31 @@ HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_TARGET_CPU_DEFINE@
 
 HOTSPOT_TARGET_LIBC := @HOTSPOT_TARGET_LIBC@
 
-OPENJDK_TARGET_BUNDLE_PLATFORM:=@OPENJDK_TARGET_BUNDLE_PLATFORM@
+OPENJDK_TARGET_BUNDLE_PLATFORM := @OPENJDK_TARGET_BUNDLE_PLATFORM@
 JDK_ARCH_ABI_PROP_NAME := @JDK_ARCH_ABI_PROP_NAME@
 
 # We are building on this build system.
 # When not cross-compiling, it is the same as the target.
-OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@
-OPENJDK_BUILD_OS_TYPE:=@OPENJDK_BUILD_OS_TYPE@
-OPENJDK_BUILD_OS_ENV:=@OPENJDK_BUILD_OS_ENV@
+OPENJDK_BUILD_OS := @OPENJDK_BUILD_OS@
+OPENJDK_BUILD_OS_TYPE := @OPENJDK_BUILD_OS_TYPE@
+OPENJDK_BUILD_OS_ENV := @OPENJDK_BUILD_OS_ENV@
 
-OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
-OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
-OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
-OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
+OPENJDK_BUILD_CPU := @OPENJDK_BUILD_CPU@
+OPENJDK_BUILD_CPU_ARCH := @OPENJDK_BUILD_CPU_ARCH@
+OPENJDK_BUILD_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@
+OPENJDK_BUILD_CPU_ENDIAN := @OPENJDK_BUILD_CPU_ENDIAN@
 
-OPENJDK_BUILD_LIBC:=@OPENJDK_BUILD_LIBC@
+OPENJDK_BUILD_LIBC := @OPENJDK_BUILD_LIBC@
 
-OPENJDK_BUILD_OS_INCLUDE_SUBDIR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
+OPENJDK_BUILD_OS_INCLUDE_SUBDIR := @OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
 
 # Target platform value in ModuleTarget class file attribute.
-OPENJDK_MODULE_TARGET_PLATFORM:=@OPENJDK_MODULE_TARGET_PLATFORM@
+OPENJDK_MODULE_TARGET_PLATFORM := @OPENJDK_MODULE_TARGET_PLATFORM@
 
 # OS_* properties in release file
-RELEASE_FILE_OS_NAME:=@RELEASE_FILE_OS_NAME@
-RELEASE_FILE_OS_ARCH:=@RELEASE_FILE_OS_ARCH@
-RELEASE_FILE_LIBC:=@RELEASE_FILE_LIBC@
+RELEASE_FILE_OS_NAME := @RELEASE_FILE_OS_NAME@
+RELEASE_FILE_OS_ARCH := @RELEASE_FILE_OS_ARCH@
+RELEASE_FILE_LIBC := @RELEASE_FILE_LIBC@
 
 SOURCE_DATE := @SOURCE_DATE@
 ISO_8601_FORMAT_STRING := @ISO_8601_FORMAT_STRING@
@@ -142,8 +142,8 @@ ifneq ($(SOURCE_DATE), updated)
   SOURCE_DATE_ISO_8601 := @SOURCE_DATE_ISO_8601@
 endif
 
-LIBM:=@LIBM@
-LIBDL:=@LIBDL@
+LIBM := @LIBM@
+LIBDL := @LIBDL@
 
 WINENV_ROOT := @WINENV_ROOT@
 WINENV_PREFIX := @WINENV_PREFIX@
@@ -169,37 +169,37 @@ SYSROOT_CFLAGS := @SYSROOT_CFLAGS@
 SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@
 
 # The top-level directory of the source repository
-TOPDIR:=@TOPDIR@
+TOPDIR := @TOPDIR@
 # Usually the top level directory, but could be something else if a custom
 # root is defined.
-WORKSPACE_ROOT:=@WORKSPACE_ROOT@
-IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@
-IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@
-IMPORT_MODULES_LIBS:=@IMPORT_MODULES_LIBS@
-IMPORT_MODULES_CONF:=@IMPORT_MODULES_CONF@
-IMPORT_MODULES_LEGAL:=@IMPORT_MODULES_LEGAL@
-IMPORT_MODULES_MAN:=@IMPORT_MODULES_MAN@
-IMPORT_MODULES_SRC:=@IMPORT_MODULES_SRC@
-IMPORT_MODULES_MAKE:=@IMPORT_MODULES_MAKE@
-
-COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
-HOTSPOT_BUILD_TIME:=@HOTSPOT_BUILD_TIME@
+WORKSPACE_ROOT := @WORKSPACE_ROOT@
+IMPORT_MODULES_CLASSES := @IMPORT_MODULES_CLASSES@
+IMPORT_MODULES_CMDS := @IMPORT_MODULES_CMDS@
+IMPORT_MODULES_LIBS := @IMPORT_MODULES_LIBS@
+IMPORT_MODULES_CONF := @IMPORT_MODULES_CONF@
+IMPORT_MODULES_LEGAL := @IMPORT_MODULES_LEGAL@
+IMPORT_MODULES_MAN := @IMPORT_MODULES_MAN@
+IMPORT_MODULES_SRC := @IMPORT_MODULES_SRC@
+IMPORT_MODULES_MAKE := @IMPORT_MODULES_MAKE@
+
+COPYRIGHT_YEAR := @COPYRIGHT_YEAR@
+HOTSPOT_BUILD_TIME := @HOTSPOT_BUILD_TIME@
 
 # Platform naming variables
-LAUNCHER_NAME:=@LAUNCHER_NAME@
-PRODUCT_NAME:=@PRODUCT_NAME@
-PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
-JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
-JDK_RC_NAME:=@JDK_RC_NAME@
-COMPANY_NAME:=@COMPANY_NAME@
-HOTSPOT_VM_DISTRO:=@HOTSPOT_VM_DISTRO@
-MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
-MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
-MACOSX_BUNDLE_BUILD_VERSION=@MACOSX_BUNDLE_BUILD_VERSION@
-USERNAME:=@USERNAME@
-VENDOR_URL:=@VENDOR_URL@
-VENDOR_URL_BUG:=@VENDOR_URL_BUG@
-VENDOR_URL_VM_BUG:=@VENDOR_URL_VM_BUG@
+LAUNCHER_NAME := @LAUNCHER_NAME@
+PRODUCT_NAME := @PRODUCT_NAME@
+PRODUCT_SUFFIX := @PRODUCT_SUFFIX@
+JDK_RC_PLATFORM_NAME := @JDK_RC_PLATFORM_NAME@
+JDK_RC_NAME := @JDK_RC_NAME@
+COMPANY_NAME := @COMPANY_NAME@
+HOTSPOT_VM_DISTRO := @HOTSPOT_VM_DISTRO@
+MACOSX_BUNDLE_NAME_BASE = @MACOSX_BUNDLE_NAME_BASE@
+MACOSX_BUNDLE_ID_BASE = @MACOSX_BUNDLE_ID_BASE@
+MACOSX_BUNDLE_BUILD_VERSION = @MACOSX_BUNDLE_BUILD_VERSION@
+USERNAME := @USERNAME@
+VENDOR_URL := @VENDOR_URL@
+VENDOR_URL_BUG := @VENDOR_URL_BUG@
+VENDOR_URL_VM_BUG := @VENDOR_URL_VM_BUG@
 
 # New (JEP-223) version information
 
@@ -298,11 +298,11 @@ ifneq ($(VENDOR_URL_VM_BUG),)
 endif
 
 # Different naming strings generated from the above information.
-RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
+RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
 
 # How to compile the code: release, fastdebug or slowdebug
-DEBUG_LEVEL:=@DEBUG_LEVEL@
-HOTSPOT_DEBUG_LEVEL:=@HOTSPOT_DEBUG_LEVEL@
+DEBUG_LEVEL := @DEBUG_LEVEL@
+HOTSPOT_DEBUG_LEVEL := @HOTSPOT_DEBUG_LEVEL@
 
 # Which JVM variants to build (space-separated list)
 JVM_VARIANTS := @JVM_VARIANTS@
@@ -342,19 +342,19 @@ ENABLE_FULL_DOCS := @ENABLE_FULL_DOCS@
 
 OUTPUTDIR := @OUTPUTDIR@
 # Colon left out to be able to override IMAGES_OUTPUTDIR for bootcycle-images
-SUPPORT_OUTPUTDIR=$(OUTPUTDIR)/support
-BUILDTOOLS_OUTPUTDIR=$(OUTPUTDIR)/buildtools
+SUPPORT_OUTPUTDIR = $(OUTPUTDIR)/support
+BUILDTOOLS_OUTPUTDIR = $(OUTPUTDIR)/buildtools
 
-HOTSPOT_OUTPUTDIR=$(OUTPUTDIR)/hotspot
-JDK_OUTPUTDIR=$(OUTPUTDIR)/jdk
-IMAGES_OUTPUTDIR=$(OUTPUTDIR)/images
-BUNDLES_OUTPUTDIR=$(OUTPUTDIR)/bundles
-TESTMAKE_OUTPUTDIR=$(OUTPUTDIR)/test-make
-MAKESUPPORT_OUTPUTDIR=$(OUTPUTDIR)/make-support
+HOTSPOT_OUTPUTDIR = $(OUTPUTDIR)/hotspot
+JDK_OUTPUTDIR = $(OUTPUTDIR)/jdk
+IMAGES_OUTPUTDIR = $(OUTPUTDIR)/images
+BUNDLES_OUTPUTDIR = $(OUTPUTDIR)/bundles
+TESTMAKE_OUTPUTDIR = $(OUTPUTDIR)/test-make
+MAKESUPPORT_OUTPUTDIR = $(OUTPUTDIR)/make-support
 
 # This does not get overridden in a bootcycle build
-CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
-BUILDJDK_OUTPUTDIR=$(OUTPUTDIR)/buildjdk
+CONFIGURESUPPORT_OUTPUTDIR := @CONFIGURESUPPORT_OUTPUTDIR@
+BUILDJDK_OUTPUTDIR = $(OUTPUTDIR)/buildjdk
 
 BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@
 
@@ -380,49 +380,49 @@ HSDIS_LIBS := @HSDIS_LIBS@
 
 # The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
 # it in sync.
-BOOT_JDK:=@BOOT_JDK@
+BOOT_JDK := @BOOT_JDK@
 
-BUILD_JDK:=@BUILD_JDK@
-CREATE_BUILDJDK:=@CREATE_BUILDJDK@
-EXTERNAL_BUILDJDK:=@EXTERNAL_BUILDJDK@
+BUILD_JDK := @BUILD_JDK@
+CREATE_BUILDJDK := @CREATE_BUILDJDK@
+EXTERNAL_BUILDJDK := @EXTERNAL_BUILDJDK@
 
 # Whether the boot jdk jar supports --date=TIMESTAMP
-BOOT_JDK_JAR_SUPPORTS_DATE:=@BOOT_JDK_JAR_SUPPORTS_DATE@
+BOOT_JDK_JAR_SUPPORTS_DATE := @BOOT_JDK_JAR_SUPPORTS_DATE@
 
 # When compiling Java source to be run by the boot jdk
 # use these extra flags, eg -source 6 -target 6
-BOOT_JDK_SOURCETARGET:=@BOOT_JDK_SOURCETARGET@
+BOOT_JDK_SOURCETARGET := @BOOT_JDK_SOURCETARGET@
 
 # Information about the build system
-NUM_CORES:=@NUM_CORES@
-MEMORY_SIZE:=@MEMORY_SIZE@
-ENABLE_JAVAC_SERVER:=@ENABLE_JAVAC_SERVER@
+NUM_CORES := @NUM_CORES@
+MEMORY_SIZE := @MEMORY_SIZE@
+ENABLE_JAVAC_SERVER := @ENABLE_JAVAC_SERVER@
 # Store javac server synchronization files here, and
 # the javac server log files.
-JAVAC_SERVER_DIR=$(MAKESUPPORT_OUTPUTDIR)/javacservers
+JAVAC_SERVER_DIR = $(MAKESUPPORT_OUTPUTDIR)/javacservers
 
 # Number of parallel jobs to use for compilation
-JOBS?=@JOBS@
-TEST_JOBS?=@TEST_JOBS@
+JOBS ?= @JOBS@
+TEST_JOBS ?= @TEST_JOBS@
 
 # Default make target
-DEFAULT_MAKE_TARGET:=@DEFAULT_MAKE_TARGET@
-DEFAULT_LOG:=@DEFAULT_LOG@
+DEFAULT_MAKE_TARGET := @DEFAULT_MAKE_TARGET@
+DEFAULT_LOG := @DEFAULT_LOG@
 
 # Fallback linker
-ENABLE_FALLBACK_LINKER:=@ENABLE_FALLBACK_LINKER@
-
-FREETYPE_TO_USE:=@FREETYPE_TO_USE@
-FREETYPE_LIBS:=@FREETYPE_LIBS@
-FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
-FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@
-CUPS_CFLAGS:=@CUPS_CFLAGS@
-ALSA_LIBS:=@ALSA_LIBS@
-ALSA_CFLAGS:=@ALSA_CFLAGS@
-LIBFFI_LIBS:=@LIBFFI_LIBS@
-LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
-ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
-LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
+ENABLE_FALLBACK_LINKER := @ENABLE_FALLBACK_LINKER@
+
+FREETYPE_TO_USE := @FREETYPE_TO_USE@
+FREETYPE_LIBS := @FREETYPE_LIBS@
+FREETYPE_CFLAGS := @FREETYPE_CFLAGS@
+FONTCONFIG_CFLAGS := @FONTCONFIG_CFLAGS@
+CUPS_CFLAGS := @CUPS_CFLAGS@
+ALSA_LIBS := @ALSA_LIBS@
+ALSA_CFLAGS := @ALSA_CFLAGS@
+LIBFFI_LIBS := @LIBFFI_LIBS@
+LIBFFI_CFLAGS := @LIBFFI_CFLAGS@
+ENABLE_LIBFFI_BUNDLING := @ENABLE_LIBFFI_BUNDLING@
+LIBFFI_LIB_FILE := @LIBFFI_LIB_FILE@
 FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
 REPRODUCIBLE_CFLAGS := @REPRODUCIBLE_CFLAGS@
 BRANCH_PROTECTION_CFLAGS := @BRANCH_PROTECTION_CFLAGS@
@@ -438,45 +438,45 @@ JMH_VERSION := @JMH_VERSION@
 GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@
 
 # Source file for cacerts
-CACERTS_FILE=@CACERTS_FILE@
+CACERTS_FILE = @CACERTS_FILE@
 # Source folder for user provided cacerts PEM files
-CACERTS_SRC=@CACERTS_SRC@
+CACERTS_SRC = @CACERTS_SRC@
 
 # Enable unlimited crypto policy
-UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
+UNLIMITED_CRYPTO = @UNLIMITED_CRYPTO@
 
-GCOV_ENABLED=@GCOV_ENABLED@
-JCOV_ENABLED=@JCOV_ENABLED@
-JCOV_HOME=@JCOV_HOME@
-JCOV_INPUT_JDK=@JCOV_INPUT_JDK@
-JCOV_FILTERS=@JCOV_FILTERS@
+GCOV_ENABLED = @GCOV_ENABLED@
+JCOV_ENABLED = @JCOV_ENABLED@
+JCOV_HOME = @JCOV_HOME@
+JCOV_INPUT_JDK = @JCOV_INPUT_JDK@
+JCOV_FILTERS = @JCOV_FILTERS@
 
 # AddressSanitizer
-ASAN_ENABLED:=@ASAN_ENABLED@
+ASAN_ENABLED := @ASAN_ENABLED@
 
 # LeakSanitizer
-LSAN_ENABLED:=@LSAN_ENABLED@
+LSAN_ENABLED := @LSAN_ENABLED@
 
 # UndefinedBehaviorSanitizer
-UBSAN_ENABLED:=@UBSAN_ENABLED@
-UBSAN_CFLAGS:=@UBSAN_CFLAGS@
-UBSAN_LDFLAGS:=@UBSAN_LDFLAGS@
+UBSAN_ENABLED := @UBSAN_ENABLED@
+UBSAN_CFLAGS := @UBSAN_CFLAGS@
+UBSAN_LDFLAGS := @UBSAN_LDFLAGS@
 
 # Necessary additional compiler flags to compile X11
-X_CFLAGS:=@X_CFLAGS@
-X_LIBS:=@X_LIBS@
+X_CFLAGS := @X_CFLAGS@
+X_LIBS := @X_LIBS@
 
 # The lowest required version of macosx
-MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
+MACOSX_VERSION_MIN = @MACOSX_VERSION_MIN@
 # The highest allowed version of macosx
-MACOSX_VERSION_MAX=@MACOSX_VERSION_MAX@
+MACOSX_VERSION_MAX = @MACOSX_VERSION_MAX@
 
 # The macosx code signing configuration
-MACOSX_CODESIGN_MODE:=@MACOSX_CODESIGN_MODE@
-MACOSX_CODESIGN_IDENTITY=@MACOSX_CODESIGN_IDENTITY@
+MACOSX_CODESIGN_MODE := @MACOSX_CODESIGN_MODE@
+MACOSX_CODESIGN_IDENTITY = @MACOSX_CODESIGN_IDENTITY@
 
 # Toolchain type: gcc, clang, xlc, microsoft...
-TOOLCHAIN_TYPE:=@TOOLCHAIN_TYPE@
+TOOLCHAIN_TYPE := @TOOLCHAIN_TYPE@
 TOOLCHAIN_VERSION := @TOOLCHAIN_VERSION@
 CC_VERSION_NUMBER := @CC_VERSION_NUMBER@
 CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
@@ -485,59 +485,59 @@ CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
 HOTSPOT_TOOLCHAIN_TYPE := @HOTSPOT_TOOLCHAIN_TYPE@
 
 # Option used to tell the compiler whether to create 32- or 64-bit executables
-COMPILER_TARGET_BITS_FLAG:=@COMPILER_TARGET_BITS_FLAG@
-COMPILER_SUPPORTS_TARGET_BITS_FLAG=@COMPILER_SUPPORTS_TARGET_BITS_FLAG@
+COMPILER_TARGET_BITS_FLAG := @COMPILER_TARGET_BITS_FLAG@
+COMPILER_SUPPORTS_TARGET_BITS_FLAG = @COMPILER_SUPPORTS_TARGET_BITS_FLAG@
 
 # Option used to pass a command file to the compiler
-COMPILER_COMMAND_FILE_FLAG:=@COMPILER_COMMAND_FILE_FLAG@
+COMPILER_COMMAND_FILE_FLAG := @COMPILER_COMMAND_FILE_FLAG@
 
 # Option for specifying a file which saves the binder commands
 # produced by the link step (for debugging, currently AIX only)
-COMPILER_BINDCMD_FILE_FLAG:=@COMPILER_BINDCMD_FILE_FLAG@
+COMPILER_BINDCMD_FILE_FLAG := @COMPILER_BINDCMD_FILE_FLAG@
 
-CC_OUT_OPTION:=@CC_OUT_OPTION@
-LD_OUT_OPTION:=@LD_OUT_OPTION@
-AR_OUT_OPTION:=@AR_OUT_OPTION@
+CC_OUT_OPTION := @CC_OUT_OPTION@
+LD_OUT_OPTION := @LD_OUT_OPTION@
+AR_OUT_OPTION := @AR_OUT_OPTION@
 
 # Flags used for overriding the default opt setting for a C/C++ source file.
-C_O_FLAG_HIGHEST_JVM:=@C_O_FLAG_HIGHEST_JVM@
-C_O_FLAG_HIGHEST:=@C_O_FLAG_HIGHEST@
-C_O_FLAG_HI:=@C_O_FLAG_HI@
-C_O_FLAG_NORM:=@C_O_FLAG_NORM@
-C_O_FLAG_NONE:=@C_O_FLAG_NONE@
-C_O_FLAG_SIZE:=@C_O_FLAG_SIZE@
-CXX_O_FLAG_HIGHEST_JVM:=@CXX_O_FLAG_HIGHEST_JVM@
-CXX_O_FLAG_HIGHEST:=@CXX_O_FLAG_HIGHEST@
-CXX_O_FLAG_HI:=@CXX_O_FLAG_HI@
-CXX_O_FLAG_NORM:=@CXX_O_FLAG_NORM@
-CXX_O_FLAG_NONE:=@CXX_O_FLAG_NONE@
-CXX_O_FLAG_SIZE:=@CXX_O_FLAG_SIZE@
+C_O_FLAG_HIGHEST_JVM := @C_O_FLAG_HIGHEST_JVM@
+C_O_FLAG_HIGHEST := @C_O_FLAG_HIGHEST@
+C_O_FLAG_HI := @C_O_FLAG_HI@
+C_O_FLAG_NORM := @C_O_FLAG_NORM@
+C_O_FLAG_NONE := @C_O_FLAG_NONE@
+C_O_FLAG_SIZE := @C_O_FLAG_SIZE@
+CXX_O_FLAG_HIGHEST_JVM := @CXX_O_FLAG_HIGHEST_JVM@
+CXX_O_FLAG_HIGHEST := @CXX_O_FLAG_HIGHEST@
+CXX_O_FLAG_HI := @CXX_O_FLAG_HI@
+CXX_O_FLAG_NORM := @CXX_O_FLAG_NORM@
+CXX_O_FLAG_NONE := @CXX_O_FLAG_NONE@
+CXX_O_FLAG_SIZE := @CXX_O_FLAG_SIZE@
 
 GENDEPS_FLAGS := @GENDEPS_FLAGS@
 
 DISABLE_WARNING_PREFIX := @DISABLE_WARNING_PREFIX@
-CFLAGS_WARNINGS_ARE_ERRORS:=@CFLAGS_WARNINGS_ARE_ERRORS@
+CFLAGS_WARNINGS_ARE_ERRORS := @CFLAGS_WARNINGS_ARE_ERRORS@
 DISABLED_WARNINGS := @DISABLED_WARNINGS@
 DISABLED_WARNINGS_C := @DISABLED_WARNINGS_C@
 DISABLED_WARNINGS_CXX := @DISABLED_WARNINGS_CXX@
 
 # A global flag (true or false) determining if native warnings are considered errors.
 WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
 
-CFLAGS_CCACHE:=@CFLAGS_CCACHE@
-ADLC_LANGSTD_CXXFLAGS=@ADLC_LANGSTD_CXXFLAGS@
-ADLC_LDFLAGS=@ADLC_LDFLAGS@
+CFLAGS_CCACHE := @CFLAGS_CCACHE@
+ADLC_LANGSTD_CXXFLAGS = @ADLC_LANGSTD_CXXFLAGS@
+ADLC_LDFLAGS = @ADLC_LDFLAGS@
 
 # Tools that potentially need to be cross compilation aware.
 CC := @CCACHE@ @ICECC@ @CC@
 
 # CFLAGS used to compile the jdk native libraries (C-code)
-CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@
-CXXFLAGS_JDKLIB:=@CXXFLAGS_JDKLIB@
+CFLAGS_JDKLIB := @CFLAGS_JDKLIB@
+CXXFLAGS_JDKLIB := @CXXFLAGS_JDKLIB@
 
 # CFLAGS used to compile the jdk native launchers (C-code)
-CFLAGS_JDKEXE:=@CFLAGS_JDKEXE@
-CXXFLAGS_JDKEXE:=@CXXFLAGS_JDKEXE@
+CFLAGS_JDKEXE := @CFLAGS_JDKEXE@
+CXXFLAGS_JDKEXE := @CXXFLAGS_JDKEXE@
 
 FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
 JVM_CFLAGS := @JVM_CFLAGS@
@@ -565,26 +565,26 @@ LD := @LD@
 SYSROOT := @SYSROOT@
 
 # LDFLAGS used to link the jdk native libraries (C-code)
-LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
-JDKLIB_LIBS:=@JDKLIB_LIBS@
+LDFLAGS_JDKLIB := @LDFLAGS_JDKLIB@
+JDKLIB_LIBS := @JDKLIB_LIBS@
 
 # LDFLAGS used to link the jdk native launchers (C-code)
-LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
-JDKEXE_LIBS:=@JDKEXE_LIBS@
+LDFLAGS_JDKEXE := @LDFLAGS_JDKEXE@
+JDKEXE_LIBS := @JDKEXE_LIBS@
 
 # LDFLAGS specific to C++ linking.
-LDFLAGS_CXX_JDK:=@LDFLAGS_CXX_JDK@
+LDFLAGS_CXX_JDK := @LDFLAGS_CXX_JDK@
 
 # LDFLAGS specific to partial linking.
-LDFLAGS_CXX_PARTIAL_LINKING:=@LDFLAGS_CXX_PARTIAL_LINKING@
+LDFLAGS_CXX_PARTIAL_LINKING := @LDFLAGS_CXX_PARTIAL_LINKING@
 
 # Sometimes a different linker is needed for c++ libs
 LDCXX := @LDCXX@
 # The flags for linking libstdc++ linker.
-LIBCXX:=@LIBCXX@
+LIBCXX := @LIBCXX@
 
 # Compiler and linker flags used when building native tests
-LDFLAGS_TESTEXE:=@LDFLAGS_TESTEXE@
+LDFLAGS_TESTEXE := @LDFLAGS_TESTEXE@
 
 # BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
 # build platform.
@@ -595,84 +595,84 @@ BUILD_LDCXX := @BUILD_LDCXX@
 BUILD_AS := @BUILD_AS@
 BUILD_AR := @BUILD_AR@
 BUILD_NM := @BUILD_NM@
-BUILD_OBJCOPY:=@BUILD_OBJCOPY@
-BUILD_STRIP:=@BUILD_STRIP@
-BUILD_SYSROOT_CFLAGS:=@BUILD_SYSROOT_CFLAGS@
-BUILD_SYSROOT_LDFLAGS:=@BUILD_SYSROOT_LDFLAGS@
+BUILD_OBJCOPY := @BUILD_OBJCOPY@
+BUILD_STRIP := @BUILD_STRIP@
+BUILD_SYSROOT_CFLAGS := @BUILD_SYSROOT_CFLAGS@
+BUILD_SYSROOT_LDFLAGS := @BUILD_SYSROOT_LDFLAGS@
 
 AS := @AS@
 
 # AR is used to create a static library (is ar in unix, lib.exe in windows)
 AR := @AR@
-ARFLAGS:=@ARFLAGS@
+ARFLAGS := @ARFLAGS@
 
-NM:=@NM@
-NMFLAGS:=@NMFLAGS@
-STRIP:=@STRIP@
-OBJDUMP:=@OBJDUMP@
-CXXFILT:=@CXXFILT@
+NM := @NM@
+NMFLAGS := @NMFLAGS@
+STRIP := @STRIP@
+OBJDUMP := @OBJDUMP@
+CXXFILT := @CXXFILT@
 
-LIPO:=@LIPO@
-INSTALL_NAME_TOOL:=@INSTALL_NAME_TOOL@
+LIPO := @LIPO@
+INSTALL_NAME_TOOL := @INSTALL_NAME_TOOL@
 METAL := @METAL@
 METALLIB := @METALLIB@
 
 # Options to linker to specify a mapfile.
 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_MAPFILE=@SET_SHARED_LIBRARY_MAPFILE@
+SET_SHARED_LIBRARY_MAPFILE = @SET_SHARED_LIBRARY_MAPFILE@
 
 #
 # Options for generating debug symbols
 COMPILE_WITH_DEBUG_SYMBOLS := @COMPILE_WITH_DEBUG_SYMBOLS@
 COPY_DEBUG_SYMBOLS := @COPY_DEBUG_SYMBOLS@
 ZIP_EXTERNAL_DEBUG_SYMBOLS := @ZIP_EXTERNAL_DEBUG_SYMBOLS@
 
-CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
-ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
+CFLAGS_DEBUG_SYMBOLS := @CFLAGS_DEBUG_SYMBOLS@
+ASFLAGS_DEBUG_SYMBOLS := @ASFLAGS_DEBUG_SYMBOLS@
 
 #
 # Compress (or not) jars
-COMPRESS_JARS=@COMPRESS_JARS@
+COMPRESS_JARS = @COMPRESS_JARS@
 
 # Options to linker to specify the library name.
 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_NAME=@SET_SHARED_LIBRARY_NAME@
+SET_SHARED_LIBRARY_NAME = @SET_SHARED_LIBRARY_NAME@
 
-SHARED_LIBRARY_FLAGS=@SHARED_LIBRARY_FLAGS@
+SHARED_LIBRARY_FLAGS = @SHARED_LIBRARY_FLAGS@
 
 # Set origin using the linker, ie use the relative path to the dependent library to find the dependencies.
 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_ORIGIN=@SET_SHARED_LIBRARY_ORIGIN@
-SET_EXECUTABLE_ORIGIN=@SET_EXECUTABLE_ORIGIN@
+SET_SHARED_LIBRARY_ORIGIN = @SET_SHARED_LIBRARY_ORIGIN@
+SET_EXECUTABLE_ORIGIN = @SET_EXECUTABLE_ORIGIN@
 
 # Different OS:es have different ways of naming shared libraries.
 # The SHARED_LIBRARY macro takes "verify" as and argument and returns:
 #    "libverify.so" or "libverify.dylib" or "verify.dll" depending on platform.
 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SHARED_LIBRARY=@SHARED_LIBRARY@
-STATIC_LIBRARY=@STATIC_LIBRARY@
-LIBRARY_PREFIX:=@LIBRARY_PREFIX@
-SHARED_LIBRARY_SUFFIX:=@SHARED_LIBRARY_SUFFIX@
-STATIC_LIBRARY_SUFFIX:=@STATIC_LIBRARY_SUFFIX@
-EXECUTABLE_SUFFIX:=@EXECUTABLE_SUFFIX@
-OBJ_SUFFIX:=@OBJ_SUFFIX@
-STATIC_BUILD:=@STATIC_BUILD@
-
-STRIPFLAGS:=@STRIPFLAGS@
-
-JAVA_FLAGS:=@JAVA_FLAGS@
-JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
-JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
-BUILD_JAVA_FLAGS_SMALL:=@BUILD_JAVA_FLAGS_SMALL@
-JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@
+SHARED_LIBRARY = @SHARED_LIBRARY@
+STATIC_LIBRARY = @STATIC_LIBRARY@
+LIBRARY_PREFIX := @LIBRARY_PREFIX@
+SHARED_LIBRARY_SUFFIX := @SHARED_LIBRARY_SUFFIX@
+STATIC_LIBRARY_SUFFIX := @STATIC_LIBRARY_SUFFIX@
+EXECUTABLE_SUFFIX := @EXECUTABLE_SUFFIX@
+OBJ_SUFFIX := @OBJ_SUFFIX@
+STATIC_BUILD := @STATIC_BUILD@
+
+STRIPFLAGS := @STRIPFLAGS@
+
+JAVA_FLAGS := @JAVA_FLAGS@
+JAVA_FLAGS_BIG := @JAVA_FLAGS_BIG@
+JAVA_FLAGS_SMALL := @JAVA_FLAGS_SMALL@
+BUILD_JAVA_FLAGS_SMALL := @BUILD_JAVA_FLAGS_SMALL@
+JAVA_TOOL_FLAGS_SMALL := @JAVA_TOOL_FLAGS_SMALL@
 
 # The *_CMD variables are defined separately to be easily overridden in bootcycle-spec.gmk
 # for bootcycle-images build. Make sure to keep them in sync. Do not use the *_CMD
 # versions of the variables directly.
-JAVA_CMD:=@JAVA@
-JAVAC_CMD:=@JAVAC@
-JAVADOC_CMD:=@JAVADOC@
-JAR_CMD:=@JAR@
+JAVA_CMD := @JAVA@
+JAVAC_CMD := @JAVAC@
+JAVADOC_CMD := @JAVADOC@
+JAR_CMD := @JAR@
 JLINK_CMD := @JLINK@
 JMOD_CMD := @JMOD@
 # These variables are meant to be used. They are defined with = instead of := to make
@@ -689,10 +689,10 @@ JTREG_JDK := @JTREG_JDK@
 JTREG_JAVA = @FIXPATH@ $(JTREG_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 
 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
-BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
-BUILD_JAVA_SMALL=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS_SMALL)
-BUILD_JAVAC=@FIXPATH@ $(BUILD_JDK)/bin/javac
-BUILD_JAR=@FIXPATH@ $(BUILD_JDK)/bin/jar
+BUILD_JAVA = @FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
+BUILD_JAVA_SMALL = @FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS_SMALL)
+BUILD_JAVAC = @FIXPATH@ $(BUILD_JDK)/bin/javac
+BUILD_JAR = @FIXPATH@ $(BUILD_JDK)/bin/jar
 
 DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
 
@@ -723,104 +723,104 @@ JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main
 
 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
 # Use = assignment to be able to override in bootcycle-spec.gmk
-NEW_JAVAC   = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS)
+NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS)
 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
 
-JMOD_COMPRESS:=@JMOD_COMPRESS@
-JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@
+JMOD_COMPRESS := @JMOD_COMPRESS@
+JLINK_KEEP_PACKAGED_MODULES := @JLINK_KEEP_PACKAGED_MODULES@
 
 RCFLAGS := @RCFLAGS@
 
 # Tools adhering to a minimal and common standard of posix compliance.
-AWK:=@AWK@
-BASENAME:=@BASENAME@
-CAT:=@CAT@
-CCACHE:=@CCACHE@
+AWK := @AWK@
+BASENAME := @BASENAME@
+CAT := @CAT@
+CCACHE := @CCACHE@
 # CD is going away, but remains to cater for legacy makefiles.
-CD:=cd
-CHMOD:=@CHMOD@
-CODESIGN:=@CODESIGN@
-CP:=@CP@
-CUT:=@CUT@
-DATE:=@DATE@
-IS_GNU_DATE:=@IS_GNU_DATE@
-DIFF:=@DIFF@
-DIRNAME:=@DIRNAME@
-DSYMUTIL:=@DSYMUTIL@
-FIND:=@FIND@
-FIND_DELETE:=@FIND_DELETE@
-FLOCK:=@FLOCK@
-ECHO:=@ECHO@
-EGREP:=@EGREP@
-FGREP:=@FGREP@
-GREP:=@GREP@
-GZIP:=@GZIP@
-HEAD:=@HEAD@
-LS:=@LS@
-LN:=@LN@
-MIG:=@MIG@
-MKDIR:=@MKDIR@
-MV:=@MV@
-NICE:=@NICE@
-PANDOC:=@PANDOC@
-PATCH:=@PATCH@
-PRINTF:=@PRINTF@
-READLINK:=@READLINK@
-RM:=@RM@
-RMDIR:=@RMDIR@
-SED:=@SED@
-SH:=@SH@
-SORT:=@SORT@
-TAR:=@TAR@
-TAIL:=@TAIL@
-TEE:=@TEE@
-TIME:=@TIME@
-IS_GNU_TIME:=@IS_GNU_TIME@
-TR:=@TR@
-TOUCH:=@TOUCH@
-WC:=@WC@
-XARGS:=@XARGS@
-ZIPEXE:=@ZIPEXE@
-UNZIP:=@UNZIP@
-MT:=@MT@
-RC:=@RC@
-DUMPBIN:=@DUMPBIN@
-PATHTOOL:=@PATHTOOL@
-WSLPATH:=@WSLPATH@
-LDD:=@LDD@
-OTOOL:=@OTOOL@
-READELF:=@READELF@
-EXPR:=@EXPR@
-FILE:=@FILE@
-DOT:=@DOT@
-GIT:=@GIT@
-OBJCOPY:=@OBJCOPY@
-SETFILE:=@SETFILE@
-XATTR:=@XATTR@
-JT_HOME:=@JT_HOME@
-JIB_HOME:=@JIB_HOME@
+CD := cd
+CHMOD := @CHMOD@
+CODESIGN := @CODESIGN@
+CP := @CP@
+CUT := @CUT@
+DATE := @DATE@
+IS_GNU_DATE := @IS_GNU_DATE@
+DIFF := @DIFF@
+DIRNAME := @DIRNAME@
+DSYMUTIL := @DSYMUTIL@
+FIND := @FIND@
+FIND_DELETE := @FIND_DELETE@
+FLOCK := @FLOCK@
+ECHO := @ECHO@
+EGREP := @EGREP@
+FGREP := @FGREP@
+GREP := @GREP@
+GZIP := @GZIP@
+HEAD := @HEAD@
+LS := @LS@
+LN := @LN@
+MIG := @MIG@
+MKDIR := @MKDIR@
+MV := @MV@
+NICE := @NICE@
+PANDOC := @PANDOC@
+PATCH := @PATCH@
+PRINTF := @PRINTF@
+READLINK := @READLINK@
+RM := @RM@
+RMDIR := @RMDIR@
+SED := @SED@
+SH := @SH@
+SORT := @SORT@
+TAR := @TAR@
+TAIL := @TAIL@
+TEE := @TEE@
+TIME := @TIME@
+IS_GNU_TIME := @IS_GNU_TIME@
+TR := @TR@
+TOUCH := @TOUCH@
+WC := @WC@
+XARGS := @XARGS@
+ZIPEXE := @ZIPEXE@
+UNZIP := @UNZIP@
+MT := @MT@
+RC := @RC@
+DUMPBIN := @DUMPBIN@
+PATHTOOL := @PATHTOOL@
+WSLPATH := @WSLPATH@
+LDD := @LDD@
+OTOOL := @OTOOL@
+READELF := @READELF@
+EXPR := @EXPR@
+FILE := @FILE@
+DOT := @DOT@
+GIT := @GIT@
+OBJCOPY := @OBJCOPY@
+SETFILE := @SETFILE@
+XATTR := @XATTR@
+JT_HOME := @JT_HOME@
+JIB_HOME := @JIB_HOME@
 DTRACE := @DTRACE@
 FIXPATH := @FIXPATH@
 FIXPATH_BASE := @FIXPATH_BASE@
-ULIMIT:=@ULIMIT@
+ULIMIT := @ULIMIT@
 
-TAR_TYPE:=@TAR_TYPE@
-TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@
-TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
+TAR_TYPE := @TAR_TYPE@
+TAR_INCLUDE_PARAM := @TAR_INCLUDE_PARAM@
+TAR_SUPPORTS_TRANSFORM := @TAR_SUPPORTS_TRANSFORM@
 
 # Build setup
-USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
-USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
-USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
-LIBZ_CFLAGS:=@LIBZ_CFLAGS@
-LIBZ_LIBS:=@LIBZ_LIBS@
-LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
-MSVCR_DLL:=@MSVCR_DLL@
-VCRUNTIME_1_DLL:=@VCRUNTIME_1_DLL@
-MSVCP_DLL:=@MSVCP_DLL@
-UCRT_DLL_DIR:=@UCRT_DLL_DIR@
-ENABLE_PANDOC:=@ENABLE_PANDOC@
-PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@
+USE_EXTERNAL_LIBJPEG := @USE_EXTERNAL_LIBJPEG@
+USE_EXTERNAL_LIBGIF := @USE_EXTERNAL_LIBGIF@
+USE_EXTERNAL_LIBZ := @USE_EXTERNAL_LIBZ@
+LIBZ_CFLAGS := @LIBZ_CFLAGS@
+LIBZ_LIBS := @LIBZ_LIBS@
+LIBZIP_CAN_USE_MMAP := @LIBZIP_CAN_USE_MMAP@
+MSVCR_DLL := @MSVCR_DLL@
+VCRUNTIME_1_DLL := @VCRUNTIME_1_DLL@
+MSVCP_DLL := @MSVCP_DLL@
+UCRT_DLL_DIR := @UCRT_DLL_DIR@
+ENABLE_PANDOC := @ENABLE_PANDOC@
+PANDOC_MARKDOWN_FLAG := @PANDOC_MARKDOWN_FLAG@
 
 ####################################################
 #
@@ -829,97 +829,97 @@ PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@
 
 # Common prefix for all installed files. Defaults to /usr/local,
 # but /opt/myjdk is another common version.
-INSTALL_PREFIX=@prefix@
+INSTALL_PREFIX = @prefix@
 
 # Directories containing architecture-dependent files should be relative to exec_prefix
-INSTALL_EXECPREFIX=@exec_prefix@
+INSTALL_EXECPREFIX = @exec_prefix@
 
 # java,javac,javap etc are installed here.
-INSTALL_BINDIR=@bindir@
+INSTALL_BINDIR = @bindir@
 
 # Read only architecture-independent data
-INSTALL_DATADIR=@datadir@
+INSTALL_DATADIR = @datadir@
 
 # Root of above.
-INSTALL_DATAROOTDIR=@datarootdir@
+INSTALL_DATAROOTDIR = @datarootdir@
 
 # Doc files, other than info and man.
-INSTALL_DOCDIR=@docdir@
+INSTALL_DOCDIR = @docdir@
 
 # Html documentation
-INSTALL_HTMLDIR=@htmldir@
+INSTALL_HTMLDIR = @htmldir@
 
 # Installing C header files, JNI headers for example.
-INSTALL_INCLUDEDIR=@includedir@
+INSTALL_INCLUDEDIR = @includedir@
 
 # Installing library files....
-INSTALL_INCLUDEDIR=@libdir@
+INSTALL_INCLUDEDIR = @libdir@
 
 # Executables that other programs run.
-INSTALL_LIBEXECDIR=@libexecdir@
+INSTALL_LIBEXECDIR = @libexecdir@
 
 # Locale-dependent but architecture-independent data, such as message catalogs.
-INSTALL_LOCALEDIR=@localedir@
+INSTALL_LOCALEDIR = @localedir@
 
 # Modifiable single-machine data
-INSTALL_LOCALSTATEDIR=@localstatedir@
+INSTALL_LOCALSTATEDIR = @localstatedir@
 
 # Man pages
-INSTALL_MANDIR=@mandir@
+INSTALL_MANDIR = @mandir@
 
 # Modifiable architecture-independent data.
-INSTALL_SHAREDSTATEDIR=@sharedstatedir@
+INSTALL_SHAREDSTATEDIR = @sharedstatedir@
 
 # Read-only single-machine data
-INSTALL_SYSCONFDIR=@sysconfdir@
+INSTALL_SYSCONFDIR = @sysconfdir@
 
 ####################################################
 #
 # Libraries
 #
 
-USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
-LCMS_CFLAGS:=@LCMS_CFLAGS@
-LCMS_LIBS:=@LCMS_LIBS@
+USE_EXTERNAL_LCMS := @USE_EXTERNAL_LCMS@
+LCMS_CFLAGS := @LCMS_CFLAGS@
+LCMS_LIBS := @LCMS_LIBS@
 
-USE_EXTERNAL_HARFBUZZ:=@USE_EXTERNAL_HARFBUZZ@
-HARFBUZZ_CFLAGS:=@HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS:=@HARFBUZZ_LIBS@
+USE_EXTERNAL_HARFBUZZ := @USE_EXTERNAL_HARFBUZZ@
+HARFBUZZ_CFLAGS := @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS := @HARFBUZZ_LIBS@
 
-USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
-PNG_LIBS:=@PNG_LIBS@
-PNG_CFLAGS:=@PNG_CFLAGS@
+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@
+INCLUDE_SA = @INCLUDE_SA@
+INCLUDE_JVMCI = @INCLUDE_JVMCI@
+INCLUDE_COMPILER2 = @INCLUDE_COMPILER2@
 
-OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
-OS_VERSION_MINOR:=@OS_VERSION_MINOR@
-OS_VERSION_MICRO:=@OS_VERSION_MICRO@
+OS_VERSION_MAJOR := @OS_VERSION_MAJOR@
+OS_VERSION_MINOR := @OS_VERSION_MINOR@
+OS_VERSION_MICRO := @OS_VERSION_MICRO@
 
 # Images directory definitions
-JDK_IMAGE_SUBDIR:=jdk
-JRE_IMAGE_SUBDIR:=jre
+JDK_IMAGE_SUBDIR := jdk
+JRE_IMAGE_SUBDIR := jre
 JCOV_IMAGE_SUBDIR := jdk-jcov
 
 # Colon left out to be able to override output dir for bootcycle-images
-JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
-JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
+JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
+JRE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
 JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
 
 # Test image, as above
-TEST_IMAGE_SUBDIR:=test
-TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR)
+TEST_IMAGE_SUBDIR := test
+TEST_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR)
 
 # Symbols image
-SYMBOLS_IMAGE_SUBDIR:=symbols
-SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR)
+SYMBOLS_IMAGE_SUBDIR := symbols
+SYMBOLS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR)
 
 # Interim image
 INTERIM_JMODS_DIR := $(SUPPORT_OUTPUTDIR)/interim-jmods
@@ -948,20 +948,20 @@ GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
 GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
 
 # Macosx bundles directory definitions
-JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
-JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
-JDK_MACOSX_BUNDLE_SUBDIR_SIGNED=jdk-bundle-signed
-JRE_MACOSX_BUNDLE_SUBDIR_SIGNED=jre-bundle-signed
-JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
-JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
-JDK_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
-JRE_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
-JDK_MACOSX_BUNDLE_TOP_DIR=jdk-$(VERSION_NUMBER).jdk
-JRE_MACOSX_BUNDLE_TOP_DIR=jre-$(VERSION_NUMBER).jre
-JDK_MACOSX_CONTENTS_SUBDIR=$(JDK_MACOSX_BUNDLE_TOP_DIR)/Contents
-JRE_MACOSX_CONTENTS_SUBDIR=$(JRE_MACOSX_BUNDLE_TOP_DIR)/Contents
-JDK_MACOSX_CONTENTS_DIR=$(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
-JRE_MACOSX_CONTENTS_DIR=$(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
+JDK_MACOSX_BUNDLE_SUBDIR = jdk-bundle
+JRE_MACOSX_BUNDLE_SUBDIR = jre-bundle
+JDK_MACOSX_BUNDLE_SUBDIR_SIGNED = jdk-bundle-signed
+JRE_MACOSX_BUNDLE_SUBDIR_SIGNED = jre-bundle-signed
+JDK_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
+JRE_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
+JDK_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
+JRE_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
+JDK_MACOSX_BUNDLE_TOP_DIR = jdk-$(VERSION_NUMBER).jdk
+JRE_MACOSX_BUNDLE_TOP_DIR = jre-$(VERSION_NUMBER).jre
+JDK_MACOSX_CONTENTS_SUBDIR = $(JDK_MACOSX_BUNDLE_TOP_DIR)/Contents
+JRE_MACOSX_CONTENTS_SUBDIR = $(JRE_MACOSX_BUNDLE_TOP_DIR)/Contents
+JDK_MACOSX_CONTENTS_DIR = $(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
+JRE_MACOSX_CONTENTS_DIR = $(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
 
 # Bundle names
 ifneq ($(VERSION_BUILD), )
@@ -993,13 +993,13 @@ STATIC_LIBS_GRAAL_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs-graal$(DEBUG_P
 JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 
 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
-JRE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
-JDK_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
+JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
+JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
 TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
-TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
-DOCS_JDK_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
-DOCS_JAVASE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
-DOCS_REFERENCE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
+TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
+DOCS_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
+DOCS_JAVASE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
+DOCS_REFERENCE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
 JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
 
 # This macro is called to allow inclusion of closed source counterparts.