8010280: jvm.cfg needs updating for non-server builds
Generate jvm.cfg based on chosen VMs for non-"standard" builds and remove legacy entries from committed jvm.cfg files Reviewed-by: mduigou, tbell
This commit is contained in:
parent
a06b5fe6d7
commit
e0cc6375d8
@ -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.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -294,41 +294,52 @@ JVMCFG := $(JVMCFG_DIR)/jvm.cfg
|
|||||||
|
|
||||||
|
|
||||||
ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
|
ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
|
||||||
# On 32 bit machines, we can have client and/or server libjvms installed.
|
# On 32-bit machines we have three potential VMs: client, server and minimal.
|
||||||
# Since the currently committed jvm.cfg expects clientANDserver, we need
|
# Historically we usually have both client and server and so that is what the
|
||||||
# to patch the jvm.cfg when we have built only a client or only a server.
|
# committed jvm.cfg expects (including platform specific ergonomics switches
|
||||||
# This should also support -kernel, -zero and -zeroshark.
|
# to decide whether to use client or server by default). So when we have anything
|
||||||
ifeq ($(JVM_VARIANTS),$(COMMA)client$(COMMA))
|
# other than client and server we need to define a new jvm.cfg file.
|
||||||
# Create a patched jvm.cfg to use -client by default and alias -server to -client.
|
# The main problem is deciding whether to use aliases for the VMs that are not
|
||||||
$(JVMCFG):
|
# present and the current position is that we add aliases for client and server, but
|
||||||
$(MKDIR) -p $(@D)
|
# not for minimal.
|
||||||
$(RM) $(JVMCFG)
|
# To do: should this also support, -zero and -zeroshark?
|
||||||
$(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)
|
|
||||||
|
|
||||||
else
|
CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
|
||||||
ifeq ($(JVM_VARIANTS),$(COMMA)server$(COMMA))
|
|
||||||
# Create a patched jvm.cfg to use -server by default and alias -client to -server.
|
|
||||||
|
|
||||||
$(JVMCFG):
|
ifeq ($(CLIENT_AND_SERVER), true)
|
||||||
$(MKDIR) -p $(@D)
|
# Use the committed jvm.cfg for this 32 bit setup (the minimal
|
||||||
$(RM) $(JVMCFG)
|
# VM is already KNOWN on platforms that potentially support it)
|
||||||
$(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)
|
|
||||||
else
|
|
||||||
# Use the default jvm.cfg for this 32 bit setup.
|
|
||||||
$(JVMCFG): $(JVMCFG_SRC)
|
$(JVMCFG): $(JVMCFG_SRC)
|
||||||
$(call install-file)
|
$(call install-file)
|
||||||
|
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">>$(@)
|
||||||
|
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||||
|
$(PRINTF) "-minimal KNOWN\n">>$(@)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
ifeq ($(JVM_VARIANT_CLIENT), true)
|
||||||
|
$(PRINTF) "-client KNOWN\n">>$(@)
|
||||||
|
$(PRINTF) "-server ALIASED_TO -client\n">>$(@)
|
||||||
|
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||||
|
$(PRINTF) "-minimal KNOWN\n">>$(@)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||||
|
$(PRINTF) "-minimal KNOWN\n">>$(@)
|
||||||
|
$(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
|
||||||
|
$(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
else
|
else
|
||||||
# Use the default jvm.cfg for this 64 bit setup.
|
# Use the default jvm.cfg for this 64 bit setup.
|
||||||
$(JVMCFG): $(JVMCFG_SRC)
|
$(JVMCFG): $(JVMCFG_SRC)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -32,7 +32,3 @@
|
|||||||
#
|
#
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-client IGNORE
|
-client IGNORE
|
||||||
-hotspot ERROR
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -33,7 +33,3 @@
|
|||||||
#
|
#
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-client IGNORE
|
-client IGNORE
|
||||||
-hotspot ERROR
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
|
@ -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.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -32,8 +32,4 @@
|
|||||||
#
|
#
|
||||||
-client KNOWN
|
-client KNOWN
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-hotspot ERROR
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
-minimal KNOWN
|
-minimal KNOWN
|
||||||
|
@ -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.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -32,8 +32,4 @@
|
|||||||
#
|
#
|
||||||
-client IF_SERVER_CLASS -server
|
-client IF_SERVER_CLASS -server
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-hotspot ALIASED_TO -client
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
-minimal KNOWN
|
-minimal KNOWN
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -36,8 +36,4 @@
|
|||||||
# and may not be available in a future release.
|
# and may not be available in a future release.
|
||||||
#
|
#
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-hotspot ERROR
|
|
||||||
-classic WARN
|
|
||||||
-client IGNORE
|
-client IGNORE
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
|
@ -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.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -32,8 +32,4 @@
|
|||||||
#
|
#
|
||||||
-client KNOWN
|
-client KNOWN
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-hotspot ERROR
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
-minimal KNOWN
|
-minimal KNOWN
|
||||||
|
@ -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.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -32,8 +32,4 @@
|
|||||||
#
|
#
|
||||||
-client IF_SERVER_CLASS -server
|
-client IF_SERVER_CLASS -server
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-hotspot ALIASED_TO -client
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
-minimal KNOWN
|
-minimal KNOWN
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2001, 2003, 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.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -31,8 +31,4 @@
|
|||||||
# and may not be available in a future release.
|
# and may not be available in a future release.
|
||||||
#
|
#
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-hotspot ERROR
|
|
||||||
-classic WARN
|
|
||||||
-client IGNORE
|
-client IGNORE
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -33,7 +33,3 @@
|
|||||||
#
|
#
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-client IGNORE
|
-client IGNORE
|
||||||
-hotspot ERROR
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -36,7 +36,3 @@
|
|||||||
#
|
#
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-client IGNORE
|
-client IGNORE
|
||||||
-hotspot ALIASED_TO -server
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2001, 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.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -32,7 +32,3 @@
|
|||||||
#
|
#
|
||||||
-client KNOWN
|
-client KNOWN
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-hotspot ALIASED_TO -client
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -36,7 +36,3 @@
|
|||||||
#
|
#
|
||||||
-server KNOWN
|
-server KNOWN
|
||||||
-client IGNORE
|
-client IGNORE
|
||||||
-hotspot ALIASED_TO -server
|
|
||||||
-classic WARN
|
|
||||||
-native ERROR
|
|
||||||
-green ERROR
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user