/hg/icedtea6-hg: 24 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Nov 25 10:09:07 PST 2011
changeset 737f39dbb69f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=737f39dbb69f
author: Omair Majid <omajid at redhat.com>
date: Wed Oct 26 19:28:49 2011 -0400
S7103224: collision between __LEAF define in interfaceSupport.hpp
and /usr/include/sys/cdefs.h with gcc
2011-10-26 Omair Majid <omajid at redhat.com>
* NEWS: Update with fix.
* patches/openjdk/7103224-glibc_name_collision.patch: New file. Export
of OpenJDK changeset.
* Makefile.am (ICEDTEA_PATCHES): Add the above.
changeset fd72f69cc3e9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fd72f69cc3e9
author: aph
date: Wed Oct 19 12:37:40 2011 -0400
Reinstate the ARM assembler port. 2011-09-15 Andrew Haley
<aph at redhat.com>
Reinstate the ARM assembler port. Back out this patch:
2011-07-11 Xerxes R??nby <xerxes at zafena.se>
Removal of the ARM assembler port, unbreaks Zero and Shark
builds.
* Makefile.am: (ICEDTEA_PATCHES): Remove patches/arm.patch.
(clean-ports): Removed. (stamps/ports.stamp): Likewise.
(hotspot-ports): Likewise.
* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Removed.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Likewise.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Likewise.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
* arm_port/hotspot/tools/mkbc.c: Likewise.
* patches/arm.patch: Likewise.
changeset 080e299556a0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=080e299556a0
author: aph
date: Wed Oct 26 13:10:04 2011 -0400
merge
changeset 68d8fd484caa in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=68d8fd484caa
author: aph
date: Thu Oct 27 13:49:16 2011 +0100
merge
changeset 628e5ee78eca in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=628e5ee78eca
author: aph
date: Thu Oct 27 13:54:50 2011 +0100
Update ARM port to HS20 and hard FP.
2011-10-26 Andrew Haley <aph at redhat.com>
* patches/arm.patch (CFLAGS): Enable the ARM assembler port.
PR icedtea/484:
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(fast_empty_entry, normal_entry_synchronized, normal_entry):
Return 0, #deoptimized_frames.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return):
Likewise.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
(return_unsafe, ireturn_unsafe, lreturn_unsafe)
(ireturn,areturn,freturn): Return deoptimized_frames = 0.
PR icedtea/323:
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Replace
all stores to THREAD_LAST_JAVA_SP with stores to
THREAD_LAST_JAVA_FP. Add stores to THREAD_LAST_JAVA_SP.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
* Makefile.am (ICEDTEA_PATCHES): Add patches/arm-
debug.patch. (stamps/ports.stamp): Use cp -l to link the ARM
interpreter sources into the target dir rather than copying
them. (EXTRA_DIST): Add arm_port.
Update to HS20:
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Replace all calls
to fatal1() (which no longer exists) with calls to fatal().
(Thumb2_is_zombie, Thumb2_pass2): invoke* and {get,put}* now take
native, not Java, byte ordered indexes. (Thumb2_disass,
Thumb2_codegen, Thumb2_tablegen):
Bytecodes::special_length_at() takes different arguments from the
previous version; adjust suitably.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Replace
call to report_fatal_vararg(char const*, int, char const*, ...)
(which no longer exists) with call to Helper_report_fatal.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (new):
Renumber the fast bytecodes iload_0_iconst_N to iload_3_iload_N.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
* patches/arm.patch: Likewise. Add *.S to the list of source
files.
* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (All #includes)
: Move to new OpenJDK include file format.
(Helper_report_fatal): New assember helper.
(print_vm_offsets): Add THREAD_LAST_JAVA_FP.
Hard FP port:
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Initialize):
Add hard FP variants for the stubs that need it.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(POPF0, POPF1, POPD0, POPD1,PUSHF0, PUSHD0): New macros.
(.eabi_attribute): Use real names. Add declaration for hard
FP ABI. (.fast_native_return_double,
.fast_native_return_float, .fast_copy_double,
.fast_copy_float): New. (fast_native_entry): use
SIZEOF_FFI_CIF, not 24. Add logic to handle args in FP
registers. (FIND_LOWEST_BIT, FIND_LOWEST_BIT_PAIR,
COPY_DOUBLE, COPY_FLOAT): New macros.
(.copy_float_table, .copy_double_table): New.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (frem,
drem, f2i, f2l, d2i, d2l): Add hardfp args.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(REWRITE_PAIRS): New macro.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Use
REWRITE_PAIRS to prevent rewriting pairs of bytecodes in the
instruction stream.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(fast_native_entry): Update ISTATE_SELF_LINK to get correct
stack traces.
* patches/arm-debug.patch: New file.
changeset 16a1f3497b7e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=16a1f3497b7e
author: aph
date: Thu Oct 27 18:33:35 2011 +0100
Unbreak non-ARM zero builds.
2011-10-27 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (whole
file): Conditionalize on #ifdef __arm__.
* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Likewise.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
* patches/arm.patch: Move %.S rule outside ARM conditional.
changeset 8ac014b1879d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8ac014b1879d
author: aph
date: Fri Oct 28 09:43:24 2011 -0400
Add patches/arm-debug.patch. 2011-10-28 Andrew Haley
<aph at redhat.com>
* Makefile.am (ICEDTEA_PATCHES): Add patches/arm-
debug.patch.
changeset 3885df4d608f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3885df4d608f
author: aph
date: Fri Oct 28 14:52:52 2011 +0100
merge
changeset 26bdb437215d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=26bdb437215d
author: aph
date: Fri Oct 28 11:46:11 2011 -0400
Fix PUSH/POP thinko in soft-fp builds. 2011-10-28 Andrew Haley
<aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(PUSHD0) Use PUSH, not POP.
changeset 0d4f47d2edbf in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0d4f47d2edbf
author: aph
date: Mon Oct 31 11:57:33 2011 -0400
Fix accessors to return 0, #deoptimized_frames. 2011-10-31 Andrew
Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(accessor_sh): Return 0, #deoptimized_frames.
(accessor{_h,_sb,_dw}): Likewise.
changeset 10f799f0520c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=10f799f0520c
author: aph
date: Fri Oct 28 09:43:24 2011 -0400
Add patches/arm-debug.patch. 2011-10-28 Andrew Haley
<aph at redhat.com>
* Makefile.am (ICEDTEA_PATCHES): Add patches/arm-
debug.patch.
changeset 2f08a6fa2940 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2f08a6fa2940
author: aph
date: Fri Oct 28 09:49:25 2011 -0400
merge
changeset c2cf91b8ce35 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c2cf91b8ce35
author: aph
date: Mon Oct 31 12:16:19 2011 -0400
merge
changeset 002673402c72 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=002673402c72
author: aph
date: Tue Nov 01 13:40:39 2011 +0000
Thumb2_Accessor Return 0, #deoptimized_frames. 2011-11-01 Andrew
Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
(Thumb2_Accessor): Return 0, #deoptimized_frames.
changeset 6f61af32cc26 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6f61af32cc26
author: aph
date: Wed Nov 02 16:20:25 2011 +0000
Sign extend byte loads in accessors. 2011-11-02 Andrew Haley
<aph at redhat.com>
* openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp
(Thumb2_codegen): Sign extend byte loads in accessors.
changeset f7f8d71c851c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f7f8d71c851c
author: Xerxes Ranby <xerxes at zafena.se>
date: Thu Nov 03 14:12:53 2011 +0100
cppInterpreter_arm.S: Designate function labels as such; required
for thumb interworking.
2011-11-03 Xerxes Ranby <xerxes at zafena.se>
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(cmpxchg_ptr): Designate function label as such; required for
thumb interworking. (asm_generate_method_entry,
asm_check_null_ptr, Thumb2_Install Thumb2_stubs,
Thumb2_idiv_stub, Thumb2_irem_stub,
Thumb2_invokeinterface_stub, Thumb2_invokevirtual_stub,
Thumb2_invokestatic_stub, Thumb2_invokespecial_stub,
Thumb2_getfield_word_stub, Thumb2_getfield_sh_stub,
Thumb2_getfield_h_stub, Thumb2_getfield_sb_stub,
Thumb2_getfield_dw_stub, Thumb2_putfield_word_stub,
Thumb2_putfield_h_stub, Thumb2_putfield_b_stub,
Thumb2_putfield_a_stub, Thumb2_putfield_dw_stub,
Thumb2_getstatic_word_stub, Thumb2_getstatic_h_stub,
Thumb2_getstatic_sh_stub, Thumb2_getstatic_sb_stub,
Thumb2_getstatic_dw_stub, Thumb2_putstatic_word_stub,
Thumb2_putstatic_h_stub, Thumb2_putstatic_b_stub,
Thumb2_putstatic_dw_stub, Thumb2_putstatic_a_stub,
Thumb2_stubs_end, Thumb2_DivZero_Handler,
Thumb2_Handle_Exception, Thumb2_Handle_Exception_NoRegs,
Thumb2_ArrayBounds_Handler, Thumb2_NullPtr_Handler,
Thumb2_Stack_Overflow, Thumb2_Exit_To_Interpreter,
Thumb2_Clear_Cache): Likewise.
changeset 63882126a861 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=63882126a861
author: Xerxes Ranby <xerxes at zafena.se>
date: Thu Nov 03 15:09:01 2011 +0100
CACAO: Fix FindClass called from JNI_OnLoad and implement
jni_GetDirectBufferCapacity.
2011-11-03 Xerxes Ranby <xerxes at zafena.se>
CACAO:
- Fix FindClass called from JNI_OnLoad.
- Implemented jni_GetDirectBufferCapacity.
* Makefile.am: (CACAO_VERSION): Updated CACAO to 2011-11-02
revision. (CACAO_SHA256SUM): Updated.
changeset 8b80aff6ceda in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8b80aff6ceda
author: Xerxes Ranby <xerxes at zafena.se>
date: Fri Nov 04 13:27:40 2011 +0100
cppInterpreter_arm.S: Only define ARMv4 when optimizing for armv4
and armv4t.
2011-11-04 Xerxes Ranby <xerxes at zafena.se>
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(ARMv4): Only define it when optimizing for armv4 and armv4t.
This will make the asm interpreter slightly faster when optimized
for armv5 and later.
changeset 0e1ae9c38563 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0e1ae9c38563
author: aph
date: Tue Nov 08 06:03:17 2011 -0500
Mask shift counts. 2011-11-07 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
(Thumb2_iOp): Mask shift counts with 31.
(Thumb2_codegen): Mask double shift counts with 63.
changeset 15d88aeb3dc4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=15d88aeb3dc4
author: Danesh Dadachanji <ddadacha at redhat.com>
date: Tue Nov 15 15:02:41 2011 -0500
683768: Add a workaround for Java applications using tray icon for
Gnome Shell.
changeset b26203d46fdd in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b26203d46fdd
author: Andrew Haley <aph at redhat.com>
date: Tue Nov 15 15:49:02 2011 -0500
Unbreak debug builds. 2011-11-15 Andrew Haley <aph at redhat.com>
* patches/arm-debug.patch: Surround all code in #ifdef
PRODUCT in order to unbreak debug builds.
changeset 1075c87ee025 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1075c87ee025
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 16 14:01:13 2011 +0000
PR719: make distcheck work in IcedTea6
2011-11-11 Andrew John Hughes <ahughes at redhat.com>
PR719: make distcheck work in IcedTea6
* Makefile.am: (distclean-local): Depend on clean-local.
(ports): Remove inapplicable conditionals from reversion and
ensure copied files have correct permissions.
(clean-generated): Replace hardcoded name with
$(GENERATED_BUILD_DIR). (clean-jtreg): Remove all empty
directories.
* NEWS: List this fix.
changeset 50d0d5edf291 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=50d0d5edf291
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Nov 18 20:25:16 2011 +0000
Merge
changeset 8ab75c7a55b2 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8ab75c7a55b2
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Nov 25 18:08:27 2011 +0000
Update to work with upstreamed security patches.
2011-11-24 Andrew John Hughes <ahughes at redhat.com>
* patches/security/20111018/7000600.patch,
* patches/security/20111018/7019773.patch,
* patches/security/20111018/7023640.patch,
* patches/security/20111018/7032417.patch,
* patches/security/20111018/7046794.patch,
* patches/security/20111018/7046823.patch,
* patches/security/20111018/7055902.patch,
* patches/security/20111018/7057857.patch,
* patches/security/20111018/7064341.patch,
* patches/security/20111018/7070134.patch,
* patches/security/20111018/7077466.patch,
* patches/security/20111018/7083012.patch,
* patches/security/20111018/7096936.patch: Drop patches
applied upstream.
* Makefile.am: (JAXWS_DROP_ZIP): Updated.
(JAXWS_DROP_SHA256SUM): Likewise. (SECURITY_PATCHES): Set
empty (upstream).
* patches/rhino.patch,
* patches/xjc.patch: Rewritten to work with upstream security
patches.
diffstat:
ChangeLog | 238 +
Makefile.am | 70 +-
NEWS | 5 +-
arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp | 614 +
arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 7696 +
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 6733 +
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 7553 +
arm_port/hotspot/tools/mkbc.c | 607 +
patches/arm-debug.patch | 46 +
patches/arm.patch | 226 +
patches/openjdk/6578583-modality-broken-vista.patch | 1439 -
patches/openjdk/683768-System-tray-icon.patch | 79 +
patches/openjdk/7103224-glibc_name_collision.patch | 230 +
patches/rhino.patch | 29 +-
patches/security/20111018/7000600.patch | 44 -
patches/security/20111018/7019773.patch | 116 -
patches/security/20111018/7023640.patch | 97 -
patches/security/20111018/7032417.patch | 29 -
patches/security/20111018/7046794.patch | 39 -
patches/security/20111018/7046823.patch | 140 -
patches/security/20111018/7055902.patch | 39 -
patches/security/20111018/7057857.patch | 73 -
patches/security/20111018/7064341.patch | 475 -
patches/security/20111018/7070134.patch | 97771 ----------------
patches/security/20111018/7077466.patch | 30 -
patches/security/20111018/7083012.patch | 141 -
patches/security/20111018/7096936.patch | 50 -
patches/xjc.patch | 14 +-
28 files changed, 24092 insertions(+), 100531 deletions(-)
diffs (truncated from 125030 to 500 lines):
diff -r a60a29a6dace -r 8ab75c7a55b2 ChangeLog
--- a/ChangeLog Fri Oct 21 15:04:36 2011 +0100
+++ b/ChangeLog Fri Nov 25 18:08:27 2011 +0000
@@ -1,3 +1,235 @@
+2011-11-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/security/20111018/7000600.patch,
+ * patches/security/20111018/7019773.patch,
+ * patches/security/20111018/7023640.patch,
+ * patches/security/20111018/7032417.patch,
+ * patches/security/20111018/7046794.patch,
+ * patches/security/20111018/7046823.patch,
+ * patches/security/20111018/7055902.patch,
+ * patches/security/20111018/7057857.patch,
+ * patches/security/20111018/7064341.patch,
+ * patches/security/20111018/7070134.patch,
+ * patches/security/20111018/7077466.patch,
+ * patches/security/20111018/7083012.patch,
+ * patches/security/20111018/7096936.patch:
+ Drop patches applied upstream.
+ * Makefile.am:
+ (JAXWS_DROP_ZIP): Updated.
+ (JAXWS_DROP_SHA256SUM): Likewise.
+ (SECURITY_PATCHES): Set empty (upstream).
+ * patches/rhino.patch,
+ * patches/xjc.patch:
+ Rewritten to work with upstream security patches.
+
+2011-11-11 Andrew John Hughes <ahughes at redhat.com>
+
+ PR719: make distcheck work in IcedTea6
+ * Makefile.am:
+ (distclean-local): Depend on clean-local.
+ (ports): Remove inapplicable conditionals from
+ reversion and ensure copied files have correct
+ permissions.
+ (clean-generated): Replace hardcoded name with
+ $(GENERATED_BUILD_DIR).
+ (clean-jtreg): Remove all empty directories.
+ * NEWS: List this fix.
+
+2011-11-15 Andrew Haley <aph at redhat.com>
+
+ * patches/arm-debug.patch: Surround all code in #ifdef PRODUCT
+ in order to unbreak debug builds.
+
+2011-11-14 Danesh Dadachanji <ddadacha at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patches/openjdk/683768-System-tray-icon.patch
+ * NEWS: Updated.
+ * patches/openjdk/683768-System-tray-icon.patch: New file. Sets XAtoms
+ _NET_WM_PID and WM_CLIENT_MACHINE for X windows.
+
+2011-11-07 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_iOp): Mask
+ shift counts with 31.
+ (Thumb2_codegen): Mask double shift counts with 63.
+
+2011-11-04 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (ARMv4): Only define it when optimizing for armv4 and armv4t.
+ This will make the asm interpreter slightly faster when optimized
+ for armv5 and later.
+
+2011-11-03 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ CACAO:
+ - Fix FindClass called from JNI_OnLoad.
+ - Implemented jni_GetDirectBufferCapacity.
+ * Makefile.am:
+ (CACAO_VERSION): Updated CACAO to 2011-11-02 revision.
+ (CACAO_SHA256SUM): Updated.
+
+2011-11-03 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (cmpxchg_ptr): Designate function label as such; required for
+ thumb interworking.
+ (asm_generate_method_entry, asm_check_null_ptr, Thumb2_Install
+ Thumb2_stubs, Thumb2_idiv_stub, Thumb2_irem_stub,
+ Thumb2_invokeinterface_stub, Thumb2_invokevirtual_stub,
+ Thumb2_invokestatic_stub, Thumb2_invokespecial_stub,
+ Thumb2_getfield_word_stub, Thumb2_getfield_sh_stub,
+ Thumb2_getfield_h_stub, Thumb2_getfield_sb_stub,
+ Thumb2_getfield_dw_stub, Thumb2_putfield_word_stub,
+ Thumb2_putfield_h_stub, Thumb2_putfield_b_stub,
+ Thumb2_putfield_a_stub, Thumb2_putfield_dw_stub,
+ Thumb2_getstatic_word_stub, Thumb2_getstatic_h_stub,
+ Thumb2_getstatic_sh_stub, Thumb2_getstatic_sb_stub,
+ Thumb2_getstatic_dw_stub, Thumb2_putstatic_word_stub,
+ Thumb2_putstatic_h_stub, Thumb2_putstatic_b_stub,
+ Thumb2_putstatic_dw_stub, Thumb2_putstatic_a_stub,
+ Thumb2_stubs_end, Thumb2_DivZero_Handler,
+ Thumb2_Handle_Exception, Thumb2_Handle_Exception_NoRegs,
+ Thumb2_ArrayBounds_Handler, Thumb2_NullPtr_Handler,
+ Thumb2_Stack_Overflow, Thumb2_Exit_To_Interpreter,
+ Thumb2_Clear_Cache): Likewise.
+
+2011-11-02 Andrew Haley <aph at redhat.com>
+
+ * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_codegen):
+ Sign extend byte loads in accessors.
+
+2011-11-01 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Accessor):
+ Return 0, #deoptimized_frames.
+
+2011-10-31 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (accessor_sh):
+ Return 0, #deoptimized_frames.
+ (accessor{_h,_sb,_dw}): Likewise.
+
+2011-10-28 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (PUSHD0)
+ Use PUSH, not POP.
+
+2011-10-28 Andrew Haley <aph at redhat.com>
+
+ * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-debug.patch.
+
+2011-10-27 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (whole file):
+ Conditionalize on #ifdef __arm__.
+ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
+ * patches/arm.patch: Move %.S rule outside ARM conditional.
+
+2011-10-26 Andrew Haley <aph at redhat.com>
+
+ * patches/arm.patch (CFLAGS): Enable the ARM assembler port.
+
+ PR icedtea/484:
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (fast_empty_entry, normal_entry_synchronized, normal_entry):
+ Return 0, #deoptimized_frames.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return):
+ Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
+ (return_unsafe, ireturn_unsafe, lreturn_unsafe)
+ (ireturn,areturn,freturn): Return deoptimized_frames = 0.
+
+ PR icedtea/323:
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Replace
+ all stores to THREAD_LAST_JAVA_SP with stores to
+ THREAD_LAST_JAVA_FP. Add stores to THREAD_LAST_JAVA_SP.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
+
+ * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-debug.patch.
+ (stamps/ports.stamp): Use cp -l to link the ARM interpreter
+ sources into the target dir rather than copying them.
+ (EXTRA_DIST): Add arm_port.
+
+ Update to HS20:
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Replace all calls
+ to fatal1() (which no longer exists) with calls to fatal().
+ (Thumb2_is_zombie, Thumb2_pass2): invoke* and {get,put}* now take
+ native, not Java, byte ordered indexes.
+ (Thumb2_disass, Thumb2_codegen, Thumb2_tablegen):
+ Bytecodes::special_length_at() takes different arguments from the
+ previous version; adjust suitably.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Replace
+ call to report_fatal_vararg(char const*, int, char const*, ...)
+ (which no longer exists) with call to Helper_report_fatal.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (new):
+ Renumber the fast bytecodes iload_0_iconst_N to iload_3_iload_N.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
+ * patches/arm.patch: Likewise.
+ Add *.S to the list of source files.
+ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (All #includes)
+ : Move to new OpenJDK include file format.
+ (Helper_report_fatal): New assember helper.
+ (print_vm_offsets): Add THREAD_LAST_JAVA_FP.
+
+ Hard FP port:
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Initialize):
+ Add hard FP variants for the stubs that need it.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (POPF0, POPF1, POPD0, POPD1,PUSHF0, PUSHD0): New macros.
+ (.eabi_attribute): Use real names. Add declaration for hard
+ FP ABI.
+ (.fast_native_return_double, .fast_native_return_float,
+ .fast_copy_double, .fast_copy_float): New.
+ (fast_native_entry): use SIZEOF_FFI_CIF, not 24. Add logic to
+ handle args in FP registers.
+ (FIND_LOWEST_BIT, FIND_LOWEST_BIT_PAIR, COPY_DOUBLE, COPY_FLOAT):
+ New macros.
+ (.copy_float_table, .copy_double_table): New.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
+ (frem, drem, f2i, f2l, d2i, d2l): Add hardfp args.
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (REWRITE_PAIRS): New macro.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Use
+ REWRITE_PAIRS to prevent rewriting pairs of bytecodes in the
+ instruction stream.
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (fast_native_entry):
+ Update ISTATE_SELF_LINK to get correct stack traces.
+
+ * patches/arm-debug.patch: New file.
+
+2011-10-26 Andrew Haley <aph at redhat.com>
+
+ Reinstate the ARM assembler port. Back out this patch:
+
+ 2011-07-11 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ Removal of the ARM assembler port, unbreaks Zero and Shark builds.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove patches/arm.patch.
+ (clean-ports): Removed.
+ (stamps/ports.stamp): Likewise.
+ (hotspot-ports): Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Removed.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
+ * arm_port/hotspot/tools/mkbc.c: Likewise.
+ * patches/arm.patch: Likewise.
+
+2011-10-26 Omair Majid <omajid at redhat.com>
+
+ S7103224: collision between __LEAF define in interfaceSupport.hpp and
+ /usr/include/sys/cdefs.h with gcc
+ * NEWS: Update with fix.
+ * patches/openjdk/7103224-glibc_name_collision.patch: New file. Export of
+ OpenJDK changeset.
+ * Makefile.am (ICEDTEA_PATCHES): Add the above.
+
2011-10-21 Andrew John Hughes <ahughes at redhat.com>
* patches/security/20111018/7083012.patch:
@@ -1234,6 +1466,12 @@
bugzilla: Bug #727195 "Japanese font mappings are broken"
https://bugzilla.redhat.com/show_bug.cgi?id=727195
+2011-09-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6578583-modality-broken-vista.patch:
+ Removed.
+ * Makefile.am: Drop above patch, upstreamed.
+
2011-09-08 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: added new patch
diff -r a60a29a6dace -r 8ab75c7a55b2 Makefile.am
--- a/Makefile.am Fri Oct 21 15:04:36 2011 +0100
+++ b/Makefile.am Fri Nov 25 18:08:27 2011 +0000
@@ -5,8 +5,8 @@
OPENJDK_VERSION = b23
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
-CACAO_VERSION = f910ea5348aa
-CACAO_SHA256SUM = dcbd9ebb2e4180cdcb8d2f2019c09905a87f2dfa9fda9eee56836b25727c4d90
+CACAO_VERSION = 2204b08fcae9
+CACAO_SHA256SUM = bb6ce286fcdc7350ed9913acfe5177921f515e187e74e773f6e62adba005f0a3
CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
@@ -18,8 +18,8 @@
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXWS_DROP_ZIP = jdk6-jaxws2_1_6-2011_06_08.zip
-JAXWS_DROP_SHA256SUM = be95ff0ae05b474d0bbb3ad8bdb2a23f20cb8c48b1a21f16aa079e43a50c057f
+JAXWS_DROP_ZIP = jdk6-jaxws2_1_6-2011_06_13.zip
+JAXWS_DROP_SHA256SUM = 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3
JAF_DROP_URL = http://icedtea.classpath.org/download/drops
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
@@ -199,24 +199,10 @@
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES = \
- patches/security/20111018/7000600.patch \
- patches/security/20111018/7019773.patch \
- patches/security/20111018/7023640.patch \
- patches/security/20111018/7032417.patch \
- patches/security/20111018/7046823.patch \
- patches/security/20111018/7055902.patch \
- patches/security/20111018/7057857.patch \
- patches/security/20111018/7064341.patch \
- patches/security/20111018/7070134.patch \
- patches/security/20111018/7083012.patch \
- patches/security/20111018/7096936.patch \
- patches/security/20111018/7046794.patch \
- patches/security/20111018/7077466.patch
+SECURITY_PATCHES =
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
- patches/openjdk/6578583-modality-broken-vista.patch \
patches/openjdk/6610244-modal-fatal-error-windows.patch \
patches/stdc-limit-macros.patch \
patches/openjdk/4993545-nativeinlightfixer.patch \
@@ -289,6 +275,7 @@
patches/openjdk/6959123-libpng_14.patch \
patches/applet_hole.patch \
patches/jtreg-httpTest.patch \
+ patches/arm.patch \
patches/debug-dir.patch \
patches/override-redirect-metacity.patch \
patches/openjdk/6967533-pre_epoch.patch \
@@ -407,7 +394,10 @@
patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch \
patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
- patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch
+ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
+ patches/openjdk/7103224-glibc_name_collision.patch \
+ patches/arm-debug.patch \
+ patches/openjdk/683768-System-tray-icon.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -623,7 +613,8 @@
EXTRA_DIST = generated \
$(top_srcdir)/patches/* \
- contrib overlays \
+ contrib arm_port \
+ overlays \
jconsole.desktop policytool.desktop \
$(JTREG_SRCS) HACKING pulseaudio fsg.sh \
hotspot.map \
@@ -644,7 +635,7 @@
check-local: jtregcheck
clean-local: clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \
- clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract \
+ clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract clean-ports \
clean-overlay clean-native-ecj clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \
@@ -657,7 +648,7 @@
rmdir lib ; \
fi
-distclean-local: clean-download clean-hgforest
+distclean-local: clean-local clean-download clean-hgforest
if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
if [ -e tapset ] ; then \
rmdir tapset ; \
@@ -681,7 +672,7 @@
clean-icedtea-against-ecj \
clean-jamvm clean-add-jamvm clean-add-jamvm-debug \
clean-cacao clean-add-cacao clean-add-cacao-debug \
- clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
+ clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \
clean-rewriter clean-rewrite-rhino clean-add-systemtap clean-add-systemtap-debug \
clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
@@ -1037,7 +1028,26 @@
clean-replace-hotspot:
rm -f stamps/replace-hotspot.stamp
-stamps/generated.stamp: stamps/replace-hotspot.stamp
+# Copy ports sources into tree
+stamps/ports.stamp: stamps/replace-hotspot.stamp
+ for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
+ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
+ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
+ cp -rlv $$target $$link; \
+ chmod -R ug+rwX $$link; \
+ done
+ mkdir -p stamps
+ touch stamps/ports.stamp
+
+clean-ports:
+ for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
+ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
+ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
+ rm -rf $$link; \
+ done
+ rm -f stamps/ports.stamp
+
+stamps/generated.stamp: stamps/ports.stamp
if [ ! -e $(GENERATED_BUILD_DIR) ]; then \
cp -a $(abs_top_srcdir)/generated $(GENERATED_BUILD_DIR) && \
chmod -R ug+rwX $(GENERATED_BUILD_DIR) ; \
@@ -1047,7 +1057,7 @@
clean-generated:
if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
- rm -rf $(abs_top_builddir)/generated ; \
+ rm -rf $(GENERATED_BUILD_DIR); \
fi
rm -f stamps/generated.stamp
@@ -2122,7 +2132,13 @@
clean-jtreg:
rm -rf test/jtreg/classes
+ if [ -e test/jtreg ] ; then \
+ rmdir test/jtreg ; \
+ fi
rm -f test/jtreg.jar
+ if [ -e test ] ; then \
+ rmdir test ; \
+ fi
rm -f stamps/jtreg.stamp
check-hotspot: stamps/jtreg.stamp
@@ -2289,6 +2305,8 @@
extract-ecj: stamps/extract-ecj.stamp
+hotspot-ports: stamps/ports.stamp
+
icedtea: stamps/icedtea.stamp
icedtea-against-icedtea: stamps/icedtea-against-icedtea.stamp
diff -r a60a29a6dace -r 8ab75c7a55b2 NEWS
--- a/NEWS Fri Oct 21 15:04:36 2011 +0100
+++ b/NEWS Fri Nov 25 18:08:27 2011 +0000
@@ -21,6 +21,9 @@
- PR752: ImageFormatException extends Exception not RuntimeException
- PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
- RH727195: Japanese font mappings are broken
+ - LP862286: Fix exception on trying to start PulseAudio playback
+ - RH683768: Add a workaround for Java applications using tray icon for Gnome Shell
+ - PR719: make distcheck should work in IcedTea6
* Import of OpenJDK6 b23 including upgrade to HotSpot 20
- S7023111: Add webrev script to make/scripts
- S6909331: Add vsvars.sh to the jdk repository (handy cygwin way to get vcvars32.bat run)
@@ -372,7 +375,7 @@
- S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog
- S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false"
- S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types
- - LP862286: Fix exception on trying to start PulseAudio playback
+ - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
* CACAO
- CA149: Used wrong class loader.
diff -r a60a29a6dace -r 8ab75c7a55b2 arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Fri Nov 25 18:08:27 2011 +0000
@@ -0,0 +1,614 @@
+/*
+ * Copyright 2009, 2010 Edward Nevill
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef __arm__
+
+#define ARCH_THUMBEE (1<<16)
+#define ARCH_VFP (1<<17)
+#define ARCH_CLZ (1<<18)
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "interp_masm_zero.hpp"
+#include "interpreter/bytecodeInterpreter.hpp"
+#include "interpreter/bytecodeInterpreter.inline.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
+#include "oops/methodDataOop.hpp"
+#include "oops/methodOop.hpp"
+#include "oops/oop.inline.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "prims/jvmtiThreadState.hpp"
+#include "runtime/deoptimization.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/synchronizer.hpp"
+#include "runtime/vframeArray.hpp"
+#include "utilities/debug.hpp"
+
+#ifndef STATIC_OFFSETS
+
+#include <linux/auxvec.h>
+#include <asm/hwcap.h>
+
+#define VECBUFF_SIZE 64
+
+extern "C" unsigned hwcap(void)
+{
+ int fd;
More information about the distro-pkg-dev
mailing list