/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 19 23:02:29 PDT 2012
changeset a89d8bca422d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a89d8bca422d
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 20 01:51:56 2012 +0000
PR886: Provide a more general solution to PR600 to cover architectures other than just ARM.
2012-03-16 Andrew John Hughes <ahughes at redhat.com>
PR600, 886:
* patches/pr600-arm-jvm.cfg.patch: Removed.
* Makefile.am:
(extract-openjdk): Copy jvm.cfg over if building cacao.
* acinclude.m4:
(IT_ENABLE_CACAO): Generat jvm.cacao.cfg.
* jvm.cacao.cfg.in: Copied from jvm.cfg.in.
changeset 8b157b07b859 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8b157b07b859
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 20 06:01:53 2012 +0000
Extend previous fix to cover JamVM on all archs.
2012-03-16 Andrew John Hughes <ahughes at 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.
diffstat:
ChangeLog | 19 +++++++++++++++++
Makefile.am | 9 +++++++-
NEWS | 1 +
acinclude.m4 | 2 +
jvm.cacao.cfg.in | 44 +++++++++++++++++++++++++++++++++++++++++
jvm.jamvm.cfg.in | 44 +++++++++++++++++++++++++++++++++++++++++
patches/pr600-arm-jvm.cfg.patch | 43 ----------------------------------------
7 files changed, 118 insertions(+), 44 deletions(-)
diffs (226 lines):
diff -r 0894be5f665e -r 8b157b07b859 ChangeLog
--- a/ChangeLog Fri Mar 16 13:05:33 2012 -0400
+++ b/ChangeLog Tue Mar 20 06:01:53 2012 +0000
@@ -1,3 +1,22 @@
+2012-03-16 Andrew John Hughes <ahughes at 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 at redhat.com>
+
+ PR600, 886:
+ * patches/pr600-arm-jvm.cfg.patch: Removed.
+ * Makefile.am:
+ (extract-openjdk): Copy jvm.cfg over if building cacao.
+ * acinclude.m4:
+ (IT_ENABLE_CACAO): Generate jvm.cacao.cfg.
+ * jvm.cacao.cfg.in: Copied from jvm.cfg.in.
+
2012-03-16 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: Use unified syntax
diff -r 0894be5f665e -r 8b157b07b859 Makefile.am
--- a/Makefile.am Fri Mar 16 13:05:33 2012 -0400
+++ b/Makefile.am Tue Mar 20 06:01:53 2012 +0000
@@ -332,7 +332,6 @@
patches/jtreg-LastErrorString.patch \
patches/openjdk/6663040-com.sun.awt.patch \
patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
- patches/pr600-arm-jvm.cfg.patch \
patches/openjdk/6887494-NPE-in-pisces.patch \
patches/openjdk/6967436-6967433-floating-pt-conversion.patch \
patches/openjdk/6976265-stroke-control.patch \
@@ -982,6 +981,14 @@
fi
endif
endif
+if ENABLE_CACAO
+ 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
diff -r 0894be5f665e -r 8b157b07b859 NEWS
--- a/NEWS Fri Mar 16 13:05:33 2012 -0400
+++ b/NEWS Tue Mar 20 06:01:53 2012 +0000
@@ -14,6 +14,7 @@
* Bug fixes
- PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
+ - PR886: 6-1.11.1 fails to build CACAO on ppc
* Backports
- S6706974: Add krb5 test infrastructure
- S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
diff -r 0894be5f665e -r 8b157b07b859 acinclude.m4
--- a/acinclude.m4 Fri Mar 16 13:05:33 2012 -0400
+++ b/acinclude.m4 Tue Mar 20 06:01:53 2012 +0000
@@ -825,6 +825,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],
@@ -863,6 +864,7 @@
AC_MSG_RESULT(${ENABLE_CACAO})
AM_CONDITIONAL(ENABLE_CACAO, test x"${ENABLE_CACAO}" = "xyes")
AC_SUBST(ENABLE_CACAO)
+ AC_CONFIG_FILES([jvm.cacao.cfg])
])
AC_DEFUN([IT_WITH_CACAO_HOME],
diff -r 0894be5f665e -r 8b157b07b859 jvm.cacao.cfg.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jvm.cacao.cfg.in Tue Mar 20 06:01:53 2012 +0000
@@ -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
diff -r 0894be5f665e -r 8b157b07b859 jvm.jamvm.cfg.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jvm.jamvm.cfg.in Tue Mar 20 06:01:53 2012 +0000
@@ -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
diff -r 0894be5f665e -r 8b157b07b859 patches/pr600-arm-jvm.cfg.patch
--- a/patches/pr600-arm-jvm.cfg.patch Fri Mar 16 13:05:33 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-Index: openjdk/jdk/src/solaris/bin/arm/jvm.cfg
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ openjdk/jdk/src/solaris/bin/arm/jvm.cfg 2011-02-18 15:40:24.083043645 +0100
-@@ -0,0 +1,39 @@
-+# Copyright (c) 2003, 2010, 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
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation. Oracle designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.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
-+-client IGNORE
-+-hotspot ERROR
-+-classic WARN
-+-native ERROR
-+-green ERROR
More information about the distro-pkg-dev
mailing list