/hg/release/icedtea6-1.6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Mar 11 15:34:33 PST 2010
changeset 6cb729c4a876 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=6cb729c4a876
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 11 22:57:54 2010 +0000
Make the normal (non-Zero/Shark) HotSpot original build work.
2010-03-10 Andrew John Hughes <ahughes at redhat.com>
Fix the normal (non-Zero/Shark) build with the
original HotSpot.
* Makefile.am: Move format-warnings, fortify-source, 6791168
and includedb patch to set applied to all HotSpots. Add
bytecodeInterpreter XSL fix back for original HotSpot.
* patches/hotspot/default/icedtea-explicit-target-arch.patch:
Move HotSpot chunk to separate hs14-specific file.
* patches/hotspot/original/icedtea-6791168.patch,
* patches/hotspot/original/icedtea-explicit-target-arch.patch,
* patches/hotspot/original/icedtea-includedb.patch: New
variants for original HotSpot (hs11).
* patches/hotspot/original/icedtea-shark.patch: Fixed to apply
to original HotSpot.
* patches/icedtea-bytecodeInterpreterWithChecks.patch:
Readded, reverting part of Gary's patch of 2009-05-08.
* patches/icedtea-explicit-target-arch.patch: Remove HotSpot
chunk and specialise it in HotSpot subdirectories.
changeset b12e1a83a817 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=b12e1a83a817
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 11 23:24:05 2010 +0000
Drop out of configure with an error if Zero/Shark and the original
HotSpot are enabled.
2010-03-11 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (ENABLE_ZERO_BUILD): Require
SET_SHARK_BUILD. Use AC_DEFUN_ONCE to ensure it isn't
included twice. (SET_SHARK_BUILD): Print result when no
argument is given. Use AC_DEFUN_ONCE to ensure it isn't
included twice. (AC_CHECK_WITH_HOTSPOT_BUILD): Require
ENABLE_ZERO_BUILD and error out if the original build is
enabled along with Zero/Shark.
changeset 833ee1f40cf8 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=833ee1f40cf8
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 11 23:34:09 2010 +0000
Improve clarity of DISABLE_OPTIMIZATIONS macro.
2010-03-11 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (DISABLE_OPTIMIZATIONS): Output a
result in the default case. Provide DISABLE_OPTIMIZATIONS
so Makefile test does not need to be inversed and output
matches variable setting.
* Makefile.am: Use DISABLE_OPTIMIZATIONS rather than
!ENABLE_OPTIMIZATIONS.
diffstat:
10 files changed, 699 insertions(+), 332 deletions(-)
ChangeLog | 46
Makefile.am | 18
acinclude.m4 | 25
patches/hotspot/default/icedtea-explicit-target-arch.patch | 17
patches/hotspot/original/icedtea-6791168.patch | 189 +++
patches/hotspot/original/icedtea-explicit-target-arch.patch | 17
patches/hotspot/original/icedtea-includedb.patch | 86 +
patches/hotspot/original/icedtea-shark.patch | 592 +++++------
patches/icedtea-bytecodeInterpreterWithChecks.patch | 18
patches/icedtea-explicit-target-arch.patch | 23
diffs (truncated from 1225 to 500 lines):
diff -r 7dc4eeee5f69 -r 833ee1f40cf8 ChangeLog
--- a/ChangeLog Thu Mar 11 12:20:10 2010 +0000
+++ b/ChangeLog Thu Mar 11 23:34:09 2010 +0000
@@ -1,3 +1,47 @@ 2010-03-11 Gary Benson <gbenson at redhat
+2010-03-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (DISABLE_OPTIMIZATIONS): Output a result
+ in the default case. Provide DISABLE_OPTIMIZATIONS
+ so Makefile test does not need to be inversed
+ and output matches variable setting.
+ * Makefile.am:
+ Use DISABLE_OPTIMIZATIONS rather than !ENABLE_OPTIMIZATIONS.
+
+2010-03-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (ENABLE_ZERO_BUILD): Require SET_SHARK_BUILD.
+ Use AC_DEFUN_ONCE to ensure it isn't included twice.
+ (SET_SHARK_BUILD): Print result when no
+ argument is given. Use AC_DEFUN_ONCE to ensure it
+ isn't included twice.
+ (AC_CHECK_WITH_HOTSPOT_BUILD): Require
+ ENABLE_ZERO_BUILD and error out if the original
+ build is enabled along with Zero/Shark.
+
+2010-03-11 Andrew John Hughes <ahughes at redhat.com>
+
+ Fix the normal (non-Zero/Shark) build with
+ the original HotSpot.
+ * Makefile.am:
+ Move format-warnings, fortify-source, 6791168 and includedb
+ patch to set applied to all HotSpots. Add
+ bytecodeInterpreter XSL fix back for original HotSpot.
+ * patches/hotspot/default/icedtea-explicit-target-arch.patch:
+ Move HotSpot chunk to separate hs14-specific file.
+ * patches/hotspot/original/icedtea-6791168.patch,
+ * patches/hotspot/original/icedtea-explicit-target-arch.patch,
+ * patches/hotspot/original/icedtea-includedb.patch:
+ New variants for original HotSpot (hs11).
+ * patches/hotspot/original/icedtea-shark.patch:
+ Fixed to apply to original HotSpot.
+ * patches/icedtea-bytecodeInterpreterWithChecks.patch:
+ Readded, reverting part of Gary's patch of 2009-05-08.
+ * patches/icedtea-explicit-target-arch.patch:
+ Remove HotSpot chunk and specialise it in HotSpot
+ subdirectories.
+
2010-03-11 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
@@ -17,7 +61,7 @@ 2010-01-27 Andrew John Hughes <ahughes
* NEWS:
Add missing dates.
-
+
2010-01-15 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4,
diff -r 7dc4eeee5f69 -r 833ee1f40cf8 Makefile.am
--- a/Makefile.am Thu Mar 11 12:20:10 2010 +0000
+++ b/Makefile.am Thu Mar 11 23:34:09 2010 +0000
@@ -194,7 +194,7 @@ ICEDTEA_ENV += \
ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
endif
-if !ENABLE_OPTIMIZATIONS
+if DISABLE_OPTIMIZATIONS
ICEDTEA_ENV += \
NO_OPTIMIZATIONS="true" \
CC_NO_OPT="-O0 -g"
@@ -277,7 +277,7 @@ ICEDTEA_ENV_ECJ += \
ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
endif
-if !ENABLE_OPTIMIZATIONS
+if DISABLE_OPTIMIZATIONS
ICEDTEA_ENV_ECJ += \
NO_OPTIMIZATIONS="true" \
CC_NO_OPT="-O0 -g"
@@ -645,21 +645,22 @@ ICEDTEA_PATCHES = \
patches/icedtea-jar-misc.patch \
patches/icedtea-6897844-xshm.patch \
patches/icedtea-linux-separate-debuginfo.patch \
- patches/openjdk/6822370-reentrantreadwritelock.patch
+ patches/openjdk/6822370-reentrantreadwritelock.patch \
+ patches/icedtea-format-warnings.patch \
+ patches/icedtea-fortify-source.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-6791168.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-includedb.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
- patches/icedtea-format-warnings.patch \
- patches/icedtea-fortify-source.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-buildfixes.patch \
- patches/hotspot/$(HSBUILD)/icedtea-6791168.patch \
- patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \
patches/hotspot/$(HSBUILD)/icedtea-ignore-unrecognized-options.patch
endif
if !WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
- patches/icedtea-sparc.patch
+ patches/icedtea-sparc.patch \
+ patches/icedtea-bytecodeInterpreterWithChecks.patch
endif
ICEDTEA_PATCHES += \
@@ -725,6 +726,7 @@ ICEDTEA_PATCHES += \
patches/icedtea-java2d-stroker-internal-close-joint.patch \
patches/icedtea-disable-cc-incompatible-sanity-checks.patch \
patches/icedtea-explicit-target-arch.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-explicit-target-arch.patch \
patches/openjdk/6648816.patch \
patches/openjdk/oj100103-debugger-socket-overflow.patch \
$(DISTRIBUTION_PATCHES)
diff -r 7dc4eeee5f69 -r 833ee1f40cf8 acinclude.m4
--- a/acinclude.m4 Thu Mar 11 12:20:10 2010 +0000
+++ b/acinclude.m4 Thu Mar 11 23:34:09 2010 +0000
@@ -644,25 +644,24 @@ AC_DEFUN([FIND_RHINO_JAR],
AC_DEFUN([ENABLE_OPTIMIZATIONS],
[
- AC_MSG_CHECKING(whether to disable optimizations)
+ AC_MSG_CHECKING([whether to disable optimizations])
AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING(--disable-optimizations,build with -O0 -g [[default=no]])],
[
case "${enableval}" in
no)
- AC_MSG_RESULT([yes, building with -O0 -g])
- enable_optimizations=no
+ disable_optimizations=yes
;;
*)
- AC_MSG_RESULT([no])
- enable_optimizations=yes
+ disable_optimizations=no
;;
esac
],
[
- enable_optimizations=yes
+ disable_optimizations=no
])
- AM_CONDITIONAL([ENABLE_OPTIMIZATIONS], test x"${enable_optimizations}" = "xyes")
+ AC_MSG_RESULT([$disable_optimizations])
+ AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], test x"${disable_optimizations}" = "xyes")
])
AC_DEFUN([FIND_TOOL],
@@ -673,8 +672,9 @@ AC_DEFUN([FIND_TOOL],
AC_SUBST([$1])
])
-AC_DEFUN([ENABLE_ZERO_BUILD],
+AC_DEFUN_ONCE([ENABLE_ZERO_BUILD],
[
+ AC_REQUIRE([SET_SHARK_BUILD])
AC_MSG_CHECKING(whether to use the zero-assembler port)
use_zero=no
AC_ARG_ENABLE([zero],
@@ -772,7 +772,7 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
AC_CONFIG_FILES([ergo.c])
])
-AC_DEFUN([SET_SHARK_BUILD],
+AC_DEFUN_ONCE([SET_SHARK_BUILD],
[
AC_MSG_CHECKING(whether to use the Shark JIT)
AC_ARG_ENABLE([shark], [AS_HELP_STRING(--enable-shark, use Shark JIT)],
@@ -785,7 +785,8 @@ AC_DEFUN([SET_SHARK_BUILD],
use_shark=yes
;;
esac
- ])
+ ],
+ [use_shark=no])
AC_MSG_RESULT($use_shark)
@@ -871,6 +872,7 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
[
+ AC_REQUIRE([ENABLE_ZERO_BUILD])
DEFAULT_BUILD="default"
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
@@ -889,6 +891,9 @@ AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
AC_MSG_RESULT([${HSBUILD}])
AC_SUBST([HSBUILD])
AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "xoriginal")
+ if test "x${HSBUILD}" = "xoriginal" && test "x${use_zero}" = "xyes"; then
+ AC_MSG_ERROR([Zero/Shark is not supported with the original HotSpot (hs11).])
+ fi
])
AC_DEFUN([WITH_HOTSPOT_SRC_ZIP],
diff -r 7dc4eeee5f69 -r 833ee1f40cf8 patches/hotspot/default/icedtea-explicit-target-arch.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/default/icedtea-explicit-target-arch.patch Thu Mar 11 23:34:09 2010 +0000
@@ -0,0 +1,17 @@
+Index: openjdk/hotspot/make/linux/makefiles/defs.make
+===================================================================
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2009-05-18 14:09:57.812930043 +0200
++++ openjdk/hotspot/make/linux/makefiles/defs.make 2009-05-18 14:30:46.318871170 +0200
+@@ -29,7 +29,11 @@
+ SLASH_JAVA ?= /java
+
+ # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
+-ARCH:=$(shell uname -m)
++ifndef CROSS_COMPILATION
++ ARCH:=$(shell uname -m)
++else
++ ARCH:=$(CROSS_TARGET_ARCH)
++endif
+ PATH_SEP = :
+ ifeq ($(LP64), 1)
+ ARCH_DATA_MODEL ?= 64
diff -r 7dc4eeee5f69 -r 833ee1f40cf8 patches/hotspot/original/icedtea-6791168.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/icedtea-6791168.patch Thu Mar 11 23:34:09 2010 +0000
@@ -0,0 +1,189 @@
+diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/assembler_x86_32.cpp openjdk/hotspot/src/cpu/x86/vm/assembler_x86_32.cpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/assembler_x86_32.cpp 2009-04-24 08:30:53.000000000 +0100
++++ openjdk/hotspot/src/cpu/x86/vm/assembler_x86_32.cpp 2010-03-11 18:15:32.000000000 +0000
+@@ -3612,29 +3612,32 @@
+
+ Label slow_case, done;
+
+- // x ?<= pi/4
+- fld_d(ExternalAddress((address)&pi_4));
+- fld_s(1); // Stack: X PI/4 X
+- fabs(); // Stack: |X| PI/4 X
+- fcmp(tmp);
+- jcc(Assembler::above, slow_case);
+-
+- // fastest case: -pi/4 <= x <= pi/4
+- switch(trig) {
+- case 's':
+- fsin();
+- break;
+- case 'c':
+- fcos();
+- break;
+- case 't':
+- ftan();
+- break;
+- default:
+- assert(false, "bad intrinsic");
+- break;
++ ExternalAddress pi4_adr = (address)&pi_4;
++ if (reachable(pi4_adr)) {
++ // x ?<= pi/4
++ fld_d(pi4_adr); // ExternalAddress((address)&pi_4));
++ fld_s(1); // Stack: X PI/4 X
++ fabs(); // Stack: |X| PI/4 X
++ fcmp(tmp);
++ jcc(Assembler::above, slow_case);
++
++ // fastest case: -pi/4 <= x <= pi/4
++ switch(trig) {
++ case 's':
++ fsin();
++ break;
++ case 'c':
++ fcos();
++ break;
++ case 't':
++ ftan();
++ break;
++ default:
++ assert(false, "bad intrinsic");
++ break;
++ }
++ jmp(done);
+ }
+- jmp(done);
+
+ // slow case: runtime call
+ bind(slow_case);
+diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp openjdk/hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp 2009-04-24 08:30:53.000000000 +0100
++++ openjdk/hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp 2010-03-11 18:09:57.000000000 +0000
+@@ -216,7 +216,7 @@
+
+ inline jint BytecodeInterpreter::VMintDiv(jint op1, jint op2) {
+ /* it's possible we could catch this special case implicitly */
+- if (op1 == 0x80000000 && op2 == -1) return op1;
++ if ((juint)op1 == 0x80000000 && op2 == -1) return op1;
+ else return op1 / op2;
+ }
+
+@@ -234,7 +234,7 @@
+
+ inline jint BytecodeInterpreter::VMintRem(jint op1, jint op2) {
+ /* it's possible we could catch this special case implicitly */
+- if (op1 == 0x80000000 && op2 == -1) return 0;
++ if ((juint)op1 == 0x80000000 && op2 == -1) return 0;
+ else return op1 % op2;
+ }
+
+diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp openjdk/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp 2009-04-24 08:30:53.000000000 +0100
++++ openjdk/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp 2010-03-11 18:14:12.000000000 +0000
+@@ -578,7 +578,7 @@
+ __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax);
+
+ // for c++ interpreter can rsi really be munged?
+- __ leal(rsi, Address(rbp, -sizeof(BytecodeInterpreter))); // restore state
++ __ leal(rsi, Address(rbp, -(int)sizeof(BytecodeInterpreter))); // restore state
+ __ movl(rbx, Address(rsi, byte_offset_of(BytecodeInterpreter, _method))); // restore method
+ __ movl(rdi, Address(rsi, byte_offset_of(BytecodeInterpreter, _locals))); // get locals pointer
+
+@@ -644,7 +644,7 @@
+ const Address size_of_stack (rbx, methodOopDesc::max_stack_offset());
+ // Always give one monitor to allow us to start interp if sync method.
+ // Any additional monitors need a check when moving the expression stack
+- const one_monitor = frame::interpreter_frame_monitor_size() * wordSize;
++ const int one_monitor = frame::interpreter_frame_monitor_size() * wordSize;
+ __ load_unsigned_word(rax, size_of_stack); // get size of expression stack in words
+ __ leal(rax, Address(noreg, rax, Interpreter::stackElementScale(), one_monitor));
+ __ leal(rax, Address(rax, rdx, Interpreter::stackElementScale(), overhead_size));
+@@ -1760,7 +1760,7 @@
+ Label unwind_and_forward;
+
+ // restore state pointer.
+- __ leal(state, Address(rbp, -sizeof(BytecodeInterpreter)));
++ __ leal(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
+
+ __ movl(rbx, STATE(_method)); // get method
+ __ movl(rcx, STATE(_thread)); // get thread
+@@ -1804,7 +1804,7 @@
+
+ // The FPU stack is clean if UseSSE >= 2 but must be cleaned in other cases
+ if (UseSSE < 2) {
+- __ leal(state, Address(rbp, -sizeof(BytecodeInterpreter)));
++ __ leal(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
+ __ movl(rbx, STATE(_result._to_call._callee)); // get method just executed
+ __ movl(rcx, Address(rbx, methodOopDesc::result_index_offset()));
+ __ cmpl(rcx, AbstractInterpreter::BasicType_as_index(T_FLOAT)); // Result stub address array index
+@@ -1853,7 +1853,7 @@
+
+ // Restore rsi as compiled code may not preserve it
+
+- __ leal(state, Address(rbp, -sizeof(BytecodeInterpreter)));
++ __ leal(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
+
+ // restore stack to what we had when we left (in case i2c extended it)
+
+diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp openjdk/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp 2009-04-24 08:30:53.000000000 +0100
++++ openjdk/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp 2010-03-11 18:09:57.000000000 +0000
+@@ -137,7 +137,7 @@
+ #ifdef CC_INTERP
+
+ inline interpreterState frame::get_interpreterState() const {
+- return ((interpreterState)addr_at( -sizeof(BytecodeInterpreter)/wordSize ));
++ return ((interpreterState)addr_at( -((int)sizeof(BytecodeInterpreter))/wordSize ));
+ }
+
+ inline intptr_t* frame::sender_sp() const {
+diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2010-03-11 18:00:58.000000000 +0000
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2010-03-11 18:09:57.000000000 +0000
+@@ -166,7 +166,7 @@
+ #ifdef USELABELS
+ // Have to do this dispatch this way in C++ because otherwise gcc complains about crossing an
+ // initialization (which is is the initialization of the table pointer...)
+-#define DISPATCH(opcode) goto *dispatch_table[opcode]
++#define DISPATCH(opcode) goto *(void*)dispatch_table[opcode]
+ #define CONTINUE { \
+ opcode = *pc; \
+ DO_UPDATE_INSTRUCTION_COUNT(opcode); \
+@@ -344,7 +344,7 @@
+ */
+ #undef CHECK_NULL
+ #define CHECK_NULL(obj_) \
+- if ((obj_) == 0) { \
++ if ((obj_) == NULL) { \
+ VM_JAVA_ERROR(vmSymbols::java_lang_NullPointerException(), ""); \
+ }
+
+@@ -1362,7 +1362,7 @@
+
+ #define NULL_COMPARISON_NOT_OP(name) \
+ CASE(_if##name): { \
+- int skip = (!(STACK_OBJECT(-1) == 0)) \
++ int skip = (!(STACK_OBJECT(-1) == NULL)) \
+ ? (int16_t)Bytes::get_Java_u2(pc + 1) : 3; \
+ address branch_pc = pc; \
+ UPDATE_PC_AND_TOS(skip, -1); \
+@@ -1372,7 +1372,7 @@
+
+ #define NULL_COMPARISON_OP(name) \
+ CASE(_if##name): { \
+- int skip = ((STACK_OBJECT(-1) == 0)) \
++ int skip = ((STACK_OBJECT(-1) == NULL)) \
+ ? (int16_t)Bytes::get_Java_u2(pc + 1) : 3; \
+ address branch_pc = pc; \
+ UPDATE_PC_AND_TOS(skip, -1); \
+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 2010-03-11 18:00:57.000000000 +0000
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2010-03-11 18:09:57.000000000 +0000
+@@ -68,7 +68,6 @@
+ friend class InterpreterGenerator;
+ friend class InterpreterMacroAssembler;
+ friend class frame;
+-friend class SharedRuntime;
+ friend class VMStructs;
+
+ public:
diff -r 7dc4eeee5f69 -r 833ee1f40cf8 patches/hotspot/original/icedtea-explicit-target-arch.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/icedtea-explicit-target-arch.patch Thu Mar 11 23:34:09 2010 +0000
@@ -0,0 +1,17 @@
+Index: openjdk/hotspot/make/linux/makefiles/defs.make
+===================================================================
+--- openjdk.orig/hotspot/build/linux/makefiles/defs.make 2009-05-18 14:09:57.812930043 +0200
++++ openjdk/hotspot/build/linux/makefiles/defs.make 2009-05-18 14:30:46.318871170 +0200
+@@ -29,7 +29,11 @@
+ SLASH_JAVA ?= /java
+
+ # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
+-ARCH:=$(shell uname -m)
++ifndef CROSS_COMPILATION
++ ARCH:=$(shell uname -m)
++else
++ ARCH:=$(CROSS_TARGET_ARCH)
++endif
+ PATH_SEP = :
+ ifeq ($(LP64), 1)
+ ARCH_DATA_MODEL ?= 64
diff -r 7dc4eeee5f69 -r 833ee1f40cf8 patches/hotspot/original/icedtea-includedb.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/icedtea-includedb.patch Thu Mar 11 23:34:09 2010 +0000
@@ -0,0 +1,86 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep 2009-04-24 08:30:55.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep 2010-03-11 18:19:46.000000000 +0000
+@@ -28,6 +28,7 @@
+ binaryTreeDictionary.cpp binaryTreeDictionary.hpp
+ binaryTreeDictionary.cpp globals.hpp
+ binaryTreeDictionary.cpp ostream.hpp
++binaryTreeDictionary.cpp space.inline.hpp
+
+ binaryTreeDictionary.hpp freeBlockDictionary.hpp
+ binaryTreeDictionary.hpp freeList.hpp
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2009-04-24 08:30:55.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2010-03-11 18:19:04.000000000 +0000
+@@ -302,6 +302,8 @@
+ psPermGen.cpp psMarkSweepDecorator.hpp
+ psPermGen.cpp psParallelCompact.hpp
+ psPermGen.cpp psPermGen.hpp
++psPermGen.cpp markOop.inline.hpp
++psPermGen.cpp markSweep.inline.hpp
+
+ psPermGen.hpp psOldGen.hpp
+
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2009-04-24 08:30:55.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2010-03-11 18:20:07.000000000 +0000
+@@ -29,6 +29,8 @@
+ asParNewGeneration.cpp cmsAdaptiveSizePolicy.hpp
+ asParNewGeneration.cpp cmsGCAdaptivePolicyCounters.hpp
+ asParNewGeneration.cpp defNewGeneration.inline.hpp
++asParNewGeneration.cpp markOop.inline.hpp
++asParNewGeneration.cpp markSweep.inline.hpp
+ asParNewGeneration.cpp oop.pcgc.inline.hpp
+ asParNewGeneration.cpp parNewGeneration.hpp
+ asParNewGeneration.cpp referencePolicy.hpp
+@@ -39,7 +41,7 @@
+ parCardTableModRefBS.cpp java.hpp
+ parCardTableModRefBS.cpp mutexLocker.hpp
+ parCardTableModRefBS.cpp sharedHeap.hpp
+-parCardTableModRefBS.cpp space.hpp
++parCardTableModRefBS.cpp space.inline.hpp
+ parCardTableModRefBS.cpp universe.hpp
+ parCardTableModRefBS.cpp virtualspace.hpp
+
+diff -Nru openjdk.orig/hotspot/src/share/vm/includeDB_compiler2 openjdk/hotspot/src/share/vm/includeDB_compiler2
+--- openjdk.orig/hotspot/src/share/vm/includeDB_compiler2 2009-04-24 08:30:55.000000000 +0100
++++ openjdk/hotspot/src/share/vm/includeDB_compiler2 2010-03-11 18:18:56.000000000 +0000
+@@ -140,6 +140,7 @@
+ c2_globals_<os_family>.hpp macros.hpp
+
+ c2_init_<arch>.cpp compile.hpp
++c2_init_<arch>.cpp node.hpp
+
+ c2compiler.cpp ad_<arch_model>.hpp
+ c2compiler.cpp c2compiler.hpp
+@@ -833,6 +834,7 @@
+ phase.cpp compile.hpp
+ phase.cpp compileBroker.hpp
+ phase.cpp nmethod.hpp
++phase.cpp node.hpp
More information about the distro-pkg-dev
mailing list