Mercurial > hg > icedtea10
changeset 1624:ccd9a2a2c559
Bump to b48.
2009-02-24 Andrew John Hughes <ahughes@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.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 27 Feb 2009 15:39:11 +0000 |
| parents | 5bda1b46a64f |
| children | 31f193267f48 |
| files | ChangeLog HACKING Makefile.am patches/hotspot/original/icedtea-6791168.patch patches/hotspot/original/icedtea-format.patch patches/hotspot/original/icedtea-includedb.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-libraries.patch patches/icedtea-no-bcopy.patch |
| diffstat | 13 files changed, 140 insertions(+), 786 deletions(-) [+] |
line wrap: on
line diff
--- 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-24 Andrew John Hughes <ahughes@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@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/java/io/File.java,
--- a/HACKING Fri Feb 20 14:50:00 2009 +0000 +++ b/HACKING Fri Feb 27 15:39:11 2009 +0000 @@ -35,11 +35,9 @@ * 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 @@ 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 @@ * 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 @@ * 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 @@ (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.
--- 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_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 @@ 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 @@ 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 @@ 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 @@ 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 += \ @@ -1845,13 +1842,6 @@ 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 cp -a $(OPENJDK_SRC_DIR) openjdk
--- 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:
--- 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 {
--- 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 - heapRegion.hpp watermark.hpp ---- openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge.orig 2009-01-13 10:10:44.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2009-01-13 10:11:17.000000000 +0000 -@@ -306,6 +306,8 @@ +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-02-19 08:40:26.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2009-02-23 21:09:49.000000000 +0000 +@@ -308,6 +308,8 @@ psPermGen.cpp psMarkSweepDecorator.hpp psPermGen.cpp psParallelCompact.hpp psPermGen.cpp psPermGen.hpp @@ -54,44 +10,3 @@ psPermGen.hpp psOldGen.hpp ---- openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.orig 2009-01-13 10:10:44.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep 2009-01-13 10:11:17.000000000 +0000 -@@ -28,6 +28,7 @@ - binaryTreeDictionary.cpp binaryTreeDictionary.hpp - binaryTreeDictionary.cpp globals.hpp - binaryTreeDictionary.cpp ostream.hpp -+binaryTreeDictionary.cpp space.inline.hpp - binaryTreeDictionary.cpp spaceDecorator.hpp - - binaryTreeDictionary.hpp freeBlockDictionary.hpp ---- openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew.orig 2009-01-13 10:10:44.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2009-01-13 10:11:17.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 -@@ -40,7 +42,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 - ---- openjdk/hotspot/src/share/vm/includeDB_features.orig 2009-01-13 10:10:44.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/includeDB_features 2009-01-13 10:11:17.000000000 +0000 -@@ -59,6 +59,8 @@ - - dump_<arch_model>.cpp assembler_<arch>.inline.hpp - dump_<arch_model>.cpp compactingPermGenGen.hpp -+dump_<arch_model>.cpp generation.inline.hpp -+dump_<arch_model>.cpp space.inline.hpp - - forte.cpp collectedHeap.inline.hpp - forte.cpp debugInfoRec.hpp
--- a/patches/icedtea-awt-window-size.patch Fri Feb 20 14:50:00 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.orig 2009-01-08 16:53:54.000000000 -0500 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2009-01-08 16:54:08.000000000 -0500 -@@ -478,7 +478,10 @@ - // do nothing but accept it. - Rectangle reqBounds = newDimensions.getBounds(); - Rectangle newBounds = constrainBounds(reqBounds.x, reqBounds.y, reqBounds.width, reqBounds.height); -- newDimensions = new WindowDimensions(newBounds, newDimensions.getInsets(), newDimensions.isClientSizeSet()); -+ Insets insets = newDimensions.getInsets(); -+ Rectangle clientBounds = new Rectangle(newBounds.x, newBounds.y, newBounds.width - insets.left - insets.right, -+ newBounds.height - insets.top - insets.bottom); -+ newDimensions = new WindowDimensions(newDimensions.isClientSizeSet() ? clientBounds : newBounds , insets, newDimensions.isClientSizeSet()); - } - XToolkit.awtLock(); - try { ---- /dev/null 2009-01-09 04:32:08.413012246 -0500 -+++ openjdk/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java 2009-01-09 11:30:54.000000000 -0500 -@@ -0,0 +1,50 @@ -+/* -+ @test -+ @bug 6721088 -+ @summary X11 Window sizes should be what we set them to -+ @author Omair Majid <omajid@redhat.com> -+ @run main TestFrameSize -+ */ -+ -+import java.awt.Dimension; -+import java.awt.Frame; -+ -+/** -+ * TestFrameSize.java -+ * -+ * Summary: test that X11 Awt windows are drawn with correct sizes -+ * -+ * Test fails if size of window is wrong -+ */ -+ -+public class TestFrameSize { -+ -+ static Dimension desiredDimensions = new Dimension(200, 200); -+ static int ERROR_MARGIN = 15; -+ static Frame mainWindow; -+ -+ public static void drawGui() { -+ mainWindow = new Frame(""); -+ mainWindow.setPreferredSize(desiredDimensions); -+ mainWindow.pack(); -+ // mainWindow.setVisible(true); -+ -+ Dimension actualDimensions = mainWindow.getSize(); -+ // System.out.println(desiredDimensions); -+ // System.out.println(actualDimensions); -+ if (Math.abs(actualDimensions.height - desiredDimensions.height) > ERROR_MARGIN) { -+ throw new RuntimeException("Incorrect widow size"); -+ } -+ -+ } -+ -+ public static void main(String[] args) { -+ try { -+ drawGui(); -+ } finally { -+ if (mainWindow != null) { -+ mainWindow.dispose(); -+ } -+ } -+ } -+}
--- a/patches/icedtea-f2i-overflow.patch Fri Feb 20 14:50:00 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -diff -r dcb49b482348 -r f63a8dee04ae openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp ---- openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp Mon Nov 03 14:00:57 2008 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp Mon Nov 03 15:56:17 2008 +0000 -@@ -173,64 +173,46 @@ JRT_END - - - JRT_LEAF(jint, SharedRuntime::f2i(jfloat x)) -- if (g_isnan(x)) {return 0;} -- jlong lltmp = (jlong)x; -- jint ltmp = (jint)lltmp; -- if (ltmp == lltmp) { -- return ltmp; -- } else { -- if (x < 0) { -- return min_jint; -- } else { -- return max_jint; -- } -- } -+ if (g_isnan(x)) -+ return 0; -+ if (x >= (jfloat) max_jint) -+ return max_jint; -+ if (x <= (jfloat) min_jint) -+ return min_jint; -+ return (jint) x; - JRT_END - - - JRT_LEAF(jlong, SharedRuntime::f2l(jfloat x)) -- if (g_isnan(x)) {return 0;} -- jlong lltmp = (jlong)x; -- if (lltmp != min_jlong) { -- return lltmp; -- } else { -- if (x < 0) { -- return min_jlong; -- } else { -- return max_jlong; -- } -- } -+ if (g_isnan(x)) -+ return 0; -+ if (x >= (jfloat) max_jlong) -+ return max_jlong; -+ if (x <= (jfloat) min_jlong) -+ return min_jlong; -+ return (jlong) x; - JRT_END - - - JRT_LEAF(jint, SharedRuntime::d2i(jdouble x)) -- if (g_isnan(x)) {return 0;} -- jlong lltmp = (jlong)x; -- jint ltmp = (jint)lltmp; -- if (ltmp == lltmp) { -- return ltmp; -- } else { -- if (x < 0) { -- return min_jint; -- } else { -- return max_jint; -- } -- } -+ if (g_isnan(x)) -+ return 0; -+ if (x >= (jdouble) max_jint) -+ return max_jint; -+ if (x <= (jdouble) min_jint) -+ return min_jint; -+ return (jint) x; - JRT_END - - - JRT_LEAF(jlong, SharedRuntime::d2l(jdouble x)) -- if (g_isnan(x)) {return 0;} -- jlong lltmp = (jlong)x; -- if (lltmp != min_jlong) { -- return lltmp; -- } else { -- if (x < 0) { -- return min_jlong; -- } else { -- return max_jlong; -- } -- } -+ if (g_isnan(x)) -+ return 0; -+ if (x >= (jdouble) max_jlong) -+ return max_jlong; -+ if (x <= (jdouble) min_jlong) -+ return min_jlong; -+ return (jlong) x; - JRT_END - -
--- a/patches/icedtea-format-warnings.patch Fri Feb 20 14:50:00 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp~ 2008-11-20 09:41:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp 2008-12-02 16:47:01.000000000 +0100 -@@ -866,7 +866,7 @@ - } - nmethod* nm = method->code(); - if (WizardMode && nm != NULL) { -- sprintf(buf + (int)strlen(buf), "(nmethod %#x)", nm); -+ sprintf(buf + (int)strlen(buf), "(nmethod %p)", nm); - } - } - ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp~ 2008-12-02 16:38:27.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-12-02 17:05:17.000000000 +0100 -@@ -4133,6 +4133,7 @@ - int count; - long sys_time, user_time; - char string[64]; -+ char cdummy; - int idummy; - long ldummy; - FILE *fp; -@@ -4194,7 +4195,7 @@ - do s++; while (isspace(*s)); - - count = sscanf(s,"%c %d %d %d %d %d %lu %lu %lu %lu %lu %lu %lu", -- &idummy, &idummy, &idummy, &idummy, &idummy, &idummy, -+ &cdummy, &idummy, &idummy, &idummy, &idummy, &idummy, - &ldummy, &ldummy, &ldummy, &ldummy, &ldummy, - &user_time, &sys_time); - if ( count != 13 ) return -1;
--- a/patches/icedtea-fortify-source.patch Fri Feb 20 14:50:00 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ ---- openjdk/hotspot/src/share/vm/prims/jvm.cpp~ 2008-11-20 09:41:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp 2008-12-02 16:55:32.000000000 +0100 -@@ -2474,7 +2474,7 @@ - if (Arguments::vfprintf_hook() != NULL) { - jio_fprintf(defaultStream::output_stream(), "%s", s); - } else { -- ::write(defaultStream::output_fd(), s, (int)strlen(s)); -+ ssize_t rv = ::write(defaultStream::output_fd(), s, (int)strlen(s)); - } - } - ---- openjdk/hotspot/src/share/vm/utilities/ostream.cpp~ 2008-12-02 16:38:32.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2008-12-02 16:58:26.000000000 +0100 -@@ -300,7 +300,7 @@ - } - - void fileStream::write(const char* s, size_t len) { -- if (_file != NULL) fwrite(s, 1, len, _file); -+ if (_file != NULL) size_t rv = fwrite(s, 1, len, _file); - update_position(s, len); - } - -@@ -328,7 +328,7 @@ - } - - void fdStream::write(const char* s, size_t len) { -- if (_fd != -1) ::write(_fd, s, (int)len); -+ if (_fd != -1) ssize_t rv = ::write(_fd, s, (int)len); - update_position(s, len); - } - ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp~ 2008-12-02 16:38:27.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-12-02 17:05:17.000000000 +0100 -@@ -2066,7 +2066,7 @@ - CAST_FROM_FN_PTR(address, os::jvm_path), - dli_fname, sizeof(dli_fname), NULL); - assert(ret != 0, "cannot locate libjvm"); -- realpath(dli_fname, buf); -+ char *rv = realpath(dli_fname, buf); - - if (strcmp(Arguments::sun_java_launcher(), "gamma") == 0) { - // Support for the gamma launcher. Typical value for buf is -@@ -2090,7 +2090,7 @@ - assert(strstr(p, "/libjvm") == p, "invalid library name"); - p = strstr(p, "_g") ? "_g" : ""; - -- realpath(java_home_var, buf); -+ char *rv = realpath(java_home_var, buf); - sprintf(buf + strlen(buf), "/jre/lib/%s", cpu_arch); - if (0 == access(buf, F_OK)) { - // Use current module name "libjvm[_g].so" instead of -@@ -2101,7 +2101,7 @@ - sprintf(buf + strlen(buf), "/hotspot/libjvm%s.so", p); - } else { - // Go back to path of .so -- realpath(dli_fname, buf); -+ rv = realpath(dli_fname, buf); - } - } - }
--- a/patches/icedtea-lib64.patch Fri Feb 20 14:50:00 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ ---- origopenjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-01-04 18:11:53.000000000 -0500 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-04-21 14:00:59.000000000 -0400 -@@ -265,7 +265,12 @@ - * ... - * 7: The default directories, normally /lib and /usr/lib. - */ --#define DEFAULT_LIBPATH "/lib:/usr/lib" -+ -+#if defined(AMD64) || defined(_LP64) && (defined(PPC) || defined(S390)) -+#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" -+#else -+#define DEFAULT_LIBPATH "/lib:/usr/lib" -+#endif - - #define EXTENSIONS_DIR "/lib/ext" - #define ENDORSED_DIR "/lib/endorsed"
--- a/patches/icedtea-libraries.patch Fri Feb 20 14:50:00 2009 +0000 +++ b/patches/icedtea-libraries.patch Fri Feb 27 15:39:11 2009 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile ---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2008-08-04 08:43:01.000000000 +0100 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-02-19 08:43:08.000000000 +0000 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-02-20 19:01:23.000000000 +0000 @@ -75,12 +75,10 @@ $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) @@ -32,8 +32,8 @@ endif #LINUX endif #PLATFORM diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk ---- openjdk.orig/jdk/make/common/Program.gmk 2008-08-04 08:43:01.000000000 +0100 -+++ openjdk/jdk/make/common/Program.gmk 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/make/common/Program.gmk 2009-02-19 08:43:09.000000000 +0000 ++++ openjdk/jdk/make/common/Program.gmk 2009-02-20 19:01:23.000000000 +0000 @@ -85,7 +85,7 @@ endif endif @@ -43,7 +43,7 @@ LDFLAGS += -Wl,--allow-shlib-undefined LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli -@@ -250,7 +250,6 @@ +@@ -256,7 +256,6 @@ endif OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin @@ -52,8 +52,8 @@ # this may not be necessary... ifeq ($(PLATFORM), windows) diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile ---- openjdk.orig/jdk/make/java/jli/Makefile 2008-08-04 08:43:01.000000000 +0100 -+++ openjdk/jdk/make/java/jli/Makefile 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/make/java/jli/Makefile 2009-02-19 08:43:09.000000000 +0000 ++++ openjdk/jdk/make/java/jli/Makefile 2009-02-20 19:01:23.000000000 +0000 @@ -44,8 +44,6 @@ include $(BUILDDIR)/common/Defs.gmk @@ -89,7 +89,7 @@ ifeq ($(USE_PTHREADS),true) LDLIBS += -lpthread endif # USE_PTHREADS -@@ -119,7 +109,6 @@ +@@ -123,7 +113,6 @@ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) @@ -97,15 +97,15 @@ # # Library to compile. -@@ -160,4 +149,4 @@ +@@ -164,4 +153,4 @@ # # Add to ambient vpath so we pick up the library files # -vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) +vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk ---- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2008-08-04 08:43:01.000000000 +0100 -+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2009-02-19 08:43:09.000000000 +0000 ++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2009-02-20 19:01:23.000000000 +0000 @@ -30,15 +30,4 @@ Inflater.c \ ZipFile.c \ @@ -123,8 +123,8 @@ - inffast.c \ zip_util.c diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile ---- openjdk.orig/jdk/make/java/zip/Makefile 2008-08-04 08:43:01.000000000 +0100 -+++ openjdk/jdk/make/java/zip/Makefile 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/make/java/zip/Makefile 2009-02-19 08:43:09.000000000 +0000 ++++ openjdk/jdk/make/java/zip/Makefile 2009-02-20 19:01:23.000000000 +0000 @@ -30,8 +30,6 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -153,8 +153,8 @@ -OTHER_LDLIBS = $(JVMLIB) +OTHER_LDLIBS = $(JVMLIB) -lz diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk ---- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2008-08-04 08:43:03.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2009-02-19 08:43:10.000000000 +0000 ++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2009-02-20 19:01:23.000000000 +0000 @@ -25,51 +25,7 @@ FILES_c = \ @@ -209,9 +209,9 @@ ifndef OPENJDK FILES_c += \ diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile ---- openjdk.orig/jdk/make/sun/jpeg/Makefile 2008-08-04 08:43:03.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/Makefile 2008-08-09 01:24:38.000000000 +0100 -@@ -68,6 +68,8 @@ +--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-02-19 08:43:10.000000000 +0000 ++++ openjdk/jdk/make/sun/jpeg/Makefile 2009-02-20 19:01:23.000000000 +0000 +@@ -67,6 +67,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk @@ -221,8 +221,8 @@ # Add to ambient vpath to get files in a subdirectory # diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk ---- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2008-08-04 08:43:03.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2009-02-19 08:43:10.000000000 +0000 ++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2009-02-20 19:01:23.000000000 +0000 @@ -30,81 +30,5 @@ splashscreen_impl.c \ splashscreen_jpeg.c \ @@ -307,8 +307,8 @@ + splashscreen_sys.c diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile ---- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2008-08-04 08:43:03.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/Makefile 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-02-19 08:43:10.000000000 +0000 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-02-20 19:01:23.000000000 +0000 @@ -59,12 +59,12 @@ # C Flags # @@ -323,7 +323,7 @@ + OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread else # PLATFORM CFLAGS += -DWITH_WIN32 - OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib + OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll @@ -76,14 +76,10 @@ # vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen @@ -337,11 +337,11 @@ CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen -CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 - ifeq ($(PLATFORM), linux) - ifeq ($(ARCH_DATA_MODEL), 64) + # Shun the less than portable MMX assembly code in pnggccrd.c, + # and use alternative implementations in C. diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2008-08-04 08:43:37.000000000 +0100 -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-02-19 08:43:45.000000000 +0000 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-02-20 19:01:23.000000000 +0000 @@ -87,11 +87,7 @@ // bytes and byte arrays @@ -355,8 +355,8 @@ typedef LONGLONG jlong; typedef DWORDLONG julong; diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2008-08-04 08:43:37.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2009-02-19 08:43:46.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2009-02-20 19:01:23.000000000 +0000 @@ -29,7 +29,7 @@ #include "jni.h" @@ -367,8 +367,8 @@ #include "java_util_zip_Adler32.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2008-08-04 08:43:37.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2009-02-19 08:43:46.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2009-02-20 19:01:23.000000000 +0000 @@ -29,7 +29,7 @@ #include "jni.h" @@ -379,8 +379,8 @@ #include "java_util_zip_CRC32.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2008-08-04 08:43:37.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2009-02-19 08:43:46.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2009-02-20 19:01:23.000000000 +0000 @@ -32,7 +32,7 @@ #include "jlong.h" #include "jni.h" @@ -391,8 +391,8 @@ #include "java_util_zip_Deflater.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2008-08-04 08:43:37.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2009-02-19 08:43:46.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2009-02-20 19:01:23.000000000 +0000 @@ -35,7 +35,7 @@ #include "jni.h" #include "jvm.h" @@ -403,8 +403,8 @@ #define ThrowDataFormatException(env, msg) \ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2008-08-04 08:43:37.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2009-02-19 08:43:46.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2009-02-20 19:01:23.000000000 +0000 @@ -44,7 +44,8 @@ #include "io_util.h" #include "io_util_md.h" @@ -416,8 +416,8 @@ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */ #ifdef USE_MMAP diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-08-04 08:43:38.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-02-19 08:43:46.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-02-20 19:01:23.000000000 +0000 @@ -51,7 +51,9 @@ /* headers from the JPEG library */ @@ -961,7 +961,7 @@ if (scale != NULL) { diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,284 +0,0 @@ -/* @@ -1249,7 +1249,7 @@ - */ -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ -/* @@ -1418,7 +1418,7 @@ - return lines_per_iMCU_row; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,453 +0,0 @@ -/* @@ -1875,7 +1875,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,462 +0,0 @@ -/* @@ -2341,7 +2341,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,391 +0,0 @@ -/* @@ -2736,7 +2736,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,913 +0,0 @@ -/* @@ -3653,7 +3653,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -/* @@ -3708,7 +3708,7 @@ -EXTERN(void) jpeg_gen_optimal_table - JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -/* @@ -3788,7 +3788,7 @@ - (*cinfo->marker->write_file_header) (cinfo); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,297 +0,0 @@ -/* @@ -4089,7 +4089,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,682 +0,0 @@ -/* @@ -4775,7 +4775,7 @@ - marker->last_restart_interval = 0; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,594 +0,0 @@ -/* @@ -5373,7 +5373,7 @@ - master->total_passes = cinfo->num_scans; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,110 +0,0 @@ -/* @@ -5487,7 +5487,7 @@ - return tbl; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -/* jconfig.cfg --- source file edited by configure script */ @@ -5534,7 +5534,7 @@ - -#endif /* JPEG_CJPEG_DJPEG */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,614 +0,0 @@ -/* @@ -6152,7 +6152,7 @@ - -#endif /* C_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,837 +0,0 @@ -/* @@ -6993,7 +6993,7 @@ - -#endif /* C_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,358 +0,0 @@ -/* @@ -7355,7 +7355,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,523 +0,0 @@ -/* @@ -7882,7 +7882,7 @@ -#endif -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,392 +0,0 @@ -/* @@ -8278,7 +8278,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,399 +0,0 @@ -/* @@ -8681,7 +8681,7 @@ - return TRUE; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,279 +0,0 @@ -/* @@ -8964,7 +8964,7 @@ - -#endif /* D_MULTISCAN_FILES_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,740 +0,0 @@ -/* @@ -9708,7 +9708,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,398 +0,0 @@ -/* @@ -10110,7 +10110,7 @@ - cinfo->output_components = cinfo->out_color_components; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdct.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,180 +0,0 @@ -/* @@ -10294,7 +10294,7 @@ -#define MULTIPLY16V16(var1,var2) ((var1) * (var2)) -#endif diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,273 +0,0 @@ -/* @@ -10571,7 +10571,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,655 +0,0 @@ -/* @@ -11230,7 +11230,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,205 +0,0 @@ -/* @@ -11439,7 +11439,7 @@ - JPP((bitread_working_state * state, register bit_buf_type get_buffer, - register int bits_left, d_derived_tbl * htbl, int min_bits)); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,385 +0,0 @@ -/* @@ -11828,7 +11828,7 @@ - inputctl->inheaders = TRUE; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,516 +0,0 @@ -/* @@ -12348,7 +12348,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1384 +0,0 @@ -/* @@ -13736,7 +13736,7 @@ - ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,561 +0,0 @@ -/* @@ -14301,7 +14301,7 @@ - master_selection(cinfo); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,404 +0,0 @@ -/* @@ -14709,7 +14709,7 @@ - -#endif /* UPSAMPLE_MERGING_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,672 +0,0 @@ -/* @@ -15385,7 +15385,7 @@ - -#endif /* D_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,294 +0,0 @@ -/* @@ -15683,7 +15683,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,482 +0,0 @@ -/* @@ -16169,7 +16169,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,147 +0,0 @@ -/* @@ -16320,7 +16320,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,272 +0,0 @@ -/* @@ -16596,7 +16596,7 @@ - return err; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,295 +0,0 @@ -/* @@ -16895,7 +16895,7 @@ - -#endif /* JERROR_H */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,172 +0,0 @@ -/* @@ -17071,7 +17071,7 @@ - -#endif /* DCT_FLOAT_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,228 +0,0 @@ -/* @@ -17303,7 +17303,7 @@ - -#endif /* DCT_IFAST_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,287 +0,0 @@ -/* @@ -17594,7 +17594,7 @@ - -#endif /* DCT_ISLOW_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,246 +0,0 @@ -/* @@ -17844,7 +17844,7 @@ - -#endif /* DCT_FLOAT_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,372 +0,0 @@ -/* @@ -18220,7 +18220,7 @@ - -#endif /* DCT_IFAST_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,393 +0,0 @@ -/* @@ -18617,7 +18617,7 @@ - -#endif /* DCT_ISLOW_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,402 +0,0 @@ -/* @@ -19023,7 +19023,7 @@ - -#endif /* IDCT_SCALING_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -/* @@ -19122,7 +19122,7 @@ -#define JFWRITE(file,buf,sizeofbuf) \ - ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1122 +0,0 @@ -/* @@ -20248,7 +20248,7 @@ - -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -/* @@ -20365,7 +20365,7 @@ - /* no work */ -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,202 +0,0 @@ -/* @@ -20571,7 +20571,7 @@ -EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo)); -EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo)); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,375 +0,0 @@ -/* @@ -20950,8 +20950,8 @@ - -#endif /* JPEG_INTERNAL_OPTIONS */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2008-08-04 08:43:38.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2009-02-19 08:43:46.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2009-02-20 19:01:23.000000000 +0000 @@ -45,7 +45,9 @@ #undef boolean #undef FAR @@ -21206,7 +21206,7 @@ /* After finish_decompress, we can close the input file. * Here we postpone it until after no more JPEG errors are possible, diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,396 +0,0 @@ -/* @@ -21606,7 +21606,7 @@ -#endif -#endif /* INCOMPLETE_TYPES_BROKEN */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,1100 +0,0 @@ -/* @@ -22710,7 +22710,7 @@ - -#endif /* JPEGLIB_H */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,860 +0,0 @@ -/* @@ -23574,7 +23574,7 @@ - -#endif /* QUANT_1PASS_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1314 +0,0 @@ -/* @@ -24892,7 +24892,7 @@ - -#endif /* QUANT_2PASS_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jutils.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,183 +0,0 @@ -/* @@ -25079,7 +25079,7 @@ -#endif -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jversion.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -/* @@ -25101,7 +25101,7 @@ - -#define JCOPYRIGHT "Copyright (C) 1998, Thomas G. Lane" diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README openjdk/jdk/src/share/native/sun/awt/image/jpeg/README ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README 2008-08-04 08:43:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README 2009-02-19 08:43:46.000000000 +0000 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,385 +0,0 @@ -The Independent JPEG Group's JPEG software @@ -25490,8 +25490,8 @@ - -Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net. diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2008-08-04 08:43:38.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2009-02-19 08:43:47.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2009-02-20 19:01:23.000000000 +0000 @@ -26,7 +26,7 @@ #include "splashscreen_impl.h" #include "splashscreen_gfx.h" @@ -25502,8 +25502,8 @@ #define GIF_TRANSPARENT 0x01 #define GIF_USER_INPUT 0x02 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2008-08-04 08:43:38.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2009-02-19 08:43:47.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2009-02-20 19:01:23.000000000 +0000 @@ -25,9 +25,8 @@ #include "splashscreen_impl.h" @@ -25534,8 +25534,8 @@ src = (stream_src_ptr) cinfo->src; diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2008-08-04 08:43:38.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2008-08-09 01:24:38.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2009-02-19 08:43:47.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2009-02-20 19:01:23.000000000 +0000 @@ -25,7 +25,7 @@ #include "splashscreen_impl.h"
--- a/patches/icedtea-no-bcopy.patch Fri Feb 20 14:50:00 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- openjdk/hotspot/src/share/vm/libadt/port.hpp~ 2008-05-30 10:02:00.000000000 +0200 -+++ openjdk/hotspot/src/share/vm/libadt/port.hpp 2008-06-09 16:37:47.623812737 +0200 -@@ -37,17 +37,6 @@ - #include <stddef.h> - #include <stdlib.h> - #include <string.h> --#undef bzero --inline void bzero(void *b, int len) { memset(b,0,len); } --#undef bcopy --inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); } --#undef bcmp --inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);} --extern "C" unsigned long strtoul(const char *s, char **end, int base); -- --// Definition for sys_errlist varies from Sun 4.1 & Solaris. --// We use the new Solaris definition. --#include <string.h> - - // Access to the C++ class virtual function pointer - // Put the class in the macro