Skip to content

Commit 8fbcc82

Browse files
shipilevshipilev
committed
8273494: Zero: Put libjvm.so into "zero" folder, not "server"
Reviewed-by: ihse, sgehwolf
1 parent 92c30c9 commit 8fbcc82

6 files changed

Lines changed: 11 additions & 14 deletions

File tree

‎make/autoconf/flags-ldflags.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
3333
# Setup the target toolchain
3434
3535
# On some platforms (mac) the linker warns about non existing -L dirs.
36-
# For any of the variants server, client or minimal, the dir matches the
36+
# For any of the variants server, client, minimal or zero, the dir matches the
3737
# variant name. The "main" variant should be used for linking. For the
3838
# rest, the dir is just server.
3939
if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \
40-
|| HOTSPOT_CHECK_JVM_VARIANT(minimal); then
40+
|| HOTSPOT_CHECK_JVM_VARIANT(minimal) || HOTSPOT_CHECK_JVM_VARIANT(zero); then
4141
TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN
4242
else
4343
TARGET_JVM_VARIANT_PATH=server

‎make/autoconf/hotspot.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
8484
fi
8585
8686
# All "special" variants share the same output directory ("server")
87-
VALID_MULTIPLE_JVM_VARIANTS="server client minimal"
87+
VALID_MULTIPLE_JVM_VARIANTS="server client minimal zero"
8888
UTIL_GET_NON_MATCHING_VALUES(INVALID_MULTIPLE_VARIANTS, $JVM_VARIANTS, \
8989
$VALID_MULTIPLE_JVM_VARIANTS)
9090
if test "x$INVALID_MULTIPLE_VARIANTS" != x && \
@@ -95,7 +95,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
9595
# The "main" variant is the one used by other libs to link against during the
9696
# build.
9797
if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
98-
MAIN_VARIANT_PRIO_ORDER="server client minimal"
98+
MAIN_VARIANT_PRIO_ORDER="server client minimal zero"
9999
for variant in $MAIN_VARIANT_PRIO_ORDER; do
100100
if HOTSPOT_CHECK_JVM_VARIANT($variant); then
101101
JVM_VARIANT_MAIN="$variant"

‎make/hotspot/HotspotCommon.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ JVM_SUPPORT_DIR := $(JVM_VARIANT_OUTPUTDIR)/support
3434
DTRACE_SUPPORT_DIR := $(JVM_SUPPORT_DIR)/dtrace
3535

3636
LIB_OUTPUTDIR := $(call FindLibDirForModule, java.base)
37-
ifneq ($(filter client minimal, $(JVM_VARIANT)), )
37+
ifneq ($(filter client minimal zero, $(JVM_VARIANT)), )
3838
JVM_VARIANT_SUBDIR := $(JVM_VARIANT)
3939
else
4040
# Use 'server' as default target directory name for all other variants.

‎make/modules/java.base/Copy.gmk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ ifeq ($(call And, $(call isTargetOs, windows) $(call isTargetCpu, x86)), true)
9595
endif
9696
DEFAULT_CFG_VARIANT ?= server
9797

98-
# Any variant other than server, client or minimal is represented as server in
98+
# Any variant other than server, client, minimal, or zero is represented as server in
9999
# the cfg file.
100-
VALID_CFG_VARIANTS := server client minimal
100+
VALID_CFG_VARIANTS := server client minimal zero
101101
CFG_VARIANTS := $(filter $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)) \
102102
$(if $(filter-out $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)), server)
103103

‎make/modules/java.base/Lib.gmk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ ifeq ($(call isTargetOsType, unix), true)
156156
TARGETS += $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig)
157157
endef
158158

159-
# The subdir is the same as the variant for client and minimal, for all
159+
# The subdir is the same as the variant for client, minimal or zero, for all
160160
# others it's server.
161-
VARIANT_SUBDIRS := $(filter client minimal, $(JVM_VARIANTS)) \
162-
$(if $(filter-out client minimal, $(JVM_VARIANTS)), server)
161+
VARIANT_SUBDIRS := $(filter client minimal zero, $(JVM_VARIANTS)) \
162+
$(if $(filter-out client minimal zero, $(JVM_VARIANTS)), server)
163163
$(foreach v, $(VARIANT_SUBDIRS), $(eval $(call CreateSymlinks,$v)))
164164
endif
165165
############################################################################

‎test/lib/jdk/test/lib/Platform.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,10 +365,7 @@ private static String variant() {
365365
} else if (Platform.isMinimal()) {
366366
return "minimal";
367367
} else if (Platform.isZero()) {
368-
// This name is used to search for libjvm.so. Weirdly, current
369-
// build system puts libjvm.so into default location, which is
370-
// "server". See JDK-8273494.
371-
return "server";
368+
return "zero";
372369
} else {
373370
throw new Error("TESTBUG: unsupported vm variant");
374371
}

0 commit comments

Comments
 (0)