Merge

openjdk · May 2, 2020 · 2731d62 · 2731d62
2 parents b938a4c + eb6ef3c
commit 2731d62
Show file tree

Hide file tree

Showing 286 changed files with 2,044 additions and 699 deletions.
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
@@ -205,7 +205,7 @@ define SetupJavaCompilationBody
   else ifeq ($$($1_COMPILER), interim)
     # Use java server if it is enabled, and the user does not want a specialized
     # class path.
-    ifeq ($$($1_ENABLE_JAVAC_SERVER+$$($1_CLASSPATH)), true+)
+    ifeq ($$(ENABLE_JAVAC_SERVER)+$$($1_CLASSPATH), true+)
       $1_JAVAC := $$(INTERIM_LANGTOOLS_ARGS) -m jdk.compiler.interim/com.sun.tools.sjavac.Main
 
       # How to launch the server. This must use JAVA_DETACH, which is the "big" java

diff --git a/make/data/cacerts/addtrustclass1ca b/make/data/cacerts/addtrustclass1ca
diff --git a/make/data/cacerts/keynectisrootca b/make/data/cacerts/keynectisrootca
diff --git a/make/data/charsetmapping/charsets b/make/data/charsetmapping/charsets
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -282,6 +282,7 @@ charset ISO-8859-16 ISO_8859_16
     alias   iso-ir-226
     alias   ISO_8859-16:2001
     alias   ISO_8859-16
+    alias   ISO8859_16
     alias   latin10
     alias   l10
     alias   csISO885916
@@ -697,7 +698,7 @@ charset x-euc-jp-linux EUC_JP_LINUX
 charset x-eucJP-Open EUC_JP_Open
     package sun.nio.cs.ext
     type    template
-    hisname EUC_JP_Solari
+    hisname EUC_JP_Solaris
     ascii   true
     alias   EUC_JP_Solaris       # JDK historical
     alias   eucJP-open
@@ -1391,7 +1392,7 @@ charset x-IBM833 IBM833
 
 charset x-IBM834 IBM834 # EBCDIC DBCS-only Korean
     package sun.nio.cs.ext
-    type    source
+    type    template
     alias   cp834
     alias   ibm834
     alias   834
@@ -1485,7 +1486,7 @@ charset x-IBM949 IBM949
 
 charset x-IBM949C IBM949C
     package sun.nio.cs.ext
-    type    source
+    type    template
     alias   cp949C              # JDK historical
     alias   ibm949C
     alias   ibm-949C

diff --git a/make/data/publicsuffixlist/VERSION b/make/data/publicsuffixlist/VERSION
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/33c1c788decfed1052089fa27e3005fe4088dec3/public_suffix_list.dat
-Date: 2019-09-28
+Github: https://raw.githubusercontent.com/publicsuffix/list/cbbba1d234670453df9c930dfbf510c0474d4301/public_suffix_list.dat
+Date: 2020-04-24