diff --git a/make/Docs.gmk b/make/Docs.gmk
index 965ae689e21..2d8ce7c2a69 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -262,7 +262,7 @@ define create_overview_file
   $$($1_OVERVIEW): $$($1_OVERVIEW_VARDEPS_FILE)
 	$$(call LogInfo, Creating overview.html for $1)
 	$$(call MakeDir, $$(@D))
-	$$(ECHO) -n '$$($1_OVERVIEW_TEXT)' > $$@
+	$$(PRINTF) "%s" '$$($1_OVERVIEW_TEXT)' > $$@
 endef
 
 ################################################################################
diff --git a/make/MainSupport.gmk b/make/MainSupport.gmk
index ae4858c35af..d8dc894c1e9 100644
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@@ -57,7 +57,7 @@ define SetupTargetBody
 endef
 
 define CleanDocs
-	@$(ECHO) -n "Cleaning docs ..."
+	@$(PRINTF) "Cleaning docs ..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/docs
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/javadoc
@@ -67,28 +67,28 @@ endef
 
 # Cleans the dir given as $1
 define CleanDir
-	@$(ECHO) -n "Cleaning $(strip $1) build artifacts ..."
+	@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
 	@$(ECHO) "" $(LOG_DEBUG)
 	($(CD) $(OUTPUTDIR) && $(RM) -r $1)
 	@$(ECHO) " done"
 endef
 
 define CleanSupportDir
-	@$(ECHO) -n "Cleaning$(strip $1) build artifacts ..."
+	@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define CleanMakeSupportDir
-	@$(ECHO) -n "Cleaning $(strip $1) make support artifacts ..."
+	@$(PRINTF) "Cleaning %s make support artifacts ..." "$(strip $1)"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define CleanTest
-	@$(ECHO) -n "Cleaning test $(strip $1) ..."
+	@$(PRINTF) "Cleaning test %s ..." "$(strip $1)"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/test/$(strip $(subst -,/,$1))
         # Remove as much of the test directory structure as is empty
@@ -97,25 +97,25 @@ define CleanTest
 endef
 
 define Clean-gensrc
-	@$(ECHO) -n "Cleaning gensrc $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "Cleaning gensrc %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define Clean-java
-	@$(ECHO) -n "Cleaning java $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "Cleaning java %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/special_classes/$(strip $1)
 	$(ECHO) " done"
-	$(ECHO) -n "Cleaning headers $(if $1,for $(strip $1) )..."
+	$(PRINTF) "Cleaning headers %s..." "$(if $1,for $(strip $1) )"
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define Clean-native
-	@$(ECHO) -n "Cleaning native $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "Cleaning native %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/native/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
@@ -124,7 +124,7 @@ define Clean-native
 endef
 
 define Clean-include
-	@$(ECHO) -n "Cleaning include $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "Cleaning include %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_include/$(strip $1)
 	@$(ECHO) " done"
diff --git a/make/autoconf/help.m4 b/make/autoconf/help.m4
index 93796d27f06..d8c0b2ffaef 100644
--- a/make/autoconf/help.m4
+++ b/make/autoconf/help.m4
@@ -292,12 +292,12 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   $ECHO "* Debug level:    $DEBUG_LEVEL"
   $ECHO "* HS debug level: $HOTSPOT_DEBUG_LEVEL"
   $ECHO "* JVM variants:   $JVM_VARIANTS"
-  $ECHO -n "* JVM features:   "
+  $PRINTF "* JVM features:   "
 
   for variant in $JVM_VARIANTS; do
     features_var_name=JVM_FEATURES_$variant
     JVM_FEATURES_FOR_VARIANT=${!features_var_name}
-    $ECHO -n "$variant: '$JVM_FEATURES_FOR_VARIANT' "
+    $PRINTF "%s: \'%s\' " "$variant" "$JVM_FEATURES_FOR_VARIANT"
   done
   $ECHO ""
 
diff --git a/make/common/FindTests.gmk b/make/common/FindTests.gmk
index 41cf08d9e48..517bb2973f4 100644
--- a/make/common/FindTests.gmk
+++ b/make/common/FindTests.gmk
@@ -59,14 +59,14 @@ ifeq ($(GENERATE_FIND_TESTS_FILE), true)
 	$(call MakeTargetDir)
 	( $(foreach root, $(JTREG_TESTROOTS), \
 	    $(ECHO) ""; \
-	    $(ECHO) -n "$(root)_JTREG_TEST_GROUPS := "; \
+	    $(PRINTF) "\n%s_JTREG_TEST_GROUPS := " "$(root)"; \
 	    $(SED) -n -e 's/^\#.*//g' -e 's/\([^ ]*\)\w*=.*/\1/gp' \
 	      $($(root)_JTREG_GROUP_FILES) \
 	      | $(SORT) -u | $(TR) '\n' ' ' ; \
 	  ) \
 	) > $@
 	$(ECHO) "" >> $@
-	$(ECHO) -n "MAKE_TEST_TARGETS := " >> $@
+	$(PRINTF) "MAKE_TEST_TARGETS := " >> $@
 	$(MAKE) -s --no-print-directory $(MAKE_ARGS) \
 	    SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
 	    TARGETS_FILE=$@
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 663e9075cf8..725424d7618 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -180,7 +180,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
 	$(call MakeTargetDir)
 	$(RM) $@
 	$(foreach m, $(MODULE_INFOS), \
-	    ( $(ECHO) -n "DEPS_$(call GetModuleNameFromModuleInfo, $m) := " && \
+	    ( $(PRINTF) "DEPS_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
 	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
 	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
 	          /^ *requires/ { sub(/;/, ""); \
@@ -194,7 +194,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
 	                          gsub(/\r/, ""); \
 	                          printf(" %s", $$0) } \
 	          END           { printf("\n") }' $m && \
-	      $(ECHO) -n "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) := " && \
+	      $(PRINTF) "TRANSITIVE_MODULES_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
 	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
 	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
 	          /^ *requires  *transitive/ { \