/hg/icedtea6: PR600: Always apply the PR600 ARM jvm.cfg patch to...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 23 12:07:41 PST 2011
changeset 5357369e2385 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5357369e2385
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 20:07:35 2011 +0000
PR600: Always apply the PR600 ARM jvm.cfg patch to cover JamVM +
CACAO.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* patches/cacao/arm-jvm.cfg-pr600.patch: Moved...
* Makefile.am: Move PR600 patch to main patch set (so it
is always applied) to cover both JamVM and CACAO.
* patches/pr600-arm-jvm.cfg.patch: to here.
diffstat:
4 files changed, 57 insertions(+), 47 deletions(-)
ChangeLog | 10 +++++++
Makefile.am | 6 ++--
patches/cacao/arm-jvm.cfg-pr600.patch | 44 ---------------------------------
patches/pr600-arm-jvm.cfg.patch | 44 +++++++++++++++++++++++++++++++++
diffs (136 lines):
diff -r a597500577ef -r 5357369e2385 ChangeLog
--- a/ChangeLog Wed Feb 23 18:38:54 2011 +0000
+++ b/ChangeLog Wed Feb 23 20:07:35 2011 +0000
@@ -1,3 +1,13 @@ 2011-02-23 Andrew John Hughes <ahughes
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/cacao/arm-jvm.cfg-pr600.patch:
+ Moved...
+ * Makefile.am:
+ Move PR600 patch to main patch set (so it
+ is always applied) to cover both JamVM and
+ CACAO.
+ * patches/pr600-arm-jvm.cfg.patch: to here.
+
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
diff -r a597500577ef -r 5357369e2385 Makefile.am
--- a/Makefile.am Wed Feb 23 18:38:54 2011 +0000
+++ b/Makefile.am Wed Feb 23 20:07:35 2011 +0000
@@ -324,7 +324,8 @@ ICEDTEA_PATCHES = \
patches/jtreg-LastErrorString.patch \
patches/openjdk/6663040-com.sun.awt.patch \
patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
- patches/openjdk/6766342-AA-simple-shape-performance.patch
+ patches/openjdk/6766342-AA-simple-shape-performance.patch \
+ patches/pr600-arm-jvm.cfg.patch
if !WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -343,8 +344,7 @@ ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
patches/cacao/arm-arch-defines.patch \
patches/cacao/jsig.patch \
- patches/cacao/memory.patch \
- patches/cacao/arm-jvm.cfg-pr600.patch
+ patches/cacao/memory.patch
endif
if ENABLE_CACAO
diff -r a597500577ef -r 5357369e2385 patches/cacao/arm-jvm.cfg-pr600.patch
--- a/patches/cacao/arm-jvm.cfg-pr600.patch Wed Feb 23 18:38:54 2011 +0000
+++ /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
diff -r a597500577ef -r 5357369e2385 patches/pr600-arm-jvm.cfg.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr600-arm-jvm.cfg.patch Wed Feb 23 20:07:35 2011 +0000
@@ -0,0 +1,44 @@
+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