/hg/icedtea: 2009-12-03 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset 21376f9eed89 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=21376f9eed89
author: Gary Benson <gbenson at redhat.com>
date: Thu Dec 03 13:53:28 2009 +0000

	2009-12-03 Gary Benson <gbenson at redhat.com>

	 * patches/hotspot/icedtea-bytecodeInterpreter.patch:
	Removed.
		* Makefile.am (ICEDTEA_PATCHES): Don't apply the above.
		* HACKING: Document the above.


diffstat:

4 files changed, 7 insertions(+), 13 deletions(-)
ChangeLog                                                 |    6 ++++++
HACKING                                                   |    2 +-
Makefile.am                                               |    1 -
patches/hotspot/default/icedtea-bytecodeInterpreter.patch |   11 -----------

diffs (55 lines):

diff -r 8bd2e4e68af1 -r 21376f9eed89 ChangeLog
--- a/ChangeLog	Wed Dec 02 13:25:56 2009 +0000
+++ b/ChangeLog	Thu Dec 03 13:53:28 2009 +0000
@@ -1,3 +1,9 @@ 2009-12-02  Andrew John Hughes  <ahughes
+2009-12-03  Gary Benson  <gbenson at redhat.com>
+
+	* patches/hotspot/icedtea-bytecodeInterpreter.patch: Removed.
+	* Makefile.am (ICEDTEA_PATCHES): Don't apply the above.
+	* HACKING: Document the above.
+
 2009-12-02  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 8bd2e4e68af1 -r 21376f9eed89 HACKING
--- a/HACKING	Wed Dec 02 13:25:56 2009 +0000
+++ b/HACKING	Thu Dec 03 13:53:28 2009 +0000
@@ -97,7 +97,6 @@ The following patches are only applied t
 * icedtea-timerqueue.patch: Fix setting of running variable (PR87/S6623943).
 * icedtea-version.patch: Fix (langtools) ant build to honor fcs MILESTONE setting (S6778493).
 * icedtea-io_util-overflow.patch: Replace some code to correctly handle overflows. (S6788196)
-* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
 * icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef.
 * icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
 * icedtea-signature-iterator.patch: Add zero-specific signature handling.
@@ -198,3 +197,4 @@ XSL file (S6707485): Included upstream i
        diff -ruNb openjdk{6,}/hotspot/src/os/linux >> icedtea-hotspot-6bXX-7bYY.patch
 * icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
 * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
diff -r 8bd2e4e68af1 -r 21376f9eed89 Makefile.am
--- a/Makefile.am	Wed Dec 02 13:25:56 2009 +0000
+++ b/Makefile.am	Thu Dec 03 13:53:28 2009 +0000
@@ -291,7 +291,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-samejvm-safe.patch \
 	patches/icedtea-pr261.patch \
 	patches/icedtea-doc-headers.patch \
-	patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-ia64-bugfix.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \
diff -r 8bd2e4e68af1 -r 21376f9eed89 patches/hotspot/default/icedtea-bytecodeInterpreter.patch
--- a/patches/hotspot/default/icedtea-bytecodeInterpreter.patch	Wed Dec 02 13:25:56 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
---- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	2008-10-23 08:41:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	2008-10-30 15:48:48.000000000 +0000
-@@ -60,7 +60,6 @@
- };
- 
- class BytecodeInterpreter : StackObj {
--friend class SharedRuntime;
- friend class AbstractInterpreterGenerator;
- friend class CppInterpreterGenerator;
- friend class InterpreterGenerator;