changeset in /hg/icedtea6: * patches/hotspot/default/14.0b08/*: ...
Mark Wielaard
mark at klomp.org
Sun Feb 15 12:54:39 PST 2009
changeset b858f5551ba7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b858f5551ba7
description:
* patches/hotspot/default/14.0b08/*: Moved to ...
patches/hotspot/default/*.
diffstat:
49 files changed, 1840 insertions(+), 1835 deletions(-)
ChangeLog | 5
patches/hotspot/default/14.0b08/icedtea-6791168.patch | 230 ------
patches/hotspot/default/14.0b08/icedtea-bytecodeInterpreter.patch | 11
patches/hotspot/default/14.0b08/icedtea-core-build.patch | 108 --
patches/hotspot/default/14.0b08/icedtea-debuginfo.patch | 15
patches/hotspot/default/14.0b08/icedtea-format.patch | 48 -
patches/hotspot/default/14.0b08/icedtea-gcc-4.3.patch | 54 -
patches/hotspot/default/14.0b08/icedtea-gcc-suffix.patch | 25
patches/hotspot/default/14.0b08/icedtea-headers.patch | 13
patches/hotspot/default/14.0b08/icedtea-includedb.patch | 97 --
patches/hotspot/default/14.0b08/icedtea-memory-limits.patch | 23
patches/hotspot/default/14.0b08/icedtea-no-precompiled.patch | 32
patches/hotspot/default/14.0b08/icedtea-params-cast-size_t.patch | 121 ---
patches/hotspot/default/14.0b08/icedtea-parisc-opt.patch | 28
patches/hotspot/default/14.0b08/icedtea-shark-build.patch | 233 ------
patches/hotspot/default/14.0b08/icedtea-shark.patch | 366 ----------
patches/hotspot/default/14.0b08/icedtea-sparc-buildfixes.patch | 35
patches/hotspot/default/14.0b08/icedtea-sparc-ptracefix.patch | 34
patches/hotspot/default/14.0b08/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/default/14.0b08/icedtea-sparc64-linux.patch | 42 -
patches/hotspot/default/14.0b08/icedtea-static-libstdc++.patch | 16
patches/hotspot/default/14.0b08/icedtea-text-relocations.patch | 61 -
patches/hotspot/default/14.0b08/icedtea-use-idx_t.patch | 45 -
patches/hotspot/default/14.0b08/icedtea-version.patch | 48 -
patches/hotspot/default/14.0b08/icedtea-zero-build.patch | 129 ---
patches/hotspot/default/icedtea-6791168.patch | 230 ++++++
patches/hotspot/default/icedtea-bytecodeInterpreter.patch | 11
patches/hotspot/default/icedtea-core-build.patch | 108 ++
patches/hotspot/default/icedtea-debuginfo.patch | 15
patches/hotspot/default/icedtea-format.patch | 48 +
patches/hotspot/default/icedtea-gcc-4.3.patch | 54 +
patches/hotspot/default/icedtea-gcc-suffix.patch | 25
patches/hotspot/default/icedtea-headers.patch | 13
patches/hotspot/default/icedtea-includedb.patch | 97 ++
patches/hotspot/default/icedtea-memory-limits.patch | 23
patches/hotspot/default/icedtea-no-precompiled.patch | 32
patches/hotspot/default/icedtea-params-cast-size_t.patch | 121 +++
patches/hotspot/default/icedtea-parisc-opt.patch | 28
patches/hotspot/default/icedtea-shark-build.patch | 233 ++++++
patches/hotspot/default/icedtea-shark.patch | 366 ++++++++++
patches/hotspot/default/icedtea-sparc-buildfixes.patch | 35
patches/hotspot/default/icedtea-sparc-ptracefix.patch | 34
patches/hotspot/default/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/default/icedtea-sparc64-linux.patch | 42 +
patches/hotspot/default/icedtea-static-libstdc++.patch | 16
patches/hotspot/default/icedtea-text-relocations.patch | 61 +
patches/hotspot/default/icedtea-use-idx_t.patch | 45 +
patches/hotspot/default/icedtea-version.patch | 48 +
patches/hotspot/default/icedtea-zero-build.patch | 129 +++
diffs (truncated from 3874 to 500 lines):
diff -r 9708fffb863d -r b858f5551ba7 ChangeLog
--- a/ChangeLog Sat Feb 14 01:12:44 2009 +0000
+++ b/ChangeLog Sun Feb 15 21:53:41 2009 +0100
@@ -1,3 +1,8 @@ 2009-02-12 Andrew John Hughes <ahughes
+2009-02-15 Mark Wielaard <mark at klomp.org>
+
+ * patches/hotspot/default/14.0b08/*: Moved to ...
+ patches/hotspot/default/*.
+
2009-02-12 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
diff -r 9708fffb863d -r b858f5551ba7 patches/hotspot/default/14.0b08/icedtea-6791168.patch
--- a/patches/hotspot/default/14.0b08/icedtea-6791168.patch Sat Feb 14 01:12:44 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 9708fffb863d -r b858f5551ba7 patches/hotspot/default/14.0b08/icedtea-bytecodeInterpreter.patch
--- a/patches/hotspot/default/14.0b08/icedtea-bytecodeInterpreter.patch Sat Feb 14 01:12:44 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;
diff -r 9708fffb863d -r b858f5551ba7 patches/hotspot/default/14.0b08/icedtea-core-build.patch
--- a/patches/hotspot/default/14.0b08/icedtea-core-build.patch Sat Feb 14 01:12:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-06-22 03:10:05.000000000 +0100
-@@ -97,6 +97,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@
- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
- endif
- endif
-+endif
-diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/Makefile 2008-06-22 03:10:05.000000000 +0100
-@@ -91,6 +91,15 @@
- all_debug: jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel docs export_optimized
-
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore: all_productcore all_fastdebugcore
-+all_productcore: productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore: jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world: all create_jdk
-
-@@ -113,6 +122,10 @@
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
-
-+$(CORE_VM_TARGETS):
-+ $(CD) $(GAMMADIR)/make; \
-+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
- $(KERNEL_VM_TARGETS):
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -159,6 +172,12 @@
- $(MAKE_ARGS) $(VM_TARGET)
- endif
-
-+generic_buildcore:
-+ $(MKDIR) -p $(OUTPUTDIR)
-+ $(CD) $(OUTPUTDIR); \
-+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
-+ $(MAKE_ARGS) $(VM_TARGET)
-+
- generic_buildkernel:
- $(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -205,13 +224,21 @@
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef ICEDTEA_CORE_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+endif
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
- KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
-
- # Misc files and generated files need to come from C1 or C2 area
-+ifdef ICEDTEA_CORE_BUILD
-+ MISC_DIR=$(C2_DIR)
-+ GEN_DIR=$(C2_BASE_DIR)/generated
-+else
- ifeq ($(ARCH_DATA_MODEL), 32)
- MISC_DIR=$(C1_DIR)
- GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -219,6 +246,7 @@
- MISC_DIR=$(C2_DIR)
- GEN_DIR=$(C2_BASE_DIR)/generated
- endif
-+endif
-
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 22:28:30.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-06-22 03:10:05.000000000 +0100
-@@ -94,8 +94,12 @@
- #ifdef TIERED
- #define VMTYPE "Server"
- #else
-- #define VMTYPE COMPILER1_PRESENT("Client") \
-- COMPILER2_PRESENT("Server")
-+#if defined(COMPILER1) || defined(COMPILER2)
-+ #define VMTYPE COMPILER1_PRESENT("Client") \
-+ COMPILER2_PRESENT("Server")
-+#else
-+ #define VMTYPE "Core"
-+#endif // COMPILER1 || COMPILER2
- #endif // TIERED
- #endif // KERNEL
-
-
diff -r 9708fffb863d -r b858f5551ba7 patches/hotspot/default/14.0b08/icedtea-debuginfo.patch
--- a/patches/hotspot/default/14.0b08/icedtea-debuginfo.patch Sat Feb 14 01:12:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-08-20 22:58:22.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-08-20 23:01:45.000000000 +0100
-@@ -62,6 +62,10 @@
- CFLAGS += -D_REENTRANT
- CFLAGS += -fcheck-new
-
-+# Always generate full debuginfo on Linux. It'll be in a separate
-+# debuginfo package when building RPMs.
-+CFLAGS += -g
-+
- ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
- ARCHFLAG/i486 = -m32 -march=i586
- ARCHFLAG/amd64 = -m64
-
diff -r 9708fffb863d -r b858f5551ba7 patches/hotspot/default/14.0b08/icedtea-format.patch
--- a/patches/hotspot/default/14.0b08/icedtea-format.patch Sat Feb 14 01:12:44 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 9708fffb863d -r b858f5551ba7 patches/hotspot/default/14.0b08/icedtea-gcc-4.3.patch
--- a/patches/hotspot/default/14.0b08/icedtea-gcc-4.3.patch Sat Feb 14 01:12:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-12-01 12:06:51.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-12-01 12:27:08.000000000 +0000
-@@ -98,7 +98,7 @@
- endif
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+# WARNINGS_ARE_ERRORS = -Werror
-
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make
---- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/make/solaris/makefiles/gcc.make 2008-12-01 12:25:10.000000000 +0000
-@@ -109,7 +109,8 @@
-
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+# Commented out for now because of gcc 4.3 warnings OpenJDK isn't ready for
-+# WARNINGS_ARE_ERRORS = -Werror
- # Enable these warnings. See 'info gcc' about details on these options
- ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
-diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/filebuff.cpp openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
---- openjdk.orig/hotspot/src/share/vm/adlc/filebuff.cpp 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2008-12-01 12:25:10.000000000 +0000
-@@ -25,6 +25,8 @@
- // FILEBUFF.CPP - Routines for handling a parser file buffer
- #include "adlc.hpp"
-
-+using namespace std;
-+
- //------------------------------FileBuff---------------------------------------
- // Create a new parsing buffer
- FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _fp(fptr), _AD(archDesc) {
-diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/filebuff.hpp openjdk/hotspot/src/share/vm/adlc/filebuff.hpp
---- openjdk.orig/hotspot/src/share/vm/adlc/filebuff.hpp 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2008-12-01 12:25:10.000000000 +0000
-@@ -94,8 +94,11 @@
- FileBuffRegion *copy(); // Deep copy
- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
-
--// void print(std::ostream&);
--// friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+#if defined(__GNUC__) && __GNUC__ >= 3
-+ void print(std::ostream&);
-+ friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+#else
- void print(ostream&);
- friend ostream& operator<< (ostream&, FileBuffRegion&);
More information about the distro-pkg-dev
mailing list