changeset in /hg/icedtea: Bump to b48.
Andrew John Hughes
ahughes at redhat.com
Mon Mar 2 09:57:35 PST 2009
changeset ccd9a2a2c559 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ccd9a2a2c559
description:
Bump to b48.
2009-02-24 Andrew John Hughes <ahughes at redhat.com>
* patches/hotspot/original/icedtea-6791168.patch,
* patches/hotspot/original/icedtea-format.patch,
* patches/icedtea-awt-window-size.patch,
* patches/icedtea-f2i-overflow.patch,
* patches/icedtea-format-warnings.patch,
* patches/icedtea-fortify-source.patch,
* patches/icedtea-lib64.patch,
* patches/icedtea-no-bcopy.patch:
Removed, applied upstream.
* HACKING: Updated.
* Makefile.am: Bump to b48.
* patches/hotspot/original/icedtea-includedb.patch,
* patches/icedtea-libraries.patch: Recreated.
diffstat:
13 files changed, 140 insertions(+), 786 deletions(-)
ChangeLog | 16 +
HACKING | 20 -
Makefile.am | 24 --
patches/hotspot/original/icedtea-6791168.patch | 230 ----------------------
patches/hotspot/original/icedtea-format.patch | 48 ----
patches/hotspot/original/icedtea-includedb.patch | 93 --------
patches/icedtea-awt-window-size.patch | 67 ------
patches/icedtea-f2i-overflow.patch | 96 ---------
patches/icedtea-format-warnings.patch | 30 --
patches/icedtea-fortify-source.patch | 60 -----
patches/icedtea-lib64.patch | 16 -
patches/icedtea-libraries.patch | 206 +++++++++----------
patches/icedtea-no-bcopy.patch | 20 -
diffs (truncated from 1636 to 500 lines):
diff -r 5bda1b46a64f -r ccd9a2a2c559 ChangeLog
--- a/ChangeLog Fri Feb 20 14:50:00 2009 +0000
+++ b/ChangeLog Fri Feb 27 15:39:11 2009 +0000
@@ -1,3 +1,19 @@ 2009-02-20 Andrew John Hughes <ahughes
+2009-02-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/original/icedtea-6791168.patch,
+ * patches/hotspot/original/icedtea-format.patch,
+ * patches/icedtea-awt-window-size.patch,
+ * patches/icedtea-f2i-overflow.patch,
+ * patches/icedtea-format-warnings.patch,
+ * patches/icedtea-fortify-source.patch,
+ * patches/icedtea-lib64.patch,
+ * patches/icedtea-no-bcopy.patch:
+ Removed, applied upstream.
+ * HACKING: Updated.
+ * Makefile.am: Bump to b48.
+ * patches/hotspot/original/icedtea-includedb.patch,
+ * patches/icedtea-libraries.patch: Recreated.
+
2009-02-20 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/share/classes/java/io/File.java,
diff -r 5bda1b46a64f -r ccd9a2a2c559 HACKING
--- a/HACKING Fri Feb 20 14:50:00 2009 +0000
+++ b/HACKING Fri Feb 27 15:39:11 2009 +0000
@@ -35,11 +35,9 @@ The following patches are currently appl
* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
* icedtea-lcms-leak.patch: Fix LCMS memory leak.
* icedtea-LCMS-setTagData.patch: Add support for setTagData to LCMS peer.
-* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
* icedtea-libraries.patch: Use system JPEG and zlib libraries.
* icedtea-linker-options.patch: Add -Xlinker option when linking.
* icedtea-memory-limits.patch: Increase default memory limits.
-* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
* icedtea-print-lsb-release.patch: Use information from Debian LSB file for crash reports.
* icedtea-rhino.patch: Add support for Javascript.
@@ -67,27 +65,28 @@ The following patches are currently appl
divide by zero on tiny paths.
* icedtea-alsa-default-device.patch: Fix problems with using the ALSA 'default' device.
* icedtea-linker-libs-order.patch: When linking, put the referenced libraries after the object files (PR237).
-* icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
* icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
* icedtea-samejvm-safe.patch: Add samejvmsafe dirs to TEST.ROOT.
* icedtea-6728542-epoll.patch: Make EPoll work on non-x86 platforms. (PR265)
* icedtea-fortify-source.patch: Fix build failures with -D_FORTIFY_SOURCE=2.
-* icedtea-format-warnings.patch: Fix build failures with -Wformat=1.
* icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter.
* icedtea-demo-swingapplet.patch: Add missing html file needed to run the demo.
-* icedtea-6791168.patch: Fix build failure with GCC-4.4 (PR 38725) and compiler warnings.
* icedtea-no-precompiled.patch: Don't use precompiled header files in hotspot.
-* icedtea-includedb.patch: Add missing include files.
-* icedtea-awt-window-size.patch: Fix X11 window size calculation (S6721088).
* icedtea-java2d-dasher.patch: Fix interpretation of dash array elements in BasicStroke (S6793344).
+* icedtea-includedb.patch: Add missing include files. (S6793825, mostly applied in b47)
The following patches are only applied to OpenJDK6 in IcedTea6:
+* icedtea-awt-window-size.patch: Fix X11 window size calculation (S6721088, applied in OpenJDK7 b48).
* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
* icedtea-display-mode-changer.patch: Add extra test class. (applied in OpenJDK7 b43)
* icedtea-enum-bug-181.patch: Fixes class type check (PR181/S6736248)
+* icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
+* icedtea-format-warnings.patch: Fix build failures with -Wformat=1. (S6781583, applied in b47).
* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-generated.patch: Force use of /bin/bash.
+* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64. (S6778662, applied in b47).
+* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD (S6781583, applied in b47).
* icedtea-nomotif.patch: Remove sanity and GrabShell.h dependency on Motif/Lesstif library.
* icedtea-nomotif-6706121.patch: Remove Motif AWT peers (S6706121).
* icedtea-sparc.patch: Add support for GNU/Linux on SPARC (version in IcedTea includes only minimal build changes).
@@ -95,8 +94,9 @@ The following patches are only applied t
* icedtea-lucene-crash.patch: Fix lucene bad code generation bug #6707044.
* icedtea-6700047-loopopts.patch: Fix partial peeling issue, bug #6700047.
* icedtea-6712835-ifnode.patch: Fix infinite loop in PhaseIterGVN::transform.
-* icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
- #6761856, swing TextLayout.getBounds() returns shifted bounds (applied in OpenJDK7 b43).
+* icedtea-6761856-freetypescaler.patch: swing TextLayout.getBounds() returns shifted bounds
+ (PR 227, S6761856, applied in OpenJDK7 b43).
+* icedtea-6791168.patch: Fix build failure with GCC-4.4 (PR 38725) and compiler warnings. (S6791168)
* 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)
@@ -110,7 +110,6 @@ The following patches are only applied t
* icedtea-override.patch: Remove @Override annotation in
javax.management.AttributeValueExp (unsupported by ecj < 3.4).
* icedtea-snmp.patch: Remove proprietary SNMP support hooks.
-* icedtea-sound.patch: Remove proprietary MIDI support hooks.
The following patches are only applied to the icedtea-ecj bootstrap tree:
@@ -196,3 +195,4 @@ XSL file (S6707485): Included upstream i
(S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
* icedtea-license-headers.patch: Generate GPL header from automulti tool (PR148/S6713083).
* icedtea-cc-interp-no-fer.patch: Replaced with icedtea-cc-interp-jvmti.patch, of which it is a subset.
+* icedtea-sound.patch: Remove proprietary MIDI support hooks.
diff -r 5bda1b46a64f -r ccd9a2a2c559 Makefile.am
--- a/Makefile.am Fri Feb 20 14:50:00 2009 +0000
+++ b/Makefile.am Fri Feb 27 15:39:11 2009 +0000
@@ -1,6 +1,6 @@ OPENJDK_DATE = 05_feb_2009
-OPENJDK_DATE = 05_feb_2009
-OPENJDK_MD5SUM = d5f92fec2f645d44437ab90e1dd2dbaf
-OPENJDK_VERSION = b46
+OPENJDK_DATE = 19_feb_2009
+OPENJDK_MD5SUM = b9846275d2ac5b2f414aa527eaf523ed
+OPENJDK_VERSION = b48
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -1752,7 +1752,6 @@ ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \
- patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
patches/hotspot/$(HSBUILD)/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
@@ -1763,7 +1762,6 @@ ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
- patches/icedtea-no-bcopy.patch \
patches/icedtea-shark-build.patch \
patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
@@ -1791,12 +1789,9 @@ ICEDTEA_PATCHES = \
patches/icedtea-stroker-finish.patch \
patches/icedtea-alsa-default-device.patch \
patches/icedtea-linker-libs-order.patch \
- patches/icedtea-f2i-overflow.patch \
patches/icedtea-testenv.patch \
patches/icedtea-pr261.patch \
patches/icedtea-doc-headers.patch \
- patches/icedtea-format-warnings.patch \
- patches/icedtea-fortify-source.patch \
$(ZERO_PATCHES_COND) \
patches/security/icedtea-6484091.patch \
patches/security/icedtea-6497740.patch \
@@ -1808,8 +1803,10 @@ ICEDTEA_PATCHES = \
patches/security/icedtea-6734167.patch \
patches/security/icedtea-6755943.patch \
patches/security/icedtea-6766136.patch \
- patches/hotspot/$(HSBUILD)/icedtea-6791168.patch \
- patches/hotspot/$(HSBUILD)/icedtea-includedb.patch
+ patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \
+ patches/icedtea-demo-swingapplet.patch \
+ patches/icedtea-java2d-dasher.patch \
+ $(DISTRIBUTION_PATCHES)
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -1844,13 +1841,6 @@ if ENABLE_NIO2
if ENABLE_NIO2
ICEDTEA_PATCHES += patches/icedtea-nio2.patch
endif
-
-ICEDTEA_PATCHES += \
- $(DISTRIBUTION_PATCHES) \
- patches/icedtea-demo-swingapplet.patch \
- patches/icedtea-awt-window-size.patch \
- patches/icedtea-java2d-dasher.patch \
- patches/hotspot/$(HSBUILD)/icedtea-format.patch
stamps/extract.stamp: stamps/download.stamp
if OPENJDK_SRC_DIR_FOUND
diff -r 5bda1b46a64f -r ccd9a2a2c559 patches/hotspot/original/icedtea-6791168.patch
--- a/patches/hotspot/original/icedtea-6791168.patch Fri Feb 20 14:50:00 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
---- openjdk/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -594,7 +594,7 @@
- __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax);
-
- // for c++ interpreter can rsi really be munged?
-- __ lea(state, Address(rbp, -sizeof(BytecodeInterpreter))); // restore state
-+ __ lea(state, Address(rbp, -(int)sizeof(BytecodeInterpreter))); // restore state
- __ movptr(rbx, Address(state, byte_offset_of(BytecodeInterpreter, _method))); // restore method
- __ movptr(rdi, Address(state, byte_offset_of(BytecodeInterpreter, _locals))); // get locals pointer
-
-@@ -658,7 +658,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
- __ lea(rax, Address(noreg, rax, Interpreter::stackElementScale(), one_monitor));
- __ lea(rax, Address(rax, rdx, Interpreter::stackElementScale(), overhead_size));
-@@ -1829,7 +1829,7 @@
- Label unwind_and_forward;
-
- // restore state pointer.
-- __ lea(state, Address(rbp, -sizeof(BytecodeInterpreter)));
-+ __ lea(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
-
- __ movptr(rbx, STATE(_method)); // get method
- #ifdef _LP64
-@@ -1877,14 +1877,14 @@
-
- // The FPU stack is clean if UseSSE >= 2 but must be cleaned in other cases
- if (UseSSE < 2) {
-- __ lea(state, Address(rbp, -sizeof(BytecodeInterpreter)));
-+ __ lea(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
- __ movptr(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
- __ jcc(Assembler::equal, do_float);
- __ cmpl(rcx, AbstractInterpreter::BasicType_as_index(T_DOUBLE)); // Result stub address array index
- __ jcc(Assembler::equal, do_double);
--#ifdef COMPILER2
-+#if !defined(_LP64) || defined(COMPILER1) || !defined(COMPILER2)
- __ empty_FPU_stack();
- #endif // COMPILER2
- __ jmp(done_conv);
-@@ -1928,7 +1928,7 @@
-
- // Restore rsi/r13 as compiled code may not preserve it
-
-- __ lea(state, Address(rbp, -sizeof(BytecodeInterpreter)));
-+ __ lea(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
-
- // restore stack to what we had when we left (in case i2c extended it)
-
-@@ -1942,7 +1942,7 @@
- #else
- __ movptr(rcx, STATE(_thread)); // get thread
- __ cmpptr(Address(rcx, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
--#endif / __LP64
-+#endif // _LP64
- __ jcc(Assembler::notZero, return_with_exception);
-
- // get method just executed
---- openjdk/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp 2009-01-13 10:17:05.000000000 +0000
-@@ -139,7 +139,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 {
---- openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -6943,29 +6943,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);
---- openjdk/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -2954,10 +2954,16 @@
- __ pushptr(Address(rcx, 0)); // Save return address
- __ enter(); // Save old & set new rbp
- __ subptr(rsp, rbx); // Prolog
-+#ifdef CC_INTERP
-+ __ movptr(Address(rbp,
-+ -(sizeof(BytecodeInterpreter)) + in_bytes(byte_offset_of(BytecodeInterpreter, _sender_sp))),
-+ sender_sp); // Make it walkable
-+#else // CC_INTERP
- __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize),
- sender_sp); // Make it walkable
- // This value is corrected by layout_activation_impl
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD );
-+#endif // CC_INTERP
- __ mov(sender_sp, rsp); // Pass sender_sp to next frame
- __ addptr(rsi, wordSize); // Bump array pointer (sizes)
- __ addptr(rcx, wordSize); // Bump array pointer (pcs)
---- openjdk/hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp 2009-01-13 10:17:05.000000000 +0000
-@@ -213,7 +213,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;
- }
-
-@@ -231,7 +231,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;
- }
-
---- openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -30,7 +30,7 @@
-
- #ifdef CC_INTERP
- void InterpreterMacroAssembler::get_method(Register reg) {
-- movptr(reg, Address(rbp, -(sizeof(BytecodeInterpreter) + 2 * wordSize)));
-+ movptr(reg, Address(rbp, -((int)sizeof(BytecodeInterpreter) + 2 * wordSize)));
- movptr(reg, Address(reg, byte_offset_of(BytecodeInterpreter, _method)));
- }
- #endif // CC_INTERP
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.orig 2009-01-13 10:16:45.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -163,7 +163,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); \
-@@ -341,7 +341,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); \
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2009-01-13 10:17:05.000000000 +0000
-@@ -66,7 +66,6 @@
- friend class InterpreterGenerator;
- friend class InterpreterMacroAssembler;
- friend class frame;
--friend class SharedRuntime;
- friend class VMStructs;
-
- public:
diff -r 5bda1b46a64f -r ccd9a2a2c559 patches/hotspot/original/icedtea-format.patch
--- a/patches/hotspot/original/icedtea-format.patch Fri Feb 20 14:50:00 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2009-02-03 18:08:09.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-02-03 18:32:59.000000000 +0000
-@@ -1361,7 +1361,7 @@
-
- // Feed the cache size setting into the JDK
- char buffer[1024];
-- sprintf(buffer, "java.lang.Integer.IntegerCache.high=%d", AutoBoxCacheMax);
-+ sprintf(buffer, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax);
- add_property(buffer);
- }
- if (AggressiveOpts && FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp openjdk/hotspot/src/share/vm/runtime/safepoint.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp 2009-01-29 15:03:07.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2009-02-03 18:30:55.000000000 +0000
-@@ -730,7 +730,7 @@
- if (DieOnSafepointTimeout) {
- char msg[1024];
- VM_Operation *op = VMThread::vm_operation();
-- sprintf(msg, "Safepoint sync time longer than %d ms detected when executing %s.",
-+ sprintf(msg, "Safepoint sync time longer than " INTX_FORMAT " ms detected when executing %s.",
- SafepointTimeoutDelay,
- op != NULL ? op->name() : "no vm operation");
- fatal(msg);
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp 2009-01-29 15:03:07.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp 2009-02-03 19:32:30.000000000 +0000
-@@ -424,7 +424,7 @@
- // asserts is that error message -- often something about negative array
- // indices -- is opaque.
-
--#define CTASSERT(x) { int tag[1-(2*!(x))]; printf ("Tag @%X\n", tag); }
-+#define CTASSERT(x) { int tag[1-(2*!(x))]; printf ("Tag @%p\n", tag); }
-
- void ObjectMonitor::ctAsserts() {
- CTASSERT(offset_of (ObjectMonitor, _header) == 0);
-diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp
---- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp 2009-02-03 19:10:58.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2009-02-03 19:29:15.000000000 +0000
-@@ -307,7 +307,7 @@
-
- strncpy(buf, file, buflen);
- if (len + 10 < buflen) {
-- sprintf(buf + len, ":" SIZE_FORMAT, _lineno);
-+ sprintf(buf + len, ":%d", _lineno);
- }
- st->print(" (%s)", buf);
- } else {
diff -r 5bda1b46a64f -r ccd9a2a2c559 patches/hotspot/original/icedtea-includedb.patch
--- a/patches/hotspot/original/icedtea-includedb.patch Fri Feb 20 14:50:00 2009 +0000
+++ b/patches/hotspot/original/icedtea-includedb.patch Fri Feb 27 15:39:11 2009 +0000
@@ -1,51 +1,7 @@
---- openjdk/hotspot/src/share/vm/includeDB_compiler2.orig 2009-01-13 10:10:44.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/includeDB_compiler2 2009-01-13 10:11:17.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
-@@ -839,6 +840,7 @@
- phase.cpp compile.hpp
- phase.cpp compileBroker.hpp
- phase.cpp nmethod.hpp
-+phase.cpp node.hpp
- phase.cpp phase.hpp
-
- phase.hpp port.hpp
---- openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_g1.orig 2009-01-13 10:10:44.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_g1 2009-01-13 10:11:17.000000000 +0000
-@@ -34,6 +34,7 @@
- collectionSetChooser.cpp g1CollectedHeap.hpp
- collectionSetChooser.cpp g1CollectorPolicy.hpp
- collectionSetChooser.cpp collectionSetChooser.hpp
-+collectionSetChooser.cpp space.inline.hpp
-
- collectionSetChooser.hpp heapRegion.hpp
- collectionSetChooser.hpp growableArray.hpp
-@@ -44,6 +45,7 @@
- concurrentG1Refine.cpp copy.hpp
- concurrentG1Refine.cpp g1CollectedHeap.hpp
- concurrentG1Refine.cpp g1RemSet.hpp
-+concurrentG1Refine.cpp space.inline.hpp
-
- concurrentG1Refine.hpp globalDefinitions.hpp
-
-@@ -264,7 +266,7 @@
- heapRegion.cpp iterator.hpp
- heapRegion.cpp oop.inline.hpp
-
--heapRegion.hpp space.hpp
-+heapRegion.hpp space.inline.hpp
- heapRegion.hpp spaceDecorator.hpp
- heapRegion.hpp g1BlockOffsetTable.inline.hpp
More information about the distro-pkg-dev
mailing list