diff -r 91c2721ab63c -r c9bcd764f1f4 make/gensrc/Gensrc-jdk.charsets.gmk
--- a/make/gensrc/Gensrc-jdk.charsets.gmk	Fri Feb 01 10:38:00 2019 +0100
+++ b/make/gensrc/Gensrc-jdk.charsets.gmk	Fri Feb 01 10:38:57 2019 +0100
@@ -42,39 +42,51 @@
 CHARSET_EXTENDED_JAVA_DIR := $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
+# TODO: Lots of files in jdk/make/tools/CharsetMapping dir
+# FIXME: copy from Tools.gmk!!!
+TOOL_CHARSETMAPPING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.charsetmapping.Main $(LOG_INFO)
+
 $(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \
     $(wildcard $(CHARSET_DATA_DIR)/$(CHARSET_STANDARD_OS)) \
     $(CHARSET_TEMPLATES) $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
     $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating jdk.charsets extcs)
 	$(call MakeDir, $(@D))
-	$(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) \
+	$(call ExecuteWithLog, $@, $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) \
 	    extcs charsets  $(CHARSET_STANDARD_OS) \
 	    $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
 	    $(CHARSET_EXTENDED_JAVA_DIR) \
 	    $(CHARSET_COPYRIGHT_HEADER) \
-	    $(LOG_DEBUG)
+	    )
 	$(TOUCH) '$@'
 
+TOOL_CHARSETMAPPING_HKSCS := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.charsetmapping.HKSCS
+
 $(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER)/HKSCS.java \
     $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating jdk.charsets hkscs)
 	$(call MakeDir, $(@D))
-	$(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) hkscs '$<'
+	$(call ExecuteWithLog, $@, $(TOOL_CHARSETMAPPING_HKSCS) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) IGNORED_REMOVE '$<')
 	$(TOUCH) '$@'
 
+## THIS IS JUST A NO-OP! This does not do anything!!! Since JDK-8073893.
 $(CHARSET_DONE_CS)-euctw: $(CHARSET_COPYRIGHT_HEADER)/EUC_TW.java \
     $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating jdk.charsets euctw)
 	$(call MakeDir, $(@D))
-	$(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) euctw '$<'
+	# $(call ExecuteWithLog, $@, $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) euctw '$<')
 	$(TOUCH) '$@'
 
+TOOL_CHARSETMAPPING_SJIS := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.charsetmapping.JIS0213
+
 $(CHARSET_GENSRC_JAVA_DIR_CS)/sjis0213.dat: $(CHARSET_DATA_DIR)/sjis0213.map \
     $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call MakeDir, $(@D))
-	$(TOOL_CHARSETMAPPING) '$<' '$@' sjis0213
+	$(call ExecuteWithLog, $@, $(TOOL_CHARSETMAPPING_SJIS) '$<' '$@')
 
 GENSRC_JDK_CHARSETS += \
     $(CHARSET_DONE_CS)-extcs \