make/tools/src/build/tools/charsetmapping/SBCS.java

@@ -104,11 +104,11 @@
                     out.format("\" +%n");
             }
         }
     }
 
-    static Pattern sbmap = Pattern.compile("0x(\\p{XDigit}++)\\s++U\\+(\\p{XDigit}++)(\\s++#.*)?");
+    static Pattern sbmap = Pattern.compile("0x(\\p{XDigit}++)\\s++(?:U\\+|0x)?(\\p{XDigit}++)(?:\\s++#.*)?");
 
     private static void genClass0(String srcDir, String dstDir,
                                   String template,
                                   String clzName,
                                   String csName,