--- old/make/jdk/src/classes/build/tools/charsetmapping/SPI.java	2018-12-06 18:39:58 +0000
+++ new/make/jdk/src/classes/build/tools/charsetmapping/SPI.java	2018-12-06 18:39:57 +0000
@@ -53,7 +53,7 @@
                                 .stream()
                                 .filter(cs -> cs.pkgName.equals("sun.nio.cs.ext") &&
                                               !cs.isInternal &&
-                                              (cs.os == null || cs.os.equals(os)))
+                                              cs.os == null)
                                 .forEach( cs -> {
                             out.printf("        charset(\"%s\", \"%s\",%n", cs.csName, cs.clzName);
                             out.printf("                new String[] {%n");