/hg/release/icedtea7-2.5: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sat Jan 24 02:10:28 UTC 2015
changeset 20d321ef9d8c in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=20d321ef9d8c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jan 22 04:20:29 2015 +0000
Change AArch64 HotSpot to the one from IcedTea 2.6.0pre17.
* AArch64 port
Use the IcedTea7 fork version rather than the one based on HotSpot 25.
Add arch-specific processing of tmp1 register needed for d/f2i
Add char_array_equals intrinsic
Add CNEG and CNEGW to macro assembler.
Add frame anchor fences.
Add missing instruction synchronization barriers and cache flushes.
Add some memory barriers for object creation and runtime calls.
Add support for A53 multiply accumulate
Add support for AES Intrinsics
Add support for pipeline scheduling
Add support for String.indexOf intrinsic
Added make rules to allow aarch64-x86 hybrid build to progress
Added missing aarch64-specific include
Added missing aarch64-specific make file
Added missing changes for debug code
Added missing inline method
Added missing shared global UseCRC32Intrinsics
Added pd global UseVectoredExceptions
Add local method to redirect to AbstractAssembler::relocate
Add missing declarations for CRC32 methods
Add missing include
Add missing special case code for aarch64
Add rules to assemble .S files
Add support for storing aarch64 call format
Add wrapper method to avoid dependency on not yet defined code buffer class
Added missing endif
Allow for 0x400 aligned offsets for byte_map_base
Array load must only read 32 bits
A more efficient sequence for C1_MacroAssembler::float_cmp.
Backout 8c8b5e62e624 and instead move .S rule from zeroshark.make to rules.make
Backout additional changes made in ec6a6772fed6, which revert parts of the PPC/AIX port and IcedTea fixes.
Call ICache::invalidate_range() from Relocation::pd_set_data_value().
Changed klass oop encode to heap oop encode
Changed Method* to methodOop
Correct assert to allow for AArch64
Correct for difference in include hierarchy
Correct typos
Corrected error in disassembler code
Corrected include
Corrected include path
Corrected pipeline class for countTrailingZerosL
Corrected type
Corrected typo
Correct includes
Correct Method to methdoOopDesc
Define uabs(). Use it everywhere an absolute value is wanted.
Defn of BIND does not need to use __ macro
Delete dead code.
Disassembler library should be built as hsdis-aarch64.so
Don't test arraycopy routines when using AArch64 simulator
Emit_int64 is renamed
Ensure byte_map_base can be loaded using adrp with no need for following ldr
Ensure C1 static call stub employs absolute move to allow patching
Ensure C2 static calls use correct call adddress in static stub reloc
Ensure perm gen size is not rounded down to zero
Ensure rmethod is reloaded from stack when interpreter makes non leaf VM call
Ensure we pick up hsdis-aarch64.so if BUILTIN_SIM is true
Fix couple of mistakes in generate of method handle dispatch
Fix cut and paste-o in header
Fixed another typo
Fixed error in include
Fixed hsdis for aarch64 native or simulated
Fixed various typos and omissions
Fixed various typos, overlooked cases and wrong accessors
Fix error introduced into profiling code
Fix guarantee failure in synchronizer.cpp
Fix more errors introduced into interpreter profile counter increment
Fix relocations
Fix several small typos
Fix some typos
Fix thinko in Atomic::xchg_ptr.
Fix typo
Fix up aarch64-specific patching code
Fix up crc32 support
Fix various typos
Get rid of unnecessary declaration
Guess at how to implement C1 deoptimize_trap generator
Initial cut of aarch64 code pulled from jdk8 tree
Make aarch64-x86 hybrid build use correct paths
Make hsdis handle aarch64 native case
Make static stubs load methodOop in cpool to avoid problems at GC
Miscellaneous bug fixes.
Missing change needed to support aarch64 build
Modified make files to support aarch64 build
Modified shared src to support full aarch64 backport
Moved fields which need access from java to top level
Need to actually return the adapter code size
Need to pass CFLAGS when assembling .S files using CC_COMPILE
Need to use class handle not class
Provide missing CRC32 methods
Reload rcpool register after a VM call in case a permgen GC has moved the cache
Relocated aarch64 vtable generate code to conform to jdk7
Remove comment to avoid breaking macro
Removed aarch64 compiled_IC implementation to conform to jdk7
Removed metaspaceShared code to conform to jdk7
Removed redundant field use_XOR_for_compressed_class_base
Removed some errors in signal handling code
Removed undefined metadata case
Remove redundant bracket
Remove support for volatile load/store rules in ad file
Renamed emit_int32 to emit_long and added local emit_long64 in place of missing emit_int64
Restored missing open brace
Restored several load_heap_oop calls lost in translation
Restore working x86 build
Reverted aarch64 architecture description (ad) file to conform to jdk7
Reverted aarch64 c1_xxx files to conform to jdk7
Reverted aarch64 c2 globals to conform to jdk7
Reverted aarch64 frame code to conform to jdk7
Reverted aarch64 runtime code to conform to jdk7
Reverted aarch64 stubs code to conform to jdk7
Reverted aarch64 template interpreter code to conform to jdk7
Reverted aarch64 vm structs code to conform to jdk7
Reverted aarch64 vm version code to conform to jdk7
Reverted aarch64 vtable stubs code to conform to jdk7
Reverted assembler_aarch64.cpp/hpp to conform to jdk7
Reverted bytecodeInterpreter_aarch64 to conform to jdk7
Reverted global defs code to conform to jdk7
Reverted instr cache code to conform to jdk7
Reverted interpreter code to conform to jdk7
Reverted interpreter masm code to conform to jdk7
Reverted jni code to conform to jdk7
Reverted method handles code to conform to jdk7
Reverted native instr code to conform to jdk7
Reverted os_cpu/linux_aarch64 code to conform to jdk7
Reverted reloc info code to conform to jdk7
Revert Method:: etc to methodOopDesc:: etc
Scripts to build aarch64-x86 hybrid and aarch64 native debug images
Some errors revealed when building debug image
Temporarily disable running test_gamma
Tidy up allocation prefetch
Use correct post-increment size in repne_scanw
Use membar rules and delete special case volatile rules
Use method register to access counter increment field
Use movoop in C1 ic_call to keep verifier happy
Use os::malloc to allocate the register map.
Use the correct return value from the VM resolve call
Use TLS for ThreadLocalStorage::thread()
Various changes to accommodate inclusion of ppc port in icedtea7
Various concurrency fixes.
Work around weird compiler issue
2015-01-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/hotspot/default/systemtap_gc.patch:
Remove unused patch.
* Makefile.am:
(ICEDTEA_ENV): Drop FULL_DEBUG_SYMBOLS=0.
This is not needed with the IcedTea HotSpot.
* NEWS: Updated.
* hotspot.map.in: Update aarch64 HotSpot
to icedtea-2.6.0pre17's.
2014-12-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(EXTRA_DIST): Drop reference to HotSpot patches
as there is no longer an alternate HotSpot.
2014-11-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
Merge AArch64 port into mainline IcedTea7.
* patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch,
* patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch,
* patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch,
* patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch,
* patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch,
* patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch,
* patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch,
* patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch,
* patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch,
* patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch,
* patches/hotspot/aarch64/systemtap_gc.patch,
* patches/hotspot/aarch64/werror.patch:
Remove unneeded patches from AArch64 HotSpot build.
* Makefile.am:
(ICEDTEA_PATCHES): Remove AArch64 HotSpot build
patches.
changeset e32aa5c749cf in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=e32aa5c749cf
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jan 22 04:28:13 2015 +0000
Set 2.5.4 release date.
2015-01-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Set release date.
changeset bf2f57ed993b in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=bf2f57ed993b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sat Jan 24 02:09:48 2015 +0000
Added tag icedtea-2.5.4pre03 for changeset e4cedb2051e9
changeset 2832e84a2b58 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=2832e84a2b58
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sat Jan 24 02:09:56 2015 +0000
Added tag icedtea-2.5.4 for changeset bf2f57ed993b
diffstat:
.hgtags | 2 +
ChangeLog | 41 +
Makefile.am | 26 -
NEWS | 143 +++-
hotspot.map.in | 2 +-
patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch | 209 -----
patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch | 291 -------
patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch | 221 -----
patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch | 21 -
patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch | 30 -
patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch | 33 -
patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch | 22 -
patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch | 250 ------
patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch | 24 -
patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch | 259 ------
patches/hotspot/aarch64/systemtap_gc.patch | 373 ---------
patches/hotspot/aarch64/werror.patch | 43 -
patches/hotspot/default/systemtap_gc.patch | 379 ----------
18 files changed, 186 insertions(+), 2183 deletions(-)
diffs (truncated from 2482 to 500 lines):
diff -r 45ac6cd7aae2 -r 2832e84a2b58 .hgtags
--- a/.hgtags Thu Jan 22 01:27:39 2015 +0000
+++ b/.hgtags Sat Jan 24 02:09:56 2015 +0000
@@ -42,3 +42,5 @@
ff1723d0a8a23ef46e158aafcf2ee15c3e6317dc icedtea-2.5.3
f7b45c5319970ed7e4b88e9d5aa386752ddd594f icedtea-2.5.4pre01
13b10ea1447cf1eab772658493eedeaf879bfd93 icedtea-2.5.4pre02
+e4cedb2051e989afb874d4bb3b568ffe3233320a icedtea-2.5.4pre03
+bf2f57ed993bf0759293822a0789ed1be4fcf48e icedtea-2.5.4
diff -r 45ac6cd7aae2 -r 2832e84a2b58 ChangeLog
--- a/ChangeLog Thu Jan 22 01:27:39 2015 +0000
+++ b/ChangeLog Sat Jan 24 02:09:56 2015 +0000
@@ -1,3 +1,44 @@
+2015-01-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Set release date.
+
+2015-01-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/hotspot/default/systemtap_gc.patch:
+ Remove unused patch.
+ * Makefile.am:
+ (ICEDTEA_ENV): Drop FULL_DEBUG_SYMBOLS=0.
+ This is not needed with the IcedTea HotSpot.
+ * NEWS: Updated.
+ * hotspot.map.in: Update aarch64 HotSpot
+ to icedtea-2.6.0pre17's.
+
+2014-12-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (EXTRA_DIST): Drop reference to HotSpot patches
+ as there is no longer an alternate HotSpot.
+
+2014-11-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ Merge AArch64 port into mainline IcedTea7.
+ * patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch,
+ * patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch,
+ * patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch,
+ * patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch,
+ * patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch,
+ * patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch,
+ * patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch,
+ * patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch,
+ * patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch,
+ * patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch,
+ * patches/hotspot/aarch64/systemtap_gc.patch,
+ * patches/hotspot/aarch64/werror.patch:
+ Remove unneeded patches from AArch64 HotSpot build.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove AArch64 HotSpot build
+ patches.
+
2014-10-29 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 45ac6cd7aae2 -r 2832e84a2b58 Makefile.am
--- a/Makefile.am Thu Jan 22 01:27:39 2015 +0000
+++ b/Makefile.am Sat Jan 24 02:09:56 2015 +0000
@@ -285,24 +285,6 @@
endif
endif
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += patches/hotspot/aarch64/werror.patch \
- patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch \
- patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch \
- patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch \
- patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch \
- patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch \
- patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch \
- patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch \
- patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch \
- patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch \
- patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch
-if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += \
- patches/hotspot/aarch64/systemtap_gc.patch
-endif
-endif
-
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
@@ -613,13 +595,6 @@
INFINALITY_SUPPORT="true"
endif
-# This seems illogical, but it actually just
-# turns off the creation of separate debuginfo files.
-if WITH_ALT_HSBUILD
-ICEDTEA_ENV += \
- FULL_DEBUG_SYMBOLS=0
-endif
-
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
@@ -781,7 +756,6 @@
EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/boot/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
- $(top_srcdir)/patches/hotspot/*/*.patch \
$(top_srcdir)/patches/jamvm/*.patch \
tools-copy contrib overlays \
jconsole.desktop policytool.desktop \
diff -r 45ac6cd7aae2 -r 2832e84a2b58 NEWS
--- a/NEWS Thu Jan 22 01:27:39 2015 +0000
+++ b/NEWS Sat Jan 24 02:09:56 2015 +0000
@@ -12,7 +12,7 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.5.4 (2015-01-XX):
+New in release 2.5.4 (2015-01-21):
* Security fixes
- S8046656: Update protocol support
@@ -115,6 +115,147 @@
* JamVM
- PR2050: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3
- PR2171: JamVM builds with executable stack, causing failures on SELinux & PaX kernels
+* AArch64 port
+ - Use the IcedTea7 fork version rather than the one based on HotSpot 25.
+ - Add arch-specific processing of tmp1 register needed for d/f2i
+ - Add char_array_equals intrinsic
+ - Add CNEG and CNEGW to macro assembler.
+ - Add frame anchor fences.
+ - Add missing instruction synchronization barriers and cache flushes.
+ - Add some memory barriers for object creation and runtime calls.
+ - Add support for A53 multiply accumulate
+ - Add support for AES Intrinsics
+ - Add support for pipeline scheduling
+ - Add support for String.indexOf intrinsic
+ - Added make rules to allow aarch64-x86 hybrid build to progress
+ - Added missing aarch64-specific include
+ - Added missing aarch64-specific make file
+ - Added missing changes for debug code
+ - Added missing inline method
+ - Added missing shared global UseCRC32Intrinsics
+ - Added pd global UseVectoredExceptions
+ - Add local method to redirect to AbstractAssembler::relocate
+ - Add missing declarations for CRC32 methods
+ - Add missing include
+ - Add missing special case code for aarch64
+ - Add rules to assemble .S files
+ - Add support for storing aarch64 call format
+ - Add wrapper method to avoid dependency on not yet defined code buffer class
+ - Added missing endif
+ - Allow for 0x400 aligned offsets for byte_map_base
+ - Array load must only read 32 bits
+ - A more efficient sequence for C1_MacroAssembler::float_cmp.
+ - Backout 8c8b5e62e624 and instead move .S rule from zeroshark.make to rules.make
+ - Backout additional changes made in ec6a6772fed6, which revert parts of the PPC/AIX port and IcedTea fixes.
+ - Call ICache::invalidate_range() from Relocation::pd_set_data_value().
+ - Changed klass oop encode to heap oop encode
+ - Changed Method* to methodOop
+ - Correct assert to allow for AArch64
+ - Correct for difference in include hierarchy
+ - Correct typos
+ - Corrected error in disassembler code
+ - Corrected include
+ - Corrected include path
+ - Corrected pipeline class for countTrailingZerosL
+ - Corrected type
+ - Corrected typo
+ - Correct includes
+ - Correct Method to methdoOopDesc
+ - Define uabs(). Use it everywhere an absolute value is wanted.
+ - Defn of BIND does not need to use __ macro
+ - Delete dead code.
+ - Disassembler library should be built as hsdis-aarch64.so
+ - Don't test arraycopy routines when using AArch64 simulator
+ - Emit_int64 is renamed
+ - Ensure byte_map_base can be loaded using adrp with no need for following ldr
+ - Ensure C1 static call stub employs absolute move to allow patching
+ - Ensure C2 static calls use correct call adddress in static stub reloc
+ - Ensure perm gen size is not rounded down to zero
+ - Ensure rmethod is reloaded from stack when interpreter makes non leaf VM call
+ - Ensure we pick up hsdis-aarch64.so if BUILTIN_SIM is true
+ - Fix couple of mistakes in generate of method handle dispatch
+ - Fix cut and paste-o in header
+ - Fixed another typo
+ - Fixed error in include
+ - Fixed hsdis for aarch64 native or simulated
+ - Fixed various typos and omissions
+ - Fixed various typos, overlooked cases and wrong accessors
+ - Fix error introduced into profiling code
+ - Fix guarantee failure in synchronizer.cpp
+ - Fix more errors introduced into interpreter profile counter increment
+ - Fix relocations
+ - Fix several small typos
+ - Fix some typos
+ - Fix thinko in Atomic::xchg_ptr.
+ - Fix typo
+ - Fix up aarch64-specific patching code
+ - Fix up crc32 support
+ - Fix various typos
+ - Get rid of unnecessary declaration
+ - Guess at how to implement C1 deoptimize_trap generator
+ - Initial cut of aarch64 code pulled from jdk8 tree
+ - Make aarch64-x86 hybrid build use correct paths
+ - Make hsdis handle aarch64 native case
+ - Make static stubs load methodOop in cpool to avoid problems at GC
+ - Miscellaneous bug fixes.
+ - Missing change needed to support aarch64 build
+ - Modified make files to support aarch64 build
+ - Modified shared src to support full aarch64 backport
+ - Moved fields which need access from java to top level
+ - Need to actually return the adapter code size
+ - Need to pass CFLAGS when assembling .S files using CC_COMPILE
+ - Need to use class handle not class
+ - Provide missing CRC32 methods
+ - Reload rcpool register after a VM call in case a permgen GC has moved the cache
+ - Relocated aarch64 vtable generate code to conform to jdk7
+ - Remove comment to avoid breaking macro
+ - Removed aarch64 compiled_IC implementation to conform to jdk7
+ - Removed metaspaceShared code to conform to jdk7
+ - Removed redundant field use_XOR_for_compressed_class_base
+ - Removed some errors in signal handling code
+ - Removed undefined metadata case
+ - Remove redundant bracket
+ - Remove support for volatile load/store rules in ad file
+ - Renamed emit_int32 to emit_long and added local emit_long64 in place of missing emit_int64
+ - Restored missing open brace
+ - Restored several load_heap_oop calls lost in translation
+ - Restore working x86 build
+ - Reverted aarch64 architecture description (ad) file to conform to jdk7
+ - Reverted aarch64 c1_xxx files to conform to jdk7
+ - Reverted aarch64 c2 globals to conform to jdk7
+ - Reverted aarch64 frame code to conform to jdk7
+ - Reverted aarch64 runtime code to conform to jdk7
+ - Reverted aarch64 stubs code to conform to jdk7
+ - Reverted aarch64 template interpreter code to conform to jdk7
+ - Reverted aarch64 vm structs code to conform to jdk7
+ - Reverted aarch64 vm version code to conform to jdk7
+ - Reverted aarch64 vtable stubs code to conform to jdk7
+ - Reverted assembler_aarch64.cpp/hpp to conform to jdk7
+ - Reverted bytecodeInterpreter_aarch64 to conform to jdk7
+ - Reverted global defs code to conform to jdk7
+ - Reverted instr cache code to conform to jdk7
+ - Reverted interpreter code to conform to jdk7
+ - Reverted interpreter masm code to conform to jdk7
+ - Reverted jni code to conform to jdk7
+ - Reverted method handles code to conform to jdk7
+ - Reverted native instr code to conform to jdk7
+ - Reverted os_cpu/linux_aarch64 code to conform to jdk7
+ - Reverted reloc info code to conform to jdk7
+ - Revert Method:: etc to methodOopDesc:: etc
+ - Scripts to build aarch64-x86 hybrid and aarch64 native debug images
+ - Some errors revealed when building debug image
+ - Temporarily disable running test_gamma
+ - Tidy up allocation prefetch
+ - Use correct post-increment size in repne_scanw
+ - Use membar rules and delete special case volatile rules
+ - Use method register to access counter increment field
+ - Use movoop in C1 ic_call to keep verifier happy
+ - Use os::malloc to allocate the register map.
+ - Use the correct return value from the VM resolve call
+ - Use TLS for ThreadLocalStorage::thread()
+ - Various changes to accommodate inclusion of ppc port in icedtea7
+ - Various concurrency fixes.
+ - Work around weird compiler issue
New in release 2.5.3 (2014-10-14):
diff -r 45ac6cd7aae2 -r 2832e84a2b58 hotspot.map.in
--- a/hotspot.map.in Thu Jan 22 01:27:39 2015 +0000
+++ b/hotspot.map.in Sat Jan 24 02:09:56 2015 +0000
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6144ca9b6a72 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34
-aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5
+aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef
diff -r 45ac6cd7aae2 -r 2832e84a2b58 patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch
--- a/patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch Thu Jan 22 01:27:39 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-# HG changeset patch
-# User coleenp
-# Date 1399583989 14400
-# Thu May 08 17:19:49 2014 -0400
-# Node ID 671021ba6f79fadfb510be047b23dcdabe35160d
-# Parent 9580ebccfdc392c93c79633bdc207139de511438
-8015256: Better class accessibility
-Summary: Improve protection domain check in forName()
-Reviewed-by: mchung, acorn, jdn
-
-diff -r 9580ebccfdc3 -r 671021ba6f79 make/bsd/makefiles/mapfile-vers-debug
---- openjdk/hotspot/make/bsd/makefiles/mapfile-vers-debug Thu Sep 11 07:28:58 2014 -0400
-+++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-debug Thu May 08 17:19:49 2014 -0400
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -82,6 +82,7 @@
- _JVM_EnableCompiler
- _JVM_Exit
- _JVM_FillInStackTrace
-+ _JVM_FindClassFromCaller
- _JVM_FindClassFromClass
- _JVM_FindClassFromClassLoader
- _JVM_FindClassFromBootLoader
-diff -r 9580ebccfdc3 -r 671021ba6f79 make/bsd/makefiles/mapfile-vers-product
---- openjdk/hotspot/make/bsd/makefiles/mapfile-vers-product Thu Sep 11 07:28:58 2014 -0400
-+++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-product Thu May 08 17:19:49 2014 -0400
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -82,6 +82,7 @@
- _JVM_EnableCompiler
- _JVM_Exit
- _JVM_FillInStackTrace
-+ _JVM_FindClassFromCaller
- _JVM_FindClassFromClass
- _JVM_FindClassFromClassLoader
- _JVM_FindClassFromBootLoader
-diff -r 9580ebccfdc3 -r 671021ba6f79 make/linux/makefiles/mapfile-vers-debug
---- openjdk/hotspot/make/linux/makefiles/mapfile-vers-debug Thu Sep 11 07:28:58 2014 -0400
-+++ openjdk/hotspot/make/linux/makefiles/mapfile-vers-debug Thu May 08 17:19:49 2014 -0400
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -84,6 +84,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromCaller;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindClassFromBootLoader;
-diff -r 9580ebccfdc3 -r 671021ba6f79 make/linux/makefiles/mapfile-vers-product
---- openjdk/hotspot/make/linux/makefiles/mapfile-vers-product Thu Sep 11 07:28:58 2014 -0400
-+++ openjdk/hotspot/make/linux/makefiles/mapfile-vers-product Thu May 08 17:19:49 2014 -0400
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -84,6 +84,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromCaller;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindClassFromBootLoader;
-diff -r 9580ebccfdc3 -r 671021ba6f79 make/solaris/makefiles/mapfile-vers
---- openjdk/hotspot/make/solaris/makefiles/mapfile-vers Thu Sep 11 07:28:58 2014 -0400
-+++ openjdk/hotspot/make/solaris/makefiles/mapfile-vers Thu May 08 17:19:49 2014 -0400
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -84,6 +84,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromCaller;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindClassFromBootLoader;
-diff -r 9580ebccfdc3 -r 671021ba6f79 src/share/vm/prims/jvm.cpp
---- openjdk/hotspot/src/share/vm/prims/jvm.cpp Thu Sep 11 07:28:58 2014 -0400
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp Thu May 08 17:19:49 2014 -0400
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -777,6 +777,7 @@
- return (jclass) JNIHandles::make_local(env, k->java_mirror());
- JVM_END
-
-+// Not used; JVM_FindClassFromCaller replaces this.
- JVM_ENTRY(jclass, JVM_FindClassFromClassLoader(JNIEnv* env, const char* name,
- jboolean init, jobject loader,
- jboolean throwError))
-@@ -803,6 +804,42 @@
- return result;
- JVM_END
-
-+// Find a class with this name in this loader, using the caller's protection domain.
-+JVM_ENTRY(jclass, JVM_FindClassFromCaller(JNIEnv* env, const char* name,
-+ jboolean init, jobject loader,
-+ jclass caller))
-+ JVMWrapper2("JVM_FindClassFromCaller %s throws ClassNotFoundException", name);
-+ // Java libraries should ensure that name is never null...
-+ if (name == NULL || (int)strlen(name) > Symbol::max_length()) {
-+ // It's impossible to create this class; the name cannot fit
-+ // into the constant pool.
-+ THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), name);
-+ }
-+
-+ TempNewSymbol h_name = SymbolTable::new_symbol(name, CHECK_NULL);
-+
-+ oop loader_oop = JNIHandles::resolve(loader);
-+ oop from_class = JNIHandles::resolve(caller);
-+ oop protection_domain = NULL;
-+ // If loader is null, shouldn't call ClassLoader.checkPackageAccess; otherwise get
-+ // NPE. Put it in another way, the bootstrap class loader has all permission and
-+ // thus no checkPackageAccess equivalence in the VM class loader.
-+ // The caller is also passed as NULL by the java code if there is no security
-+ // manager to avoid the performance cost of getting the calling class.
-+ if (from_class != NULL && loader_oop != NULL) {
-+ protection_domain = java_lang_Class::as_Klass(from_class)->protection_domain();
-+ }
-+
-+ Handle h_loader(THREAD, loader_oop);
-+ Handle h_prot(THREAD, protection_domain);
-+ jclass result = find_class_from_class_loader(env, h_name, init, h_loader,
-+ h_prot, false, THREAD);
-+
-+ if (TraceClassResolution && result != NULL) {
-+ trace_class_resolution(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(result)));
-+ }
-+ return result;
-+JVM_END
-
- JVM_ENTRY(jclass, JVM_FindClassFromClass(JNIEnv *env, const char *name,
- jboolean init, jclass from))
-@@ -3966,10 +4003,15 @@
-
- // Shared JNI/JVM entry points //////////////////////////////////////////////////////////////
-
--jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS) {
-+jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init,
-+ Handle loader, Handle protection_domain,
-+ jboolean throwError, TRAPS) {
- // Security Note:
- // The Java level wrapper will perform the necessary security check allowing
-- // us to pass the NULL as the initiating class loader.
-+ // us to pass the NULL as the initiating class loader. The VM is responsible for
-+ // the checkPackageAccess relative to the initiating class loader via the
-+ // protection_domain. The protection_domain is passed as NULL by the java code
-+ // if there is no security manager in 3-arg Class.forName().
- Klass* klass = SystemDictionary::resolve_or_fail(name, loader, protection_domain, throwError != 0, CHECK_NULL);
-
- KlassHandle klass_handle(THREAD, klass);
-diff -r 9580ebccfdc3 -r 671021ba6f79 src/share/vm/prims/jvm.h
---- openjdk/hotspot/src/share/vm/prims/jvm.h Thu Sep 11 07:28:58 2014 -0400
-+++ openjdk/hotspot/src/share/vm/prims/jvm.h Thu May 08 17:19:49 2014 -0400
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -417,6 +417,19 @@
- JVM_FindClassFromBootLoader(JNIEnv *env, const char *name);
-
- /*
-+ * Find a class from a given class loader. Throws ClassNotFoundException.
-+ * name: name of class
-+ * init: whether initialization is done
-+ * loader: class loader to look up the class. This may not be the same as the caller's
-+ * class loader.
-+ * caller: initiating class. The initiating class may be null when a security
-+ * manager is not installed.
-+ */
-+JNIEXPORT jclass JNICALL
-+JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init,
-+ jobject loader, jclass caller);
-+
-+/*
- * Find a class from a given class.
- */
- JNIEXPORT jclass JNICALL
diff -r 45ac6cd7aae2 -r 2832e84a2b58 patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch
--- a/patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch Thu Jan 22 01:27:39 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,291 +0,0 @@
-# HG changeset patch
-# User hseigel
-# Date 1412453060 -3600
-# Sat Oct 04 21:04:20 2014 +0100
-# Node ID f26d56905af0d3d8584d7ebc1e77c0515742286c
-# Parent 671021ba6f79fadfb510be047b23dcdabe35160d
-8036533: Method for correct defaults
-8036156: Limit default method hierarchy
More information about the distro-pkg-dev
mailing list