# HG changeset patch # User naoto # Date 1492465562 25200 # Node ID 5d2b48f1f0a322aca719b49ff02ab421705bffc7 # Parent d578934825342d935bebbcafdc9466bcf653b511 8177314: java VM fails to start with a Japanese ShiftJIS locale Reviewed-by: sherman, mchung diff -r d57893482534 -r 5d2b48f1f0a3 make/data/charsetmapping/stdcs-linux --- a/make/data/charsetmapping/stdcs-linux Mon Apr 17 01:02:11 2017 -0700 +++ b/make/data/charsetmapping/stdcs-linux Mon Apr 17 14:46:02 2017 -0700 @@ -24,3 +24,5 @@ JIS_X_0212 JIS_X_0208_Solaris JIS_X_0212_Solaris +MS932 +SJIS # SJIS must go together with MS932 to support sun.nio.cs.map