Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 63528a6

Browse files
committedMay 10, 2018
8202683: Minimal VM should build cleanly on 64-bit platforms
Reviewed-by: erikj, dholmes
1 parent 1f776c3 commit 63528a6

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed
 

‎make/copy/Copy-java.base.gmk

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,25 +97,21 @@ else
9797
endif
9898
JVMCFG := $(LIB_DST_DIR)/jvm.cfg
9999

100-
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
100+
# We have three potential VMs: client, server and minimal.
101+
# Historically we usually have both client and server and so that is what the
102+
# committed jvm.cfg expects (including platform specific ergonomics switches
103+
# to decide whether to use client or server by default). So when we have anything
104+
# other than client and server we need to define a new jvm.cfg file.
105+
# The main problem is deciding whether to use aliases for the VMs that are not
106+
# present and the current position is that we add aliases for client and server, but
107+
# not for minimal.
108+
CLIENT_AND_SERVER := $(call check-jvm-variant, client)+$(call check-jvm-variant, server)
109+
ifeq ($(CLIENT_AND_SERVER), true+true)
101110
COPY_JVM_CFG_FILE := true
102111
else
103-
# On 32-bit machines we have three potential VMs: client, server and minimal.
104-
# Historically we usually have both client and server and so that is what the
105-
# committed jvm.cfg expects (including platform specific ergonomics switches
106-
# to decide whether to use client or server by default). So when we have anything
107-
# other than client and server we need to define a new jvm.cfg file.
108-
# The main problem is deciding whether to use aliases for the VMs that are not
109-
# present and the current position is that we add aliases for client and server, but
110-
# not for minimal.
111-
CLIENT_AND_SERVER := $(call check-jvm-variant, client)+$(call check-jvm-variant, server)
112-
ifeq ($(CLIENT_AND_SERVER), true+true)
112+
# For zero, the default jvm.cfg file is sufficient
113+
ifeq ($(call check-jvm-variant, zero), true)
113114
COPY_JVM_CFG_FILE := true
114-
else
115-
# For zero, the default jvm.cfg file is sufficient
116-
ifeq ($(call check-jvm-variant, zero), true)
117-
COPY_JVM_CFG_FILE := true
118-
endif
119115
endif
120116
endif
121117

0 commit comments

Comments
 (0)
Failed to load comments.