--- a/ChangeLog	Wed May 09 16:21:01 2012 +0100
+++ b/ChangeLog	Wed May 09 16:25:56 2012 +0100
@@ -1,3 +1,12 @@
+2012-03-16  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR600, 886:
+	* Makefile.am:
+	(extract-openjdk): Copy jvm.cfg over if building JamVM.
+	* acinclude.m4:
+	(IT_ENABLE_JAMVM): Generate jvm.jamvm.cfg.
+	* jvm.jamvm.cfg.in: Copied from jvm.cfg.in.
+
 2012-03-16  Andrew John Hughes  <ahughes@redhat.com>
 
 	PR600, 886:
@@ -7,6 +16,7 @@
 	* acinclude.m4:
 	(IT_ENABLE_CACAO): Generate jvm.cacao.cfg.
 	* jvm.cacao.cfg.in: Copied from jvm.cfg.in.
+	* NEWS: Updated.
 
 2012-04-20  Pavel Tisnovsky  <ptisnovs@redhat.com>
 

--- a/Makefile.am	Wed May 09 16:21:01 2012 +0100
+++ b/Makefile.am	Wed May 09 16:25:56 2012 +0100
@@ -979,6 +979,10 @@
 	mkdir -p openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)
 	cp jvm.cacao.cfg openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)/jvm.cfg
 endif
+if ENABLE_JAMVM
+	mkdir -p openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)
+	cp jvm.jamvm.cfg openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)/jvm.cfg
+endif
 	mkdir -p stamps
 	touch stamps/extract-openjdk.stamp
 

--- a/acinclude.m4	Wed May 09 16:21:01 2012 +0100
+++ b/acinclude.m4	Wed May 09 16:25:56 2012 +0100
@@ -830,6 +830,7 @@
   AC_MSG_RESULT(${ENABLE_JAMVM})
   AM_CONDITIONAL(ENABLE_JAMVM, test x"${ENABLE_JAMVM}" = "xyes")
   AC_SUBST(ENABLE_JAMVM)
+  AC_CONFIG_FILES([jvm.jamvm.cfg])
 ])
 
 AC_DEFUN([IT_WITH_JAMVM_SRC_ZIP],

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jvm.jamvm.cfg.in	Wed May 09 16:25:56 2012 +0100
@@ -0,0 +1,44 @@
+#
+# @(#)jvm.cfg   1.7 07/05/05
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc.  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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+#
+#
+# List of JVMs that can be used as an option to java, javac, etc.
+# Order is important -- first in this list is the default JVM.
+# NOTE that this both this file and its format are UNSUPPORTED and
+# WILL GO AWAY in a future release.
+#
+# You may also select a JVM in an arbitrary location with the
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+# and may not be available in a future release.
+#
+-server KNOWN
+-hotspot ERROR
+-classic WARN
+-client IGNORE
+-native ERROR
+-green ERROR