Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 7926:1fe211ae3d2b jdk8-b105
Merge
author | katleman |
---|---|
date | Mon, 26 Aug 2013 17:36:10 -0700 |
parents | 9626ba160e3d (current diff) 0417358184a1 (diff) |
children | 1a2a8d143583 |
files | |
diffstat | 1 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/CopyFiles.gmk Fri Aug 23 14:14:05 2013 -0700 +++ b/makefiles/CopyFiles.gmk Mon Aug 26 17:36:10 2013 -0700 @@ -292,8 +292,11 @@ JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) JVMCFG := $(JVMCFG_DIR)/jvm.cfg +# To do: should this also support -zeroshark? -ifeq ($(OPENJDK_TARGET_CPU_BITS),32) +ifeq ($(OPENJDK_TARGET_CPU_BITS),64) + COPY_JVM_CFG_FILE := true +else # On 32-bit machines we have three potential VMs: client, server and minimal. # Historically we usually have both client and server and so that is what the # committed jvm.cfg expects (including platform specific ergonomics switches @@ -302,16 +305,21 @@ # The main problem is deciding whether to use aliases for the VMs that are not # present and the current position is that we add aliases for client and server, but # not for minimal. - # To do: should this also support, -zero and -zeroshark? - CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT))) + ifeq ($(CLIENT_AND_SERVER), true) + COPY_JVM_CFG_FILE := true + else + # For zero, the default jvm.cfg file is sufficient + ifeq ($(JVM_VARIANT_ZERO), true) + COPY_JVM_CFG_FILE := true + endif + endif +endif - ifeq ($(CLIENT_AND_SERVER), true) - # Use the committed jvm.cfg for this 32 bit setup (the minimal - # VM is already KNOWN on platforms that potentially support it) +ifeq ($(COPY_JVM_CFG_FILE), true) $(JVMCFG): $(JVMCFG_SRC) $(call install-file) - else +else $(JVMCFG): $(MKDIR) -p $(@D) $(RM) $(@) @@ -338,12 +346,6 @@ endif endif endif - endif - -else - # Use the default jvm.cfg for this 64 bit setup. - $(JVMCFG): $(JVMCFG_SRC) - $(call install-file) endif COPY_FILES += $(JVMCFG)