--- old/makefiles/CopyFiles.gmk 2013-04-15 18:15:41.676949761 -0400 +++ new/makefiles/CopyFiles.gmk 2013-04-15 18:15:40.116861509 -0400 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, 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 @@ -287,45 +287,66 @@ ifeq ($(OPENJDK_TARGET_CPU_BITS),32) - # On 32 bit machines, we can have client and/or server libjvms installed. - # Since the currently committed jvm.cfg expects clientANDserver, we need - # to patch the jvm.cfg when we have built only a client or only a server. - # This should also support -kernel, -zero and -zeroshark. - ifeq ($(JVM_VARIANTS),$(COMMA)client$(COMMA)) - # Create a patched jvm.cfg to use -client by default and alias -server to -client. - $(JVMCFG): - $(MKDIR) -p $(@D) - $(RM) $(JVMCFG) - $(PRINTF) "-client KNOWN\n">$(JVMCFG) - $(PRINTF) "-server ALIASED_TO -client\n">>$(JVMCFG) - $(PRINTF) "-hotspot ALIASED_TO -client\n">>$(JVMCFG) - $(PRINTF) "-classic WARN\n">>$(JVMCFG) - $(PRINTF) "-native ERROR\n">>$(JVMCFG) - $(PRINTF) "-green ERROR\n">>$(JVMCFG) - + # 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 + # to decide whether to use client or server by default). So when we have anything + # other than client and server we need to define a new jvm.cfg file. + # 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) + # Use the committed jvm.cfg for this 32 bit setup but add + # minimal if needed + $(JVMCFG): $(JVMCFG_SRC) + $(call install-file) + ifeq ($(JVM_VARIANT_MINIMAL1), true) + $(PRINTF) "-minimal KNOWN\n">>$(@) + endif + else + $(JVMCFG): + $(MKDIR) -p $(@D) + $(RM) $(@) + + # Now check for other permutations + ifeq ($(JVM_VARIANT_SERVER), true) + $(PRINTF) "-server KNOWN\n">>$(@) + $(PRINTF) "-client ALIASED_TO -server\n">>$(@) + $(PRINTF) "-hotspot ALIASED_TO -server\n">>$(@) + ifeq ($(JVM_VARIANT_MINIMAL1), true) + $(PRINTF) "-minimal KNOWN\n">>$(@) + endif else - ifeq ($(JVM_VARIANTS),$(COMMA)server$(COMMA)) - # Create a patched jvm.cfg to use -server by default and alias -client to -server. - - $(JVMCFG): - $(MKDIR) -p $(@D) - $(RM) $(JVMCFG) - $(PRINTF) "-server KNOWN\n">$(JVMCFG) - $(PRINTF) "-client IGNORE\n">>$(JVMCFG) - $(PRINTF) "-hotspot IGNORE\n">>$(JVMCFG) - $(PRINTF) "-classic WARN\n">>$(JVMCFG) - $(PRINTF) "-native ERROR\n">>$(JVMCFG) - $(PRINTF) "-green ERROR\n">>$(JVMCFG) + ifeq ($(JVM_VARIANT_CLIENT), true) + $(PRINTF) "-client KNOWN\n">>$(@) + $(PRINTF) "-server ALIASED_TO -client\n">>$(@) + $(PRINTF) "-hotspot ALIASED_TO -client\n">>$(@) + ifeq ($(JVM_VARIANT_MINIMAL1), true) + $(PRINTF) "-minimal KNOWN\n">>$(@) + endif else - # Use the default jvm.cfg for this 32 bit setup. - $(JVMCFG): $(JVMCFG_SRC) - $(call install-file) + ifeq ($(JVM_VARIANT_MINIMAL1), true) + $(PRINTF) "-minimal KNOWN\n">>$(@) + $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@) + $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@) + $(PRINTF) "-hotspot ALIASED_TO -minimal\n">>$(@) + endif endif endif + # Common legacy entries + $(PRINTF) "-classic WARN\n">>$(@) + $(PRINTF) "-native ERROR\n">>$(@) + $(PRINTF) "-green ERROR\n">>$(@) + endif + else # Use the default jvm.cfg for this 64 bit setup. $(JVMCFG): $(JVMCFG_SRC) - $(call install-file) + $(call install-file) endif COPY_FILES += $(JVMCFG) --- old/src/solaris/bin/arm/jvm.cfg 2013-04-15 18:15:45.977193018 -0400 +++ new/src/solaris/bin/arm/jvm.cfg 2013-04-15 18:15:44.717121738 -0400 @@ -1,4 +1,4 @@ -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, 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 @@ -36,4 +36,3 @@ -classic WARN -native ERROR -green ERROR --minimal KNOWN --- old/src/solaris/bin/i586/jvm.cfg 2013-04-15 18:15:50.977475875 -0400 +++ new/src/solaris/bin/i586/jvm.cfg 2013-04-15 18:15:49.613398712 -0400 @@ -1,4 +1,4 @@ -# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2013, 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 @@ -36,4 +36,3 @@ -classic WARN -native ERROR -green ERROR --minimal KNOWN --- old/src/solaris/bin/ppc/jvm.cfg 2013-04-15 18:15:54.897697634 -0400 +++ new/src/solaris/bin/ppc/jvm.cfg 2013-04-15 18:15:53.637626355 -0400 @@ -1,4 +1,4 @@ -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, 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 @@ -36,4 +36,3 @@ -classic WARN -native ERROR -green ERROR --minimal KNOWN --- old/src/solaris/bin/sparc/jvm.cfg 2013-04-15 18:15:59.173939532 -0400 +++ new/src/solaris/bin/sparc/jvm.cfg 2013-04-15 18:15:57.909868027 -0400 @@ -1,4 +1,4 @@ -# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2013, 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 @@ -36,4 +36,3 @@ -classic WARN -native ERROR -green ERROR --minimal KNOWN