Skip to content

Commit 7658a57

Browse files
author
J. Duke
committed
Merge
2 parents e51fcf7 + ace2f73 commit 7658a57

543 files changed

Lines changed: 25617 additions & 17262 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.hgtags-top-repo‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,3 +446,4 @@ d2982a786f53814367698e63efe6349c9128e1db jdk-9+180
446446
b656dea9398ef601f7fc08d1a5157a560e0ccbe0 jdk-9+181
447447
682e2a6df836f4731f92eb2ddcd467075047f6ea jdk-10+20
448448
90cdfe56f1543267a8005e638bd1b44551fda189 jdk-10+21
449+
8625e8491887bfd4310b2cfc2b84bac26312ba20 jdk-10+22

‎common/autoconf/configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ JDKOPT_SETUP_CODE_COVERAGE
209209
# Need toolchain to setup dtrace
210210
HOTSPOT_SETUP_DTRACE
211211
HOTSPOT_ENABLE_DISABLE_AOT
212+
HOTSPOT_ENABLE_DISABLE_CDS
212213
HOTSPOT_ENABLE_DISABLE_GTEST
213214

214215
###############################################################################

‎common/autoconf/generated-configure.sh‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,7 @@ LIBCXX
702702
FIXPATH_DETACH_FLAG
703703
FIXPATH
704704
BUILD_GTEST
705+
ENABLE_CDS
705706
ENABLE_AOT
706707
GCOV_ENABLED
707708
ZIP_EXTERNAL_DEBUG_SYMBOLS
@@ -1191,6 +1192,7 @@ enable_zip_debug_info
11911192
enable_native_coverage
11921193
enable_dtrace
11931194
enable_aot
1195+
enable_cds
11941196
enable_hotspot_gtest
11951197
with_stdc__lib
11961198
with_msvcr_dll
@@ -1999,6 +2001,8 @@ Optional Features:
19992001
enable ahead of time compilation feature. Default is
20002002
auto, where aot is enabled if all dependencies are
20012003
present.
2004+
--enable-cds[=yes/no] enable class data sharing feature in non-minimal VM.
2005+
Default is yes.
20022006
--disable-hotspot-gtest Disables building of the Hotspot unit tests
20032007
--disable-freetype-bundling
20042008
disable bundling of the freetype library with the
@@ -2016,7 +2020,8 @@ Optional Features:
20162020
--disable-generate-classlist
20172021
forces enabling or disabling of the generation of a
20182022
CDS classlist at build time. Default is to generate
2019-
it when either the server or client JVMs are built.
2023+
it when either the server or client JVMs are built
2024+
and enable-cds is true.
20202025
--enable-sjavac use sjavac to do fast incremental compiles
20212026
[disabled]
20222027
--disable-javac-server disable javac server [enabled]
@@ -4295,7 +4300,7 @@ pkgadd_help() {
42954300

42964301
# All valid JVM features, regardless of platform
42974302
VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
4298-
graal fprof vm-structs jni-check services management all-gcs nmt cds \
4303+
graal vm-structs jni-check services management all-gcs nmt cds \
42994304
static-build link-time-opt aot"
43004305

43014306
# All valid JVM variants
@@ -4345,6 +4350,11 @@ VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
43454350
#
43464351

43474352

4353+
################################################################################
4354+
# Allow to disable CDS
4355+
#
4356+
4357+
43484358
###############################################################################
43494359
# Set up all JVM features for each JVM variant.
43504360
#
@@ -5151,7 +5161,7 @@ VS_SDK_PLATFORM_NAME_2013=
51515161
#CUSTOM_AUTOCONF_INCLUDE
51525162

51535163
# Do not change or remove the following line, it is needed for consistency checks:
5154-
DATE_WHEN_GENERATED=1504187184
5164+
DATE_WHEN_GENERATED=1504441177
51555165

51565166
###############################################################################
51575167
#
@@ -54216,6 +54226,23 @@ $as_echo "no, forced" >&6; }
5421654226

5421754227

5421854228

54229+
# Check whether --enable-cds was given.
54230+
if test "${enable_cds+set}" = set; then :
54231+
enableval=$enable_cds;
54232+
fi
54233+
54234+
54235+
if test "x$enable_cds" = "x" || test "x$enable_cds" = "xyes"; then
54236+
ENABLE_CDS="true"
54237+
elif test "x$enable_cds" = "xno"; then
54238+
ENABLE_CDS="false"
54239+
else
54240+
as_fn_error $? "Invalid value for --enable-cds: $enable_cds" "$LINENO" 5
54241+
fi
54242+
54243+
54244+
54245+
5421954246
# Check whether --enable-hotspot-gtest was given.
5422054247
if test "${enable_hotspot_gtest+set}" = set; then :
5422154248
enableval=$enable_hotspot_gtest;
@@ -65810,8 +65837,12 @@ $as_echo "yes, forced" >&6; }
6581065837
fi
6581165838
INCLUDE_GRAAL="true"
6581265839
else
65813-
# By default enable graal build where AOT is available
65814-
if test "x$ENABLE_AOT" = "xtrue"; then
65840+
# By default enable graal build on linux-x64 or where AOT is available.
65841+
# graal build requires jvmci.
65842+
if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
65843+
(test "x$OPENJDK_TARGET_CPU" = "xx86_64" && \
65844+
test "x$OPENJDK_TARGET_OS" = "xlinux" || \
65845+
test "x$ENABLE_AOT" = "xtrue") ; then
6581565846
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6581665847
$as_echo "yes" >&6; }
6581765848
JVM_FEATURES_graal="graal"
@@ -65856,7 +65887,10 @@ $as_echo "no" >&6; }
6585665887
fi
6585765888

6585865889
# All variants but minimal (and custom) get these features
65859-
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
65890+
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti vm-structs jni-check services management all-gcs nmt"
65891+
if test "x$ENABLE_CDS" = "xtrue"; then
65892+
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
65893+
fi
6586065894

6586165895
# Enable features depending on variant.
6586265896
JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
@@ -65960,7 +65994,7 @@ fi
6596065994

6596165995
# Check if it's likely that it's possible to generate the classlist. Depending
6596265996
# on exact jvm configuration it could be possible anyway.
65963-
if [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] ; then
65997+
if test "x$ENABLE_CDS" = "xtrue" && ( [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] ); then
6596465998
ENABLE_GENERATE_CLASSLIST_POSSIBLE="true"
6596565999
else
6596666000
ENABLE_GENERATE_CLASSLIST_POSSIBLE="false"
@@ -65973,8 +66007,8 @@ $as_echo_n "checking if the CDS classlist generation should be enabled... " >&6;
6597366007
$as_echo "yes, forced" >&6; }
6597466008
ENABLE_GENERATE_CLASSLIST="true"
6597566009
if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then
65976-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS" >&5
65977-
$as_echo "$as_me: WARNING: Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS" >&2;}
66010+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS" >&5
66011+
$as_echo "$as_me: WARNING: Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS" >&2;}
6597866012
fi
6597966013
elif test "x$enable_generate_classlist" = "xno"; then
6598066014
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5

‎common/autoconf/hotspot.m4‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
# All valid JVM features, regardless of platform
2727
VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
28-
graal fprof vm-structs jni-check services management all-gcs nmt cds \
28+
graal vm-structs jni-check services management all-gcs nmt cds \
2929
static-build link-time-opt aot"
3030

3131
# All valid JVM variants
@@ -240,6 +240,25 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
240240
AC_SUBST(ENABLE_AOT)
241241
])
242242

243+
################################################################################
244+
# Allow to disable CDS
245+
#
246+
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS],
247+
[
248+
AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no@:>@],
249+
[enable class data sharing feature in non-minimal VM. Default is yes.])])
250+
251+
if test "x$enable_cds" = "x" || test "x$enable_cds" = "xyes"; then
252+
ENABLE_CDS="true"
253+
elif test "x$enable_cds" = "xno"; then
254+
ENABLE_CDS="false"
255+
else
256+
AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds])
257+
fi
258+
259+
AC_SUBST(ENABLE_CDS)
260+
])
261+
243262
###############################################################################
244263
# Set up all JVM features for each JVM variant.
245264
#
@@ -335,8 +354,12 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
335354
fi
336355
INCLUDE_GRAAL="true"
337356
else
338-
# By default enable graal build where AOT is available
339-
if test "x$ENABLE_AOT" = "xtrue"; then
357+
# By default enable graal build on linux-x64 or where AOT is available.
358+
# graal build requires jvmci.
359+
if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
360+
(test "x$OPENJDK_TARGET_CPU" = "xx86_64" && \
361+
test "x$OPENJDK_TARGET_OS" = "xlinux" || \
362+
test "x$ENABLE_AOT" = "xtrue") ; then
340363
AC_MSG_RESULT([yes])
341364
JVM_FEATURES_graal="graal"
342365
INCLUDE_GRAAL="true"
@@ -374,7 +397,10 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
374397
fi
375398
376399
# All variants but minimal (and custom) get these features
377-
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
400+
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti vm-structs jni-check services management all-gcs nmt"
401+
if test "x$ENABLE_CDS" = "xtrue"; then
402+
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
403+
fi
378404
379405
# Enable features depending on variant.
380406
JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"

‎common/autoconf/jdk-options.m4‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,11 +496,12 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST],
496496
[
497497
AC_ARG_ENABLE([generate-classlist], [AS_HELP_STRING([--disable-generate-classlist],
498498
[forces enabling or disabling of the generation of a CDS classlist at build time.
499-
Default is to generate it when either the server or client JVMs are built.])])
499+
Default is to generate it when either the server or client JVMs are built and
500+
enable-cds is true.])])
500501
501502
# Check if it's likely that it's possible to generate the classlist. Depending
502503
# on exact jvm configuration it could be possible anyway.
503-
if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client); then
504+
if test "x$ENABLE_CDS" = "xtrue" && (HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client)); then
504505
ENABLE_GENERATE_CLASSLIST_POSSIBLE="true"
505506
else
506507
ENABLE_GENERATE_CLASSLIST_POSSIBLE="false"
@@ -511,7 +512,7 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST],
511512
AC_MSG_RESULT([yes, forced])
512513
ENABLE_GENERATE_CLASSLIST="true"
513514
if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then
514-
AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS])
515+
AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS])
515516
fi
516517
elif test "x$enable_generate_classlist" = "xno"; then
517518
AC_MSG_RESULT([no, forced])

‎common/conf/jib-profiles.js‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,49 @@ var getJibProfilesProfiles = function (input, common, data) {
818818
}
819819
},
820820

821+
"macosx-x64-open": {
822+
artifacts: {
823+
jdk: {
824+
local: "bundles/\\(jdk.*bin.tar.gz\\)",
825+
remote: [
826+
"bundles/openjdk/GPL/osx-x64/jdk-" + data.version
827+
+ "_osx-x64_bin.tar.gz",
828+
"bundles/openjdk/GPL/osx-x64/\\1"
829+
],
830+
subdir: "jdk-" + data.version
831+
},
832+
jre: {
833+
local: "bundles/\\(jre.*bin.tar.gz\\)",
834+
remote: "bundles/openjdk/GPL/osx-x64/\\1",
835+
},
836+
test: {
837+
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
838+
remote: [
839+
"bundles/openjdk/GPL/osx-x64/jdk-" + data.version
840+
+ "_osx-x64_bin-tests.tar.gz",
841+
"bundles/openjdk/GPL/osx-x64/\\1"
842+
]
843+
},
844+
jdk_symbols: {
845+
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
846+
remote: [
847+
"bundles/openjdk/GPL/osx-x64/jdk-" + data.version
848+
+ "_osx-x64_bin-symbols.tar.gz",
849+
"bundles/openjdk/GPL/osx-x64/\\1"
850+
],
851+
subdir: "jdk-" + data.version
852+
},
853+
jre_symbols: {
854+
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
855+
remote: "bundles/openjdk/GPL/osx-x64/\\1",
856+
},
857+
doc_api_spec: {
858+
local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)",
859+
remote: "bundles/openjdk/GPL/osx-x64/\\1",
860+
},
861+
}
862+
},
863+
821864
"windows-x86-open": {
822865
artifacts: {
823866
jdk: {
@@ -884,10 +927,11 @@ var getJibProfilesProfiles = function (input, common, data) {
884927
profiles["linux-x64-ri"] = clone(profiles["linux-x64-open"]);
885928
profiles["linux-x86-ri"] = clone(profiles["linux-x86-open"]);
886929
profiles["linux-x86-ri-debug"] = clone(profiles["linux-x86-open-debug"]);
930+
profiles["macosx-x64-ri"] = clone(profiles["macosx-x64-open"]);
887931
profiles["windows-x86-ri"] = clone(profiles["windows-x86-open"]);
888932

889933
// Generate artifacts for ri profiles
890-
[ "linux-x64-ri", "linux-x86-ri", "linux-x86-ri-debug", "windows-x86-ri" ]
934+
[ "linux-x64-ri", "linux-x86-ri", "linux-x86-ri-debug", "macosx-x64-ri", "windows-x86-ri" ]
891935
.forEach(function (name) {
892936
// Rewrite all remote dirs to "bundles/openjdk/BCL/..."
893937
for (artifactName in profiles[name].artifacts) {

‎corba/.hgtags‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,3 +446,4 @@ a923b3f30e7bddb4f960059ddfc7978fc63e2e6e jdk-10+18
446446
ba71941ad9dba53b8fffb30602ef673eee88696c jdk-9+181
447447
7a54ec280513a33e49e60546c0cf9ca573925a43 jdk-10+20
448448
68b5f8eeac3325c02aac2f4b452b8a37c20c970e jdk-10+21
449+
1f4456d51b07098af1848d0d968084b1e9b85a36 jdk-10+22

‎corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@
8585
* three {@code init} methods. Two of the three methods use the properties
8686
* (associations of a name with a value) shown in the
8787
* table below.<BR>
88-
* <TABLE class="plain">
89-
* <CAPTION>Standard Java CORBA Properties:</CAPTION>
88+
* <TABLE class="striped">
89+
* <CAPTION>Standard Java CORBA Properties</CAPTION>
9090
* <thead>
91-
* <TR><TH>Property Name</TH> <TH>Property Value</TH></TR>
91+
* <TR><TH scope="col">Property Name</TH> <TH scope="col">Property Value</TH></TR>
9292
* </thead>
93-
* <tbody>
94-
* <TR><TD>org.omg.CORBA.ORBClass</TD>
93+
* <tbody style="text-align:left">
94+
* <TR><TH scope="row">org.omg.CORBA.ORBClass</TH>
9595
* <TD>class name of an ORB implementation</TD></TR>
96-
* <TR><TD>org.omg.CORBA.ORBSingletonClass</TD>
96+
* <TR><TH scope="row">org.omg.CORBA.ORBSingletonClass</TH>
9797
* <TD>class name of the ORB returned by {@code init()}</TD></TR>
9898
* </tbody>
9999
* </TABLE>

0 commit comments

Comments
 (0)