--- old/make/gensrc/Gensrc-jdk.charsets.gmk	2015-02-17 16:34:46.054890998 +0100
+++ new/make/gensrc/Gensrc-jdk.charsets.gmk	2015-02-17 16:34:45.854882678 +0100
@@ -40,16 +40,17 @@
 CHARSET_EXTENDED_JAVA_TEMPLATES := \
     $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
 CHARSET_EXTENDED_JAVA_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
-CHARSET_EXTENDED := extcs
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \
-    $(CHARSET_TEMPLATES) $(CHARSET_EXTENDED_DATA) $(BUILD_TOOLS_JDK)
+    $(wildcard $(CHARSET_DATA_DIR)/$(CHARSET_STANDARD_OS)) \
+    $(CHARSET_TEMPLATES) $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
+    $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(@D)
 	$(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) \
-		extcs charsets  $(CHARSET_STANDARD_OS) \
-                $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
-		$(CHARSET_EXTENDED_JAVA_DIR)
+	    extcs charsets  $(CHARSET_STANDARD_OS) \
+	    $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
+	    $(CHARSET_EXTENDED_JAVA_DIR) $(LOG_INFO)
 	$(TOUCH) '$@'
 
 $(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER)/HKSCS.java \
--- old/make/gensrc/GensrcCharsetMapping.gmk	2015-02-17 16:34:46.618914460 +0100
+++ new/make/gensrc/GensrcCharsetMapping.gmk	2015-02-17 16:34:46.410905807 +0100
@@ -40,11 +40,13 @@
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_BASE)-stdcs: $(CHARSET_DATA_DIR)/charsets \
-    $(CHARSET_TEMPLATES) $(BUILD_TOOLS_JDK)
+    $(wildcard $(CHARSET_DATA_DIR)/$(CHARSET_STANDARD_OS)) \
+    $(CHARSET_TEMPLATES) $(CHARSET_STANDARD_JAVA_TEMPLATES) \
+    $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(@D)
 	$(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_BASE) \
-		stdcs charsets $(CHARSET_STANDARD_OS) \
-                $(CHARSET_STANDARD_JAVA_TEMPLATES) $(CHARSET_EXTSRC_DIR) \
+	    stdcs charsets $(CHARSET_STANDARD_OS) \
+	    $(CHARSET_STANDARD_JAVA_TEMPLATES) $(CHARSET_EXTSRC_DIR) $(LOG_INFO)
 	$(TOUCH) '$@'
 
 GENSRC_JAVA_BASE += $(CHARSET_DONE_BASE)-stdcs
--- old/make/src/classes/build/tools/charsetmapping/Main.java	2015-02-17 16:34:47.294942581 +0100
+++ new/make/src/classes/build/tools/charsetmapping/Main.java	2015-02-17 16:34:47.090934094 +0100
@@ -206,7 +206,7 @@
     }
 
     static void verbose(Charset cs) {
-         System.err.printf("%s, %s, %s, %s, %s  %b%n",
+         System.out.printf("%s, %s, %s, %s, %s  %b%n",
                            cs.clzName, cs.csName, cs.hisName, cs.pkgName, cs.type, cs.isASCII);
     }