/hg/release/icedtea7-2.3: 7 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 24 16:09:53 UTC 2014
changeset 54a01fed7fe2 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=54a01fed7fe2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jan 16 05:20:16 2014 +0000
Fix broken bootstrap.
2014-01-15 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/boot/ecj-multicatch.patch:
Add new cases in RSAClientKeyExchange
and Handshaker.
changeset 6971534a9128 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=6971534a9128
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Feb 25 16:38:08 2014 +0000
S7023639, CVE-2013-5838: JSR 292 method handle invocation needs a fast path for compiled code (Zero only)
S8029507, CVE-2013-5893: Enhance JVM method processing (Zero only)
S7192406: JSR 292: C2 needs exact return type information for invokedynamic and invokehandle call sites (Zero only)
S7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed (Zero only)
S7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path (Zero only)
S8000780: make Zero build and run with JDK8 (Zero only)
2014-02-25 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches for Zero builds only.
* NEWS: List new patches.
* patches/zero/7023639-8000780-jsr292_fast_path.patch,
* patches/zero/7192406-exact_return_type_info.patch,
* patches/zero/7196242-loopsandthreads_crashed.patch,
* patches/zero/7200949-jruby_fail.patch,
* patches/zero/8029507-jvm_method_processing.patch:
Backports of 7023639 and 8029507 security fixes for
Zero only, with required backports.
changeset 2df0b6e6b67f in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=2df0b6e6b67f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 21 20:25:44 2014 +0000
List bootstrap fix in NEWS.
2014-03-21 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: List bootstrap fix.
changeset 358293cf091b in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=358293cf091b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Feb 21 22:04:31 2014 +0000
Avoid giving PAX_COMMAND a value if no PaX utility is available.
2014-02-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_WITH_PAX): Leave PAX_COMMAND with the empty
string rather than "not specified" to avoid build
failures.
* pax-mark-vm.in: Update PAX_COMMAND check.
changeset 752098160f94 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=752098160f94
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 21 20:28:06 2014 +0000
PR1684: Build fails with empty PAX_COMMAND
2014-02-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1684: Build fails with empty PAX_COMMAND
* Makefile.am:
(ICEDTEA_ENV): Only add PAX_COMMAND when defined.
* NEWS: Updated.
changeset 1b8baaef20dd in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=1b8baaef20dd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 21 20:29:20 2014 +0000
Add Gentoo bug reference for PaX update.
2014-02-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Add Gentoo bug reference for
PaX update.
changeset 65e24999d804 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=65e24999d804
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 24 16:09:19 2014 +0000
Bring in latest changes from 2.4 branch and u51.
PR1653: Support ppc64le via Zero
PR1654: ppc32 needs a larger ThreadStackSize to build
PR1679: Allow OpenJDK to build on PaX-enabled kernels
2014-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/revert-7017193.patch:
Removed.
* patches/boot/ecj-diamond.patch: Remove unneeded
change to src/share/classes/java/beans/ThreadGroupContext.java
* Makefile.am:
(CORBA_CHANGESET): Update to icedtea-2.3 HEAD.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Remove 7017193 reversion.
* NEWS: Updated with latest changes, including PaX
ARM32 and Shark changes.
* acinclude.m4:
(IT_ENABLE_ARM32JIT): Enable by default.
* hotspot.map: Update to icedtea-2.3 HEAD.
2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/boot/test_gamma.patch,
* patches/pax-mark-rmic-java.patch,
* patches/test_gamma.patch:
Removed.
* INSTALL:
Document ARM32 JIT and --enable-arm32-jit option.
(ICEDTEA_PATCHES): Remove PaX patches.
(ICEDTEA_BOOT_PATCHES): Remove test_gamma
patch (fixed by detection of non-Oracle JDK
addition from PPC port)
(ARM32JIT_STATUS): Set based on ENABLE_ARM32JIT.
(ICEDTEA_ENV): Pass ARM32JIT to OpenJDK build.
* acinclude.m4:
(IT_ENABLE_ARM32JIT): Allow the ARM32 JIT to be
enabled.
* configure.ac: Run IT_ENABLE_ARM32JIT macro.
diffstat:
ChangeLog | 86 +
INSTALL | 5 +
Makefile.am | 50 +-
NEWS | 56 +-
acinclude.m4 | 29 +-
configure.ac | 1 +
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 1152 +-
patches/boot/ecj-multicatch.patch | 49 +
patches/boot/test_gamma.patch | 47 -
patches/pax-mark-rmic-java.patch | 10 -
patches/revert-7017193.patch | 138 -
patches/test_gamma.patch | 47 -
patches/zero/7023639-8000780-jsr292_fast_path.patch | 28468 ++++++++++++++++++
patches/zero/7192406-exact_return_type_info.patch | 660 +
patches/zero/7196242-loopsandthreads_crashed.patch | 124 +
patches/zero/7200949-jruby_fail.patch | 1045 +
patches/zero/8029507-jvm_method_processing.patch | 215 +
pax-mark-vm.in | 2 +-
19 files changed, 31334 insertions(+), 852 deletions(-)
diffs (truncated from 34267 to 500 lines):
diff -r 541d09b19300 -r 65e24999d804 ChangeLog
--- a/ChangeLog Mon Feb 24 18:59:38 2014 +0000
+++ b/ChangeLog Mon Mar 24 16:09:19 2014 +0000
@@ -1,3 +1,89 @@
+2014-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/revert-7017193.patch:
+ Removed.
+ * patches/boot/ecj-diamond.patch: Remove unneeded
+ change to src/share/classes/java/beans/ThreadGroupContext.java
+ * Makefile.am:
+ (CORBA_CHANGESET): Update to icedtea-2.3 HEAD.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Remove 7017193 reversion.
+ * NEWS: Updated with latest changes, including PaX
+ ARM32 and Shark changes.
+ * acinclude.m4:
+ (IT_ENABLE_ARM32JIT): Enable by default.
+ * hotspot.map: Update to icedtea-2.3 HEAD.
+
+2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/boot/test_gamma.patch,
+ * patches/pax-mark-rmic-java.patch,
+ * patches/test_gamma.patch:
+ Removed.
+ * INSTALL:
+ Document ARM32 JIT and --enable-arm32-jit option.
+ (ICEDTEA_PATCHES): Remove PaX patches.
+ (ICEDTEA_BOOT_PATCHES): Remove test_gamma
+ patch (fixed by detection of non-Oracle JDK
+ addition from PPC port)
+ (ARM32JIT_STATUS): Set based on ENABLE_ARM32JIT.
+ (ICEDTEA_ENV): Pass ARM32JIT to OpenJDK build.
+ * acinclude.m4:
+ (IT_ENABLE_ARM32JIT): Allow the ARM32 JIT to be
+ enabled.
+ * configure.ac: Run IT_ENABLE_ARM32JIT macro.
+
+2014-02-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Add Gentoo bug reference for
+ PaX update.
+
+2014-02-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1684: Build fails with empty PAX_COMMAND
+ * Makefile.am:
+ (ICEDTEA_ENV): Only add PAX_COMMAND when defined.
+ * NEWS: Updated.
+
+2014-02-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_WITH_PAX): Leave PAX_COMMAND with the empty
+ string rather than "not specified" to avoid build
+ failures.
+ * pax-mark-vm.in: Update PAX_COMMAND check.
+
+2014-03-21 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: List bootstrap fix.
+
+2014-02-25 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches for Zero builds only.
+ * NEWS: List new patches.
+ * patches/zero/7023639-8000780-jsr292_fast_path.patch,
+ * patches/zero/7192406-exact_return_type_info.patch,
+ * patches/zero/7196242-loopsandthreads_crashed.patch,
+ * patches/zero/7200949-jruby_fail.patch,
+ * patches/zero/8029507-jvm_method_processing.patch:
+ Backports of 7023639 and 8029507 security fixes for
+ Zero only, with required backports.
+
+2014-01-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/boot/ecj-multicatch.patch:
+ Add new cases in RSAClientKeyExchange
+ and Handshaker.
+
2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1677: Update PaX support to detect running PaX
diff -r 541d09b19300 -r 65e24999d804 INSTALL
--- a/INSTALL Mon Feb 24 18:59:38 2014 +0000
+++ b/INSTALL Mon Mar 24 16:09:19 2014 +0000
@@ -195,6 +195,7 @@
* --with-rhino: Include Javascript support using Rhino (location may optionally be specified).
* --with-additional-vms=vm-list: Additional VMs to build using the system described
below.
+* --enable-arm32-jit: Build the ARM32 JIT.
Testing
=======
@@ -294,6 +295,10 @@
--enable-shark to configure. Please note that Shark is still in
development and builds are still likely to fail at present.
+On ARM32, there is also a native JIT port built on top of Zero. This
+still has issues and is thus not enabled by default. To enable it,
+pass --enable-arm32-jit to configure.
+
Support for Different Versions of HotSpot
=========================================
diff -r 541d09b19300 -r 65e24999d804 Makefile.am
--- a/Makefile.am Mon Feb 24 18:59:38 2014 +0000
+++ b/Makefile.am Mon Mar 24 16:09:19 2014 +0000
@@ -4,19 +4,19 @@
JDK_UPDATE_VERSION = 25
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = f12e1c039846
-JAXP_CHANGESET = 691a5e0c657f
-JAXWS_CHANGESET = 1067e01a4e0e
-JDK_CHANGESET = bad5e0686160
+CORBA_CHANGESET = c7d0b72f704f
+JAXP_CHANGESET = 0eb202593710
+JAXWS_CHANGESET = 482a3f64a8ea
+JDK_CHANGESET = 3428bff8a33a
LANGTOOLS_CHANGESET = d50a9c5cd291
-OPENJDK_CHANGESET = 66eecafe5565
+OPENJDK_CHANGESET = 14181eb6c00d
-CORBA_SHA256SUM = 1da8714d86f7d9a91d835280662b95b257cb1b6f04b9d2dc5e30adb854b86cf0
-JAXP_SHA256SUM = 0c6f61c054613b5f06a8a16796ba020b0dd0f2d980c6eb0fc1ccc8bb41fce7dd
-JAXWS_SHA256SUM = 3957ca1fbf2a4f37f106a24d1cc0e45ae48a9916270150f1de1aead698b33124
-JDK_SHA256SUM = 5c107e2176a94d1d589920dfaef2a989a7b49bb92a63c68b3f44da297e70bf6b
+CORBA_SHA256SUM = 5d3811e2994d2d5f96d2ae8693e81354a3abede5dc5b75bfad15444136d77b13
+JAXP_SHA256SUM = 686022ea83f721dfdadc2dc835237fbca81383e7b1346191a8ef254ccfe3b565
+JAXWS_SHA256SUM = f8b8d787041c708809655e0f903bd4a86ffe1683c07890c58f39ea0b8c302eab
+JDK_SHA256SUM = b4ae9750bfec39285cce9cbb3b8589689137d3155165e7960c954311b95b567e
LANGTOOLS_SHA256SUM = 1ea31d21beb88f2512630523f24f3a35498deed1356c4c0bf8b901086dd2c13a
-OPENJDK_SHA256SUM = a8ed4cefc22353e6126f14a80bbf92d111c6bcfb58537c14e2916520de3f94f6
+OPENJDK_SHA256SUM = d883a9a04f11ae1616b3f162671d6926283cdd27233332c787350f76ba960ac5
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -264,8 +264,7 @@
# Patch list
-ICEDTEA_PATCHES = \
- patches/revert-7017193.patch
+ICEDTEA_PATCHES =
# Conditional patches
@@ -311,10 +310,13 @@
ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
endif
-if WITH_PAX
+if ZERO_BUILD
ICEDTEA_PATCHES += \
- patches/test_gamma.patch \
- patches/pax-mark-rmic-java.patch
+ patches/zero/7023639-8000780-jsr292_fast_path.patch \
+ patches/zero/7196242-loopsandthreads_crashed.patch \
+ patches/zero/7192406-exact_return_type_info.patch \
+ patches/zero/7200949-jruby_fail.patch \
+ patches/zero/8029507-jvm_method_processing.patch
endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -355,10 +357,6 @@
patches/boot/ecj-autoboxing.patch \
patches/boot/xsltproc.patch
-if !WITH_PAX
-ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
-endif
-
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
endif
@@ -438,6 +436,12 @@
WERROR_STATUS=false
endif
+if ENABLE_ARM32JIT
+ARM32JIT_STATUS=true
+else
+ARM32JIT_STATUS=false
+endif
+
ICEDTEA_ENV = \
ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
@@ -489,7 +493,8 @@
CUPS_CFLAGS="${CUPS_CFLAGS}" \
STRIP_POLICY=no_strip \
JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
- COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)"
+ COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \
+ ARM32JIT="${ARM32JIT_STATUS}"
if ENABLE_CACAO
ICEDTEA_ENV += \
@@ -593,6 +598,11 @@
COMPRESS_JARS="true"
endif
+if WITH_PAX
+ICEDTEA_ENV += \
+ PAX_COMMAND="${PAX_COMMAND}"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
diff -r 541d09b19300 -r 65e24999d804 NEWS
--- a/NEWS Mon Feb 24 18:59:38 2014 +0000
+++ b/NEWS Mon Mar 24 16:09:19 2014 +0000
@@ -12,8 +12,62 @@
New in release 2.3.14 (2014-01-XX):
+* Security fixes
+ - S7023639, CVE-2013-5838: JSR 292 method handle invocation needs a fast path for compiled code (Zero only)
+ - S8029507, CVE-2013-5893: Enhance JVM method processing (Zero only)
+* Backports
+ - S7024118: possible hardcoded mnemonic for JFileChooser metal and motif l&f
+ - S7032018: The file list in JFileChooser does not have an accessible name
+ - S7032436: When running with the Nimbus look and feel, the JFileChooser does not display mnemonics
+ - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
+ - S7192406: JSR 292: C2 needs exact return type information for invokedynamic and invokehandle call sites (Zero only)
+ - S7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed (Zero only)
+ - S7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path (Zero only)
+ - S8000780: make Zero build and run with JDK8 (Zero only)
+ - S8008764: 7uX l10n resource file translation update
+ - S8009062: poor performance of JNI AttachCurrentThread after fix for 7017193
+ - S8013057: assert(_needs_gc || SafepointSynchronize::is_at_safepoint()) failed: only read at safepoint
+ - S8015976: OpenJDK part of bug JDK-8015812 [TEST_BUG] Tests have conflicting test descriptions
+ - S8022698: javax/script/GetInterfaceTest.java fails since 7u45 b04 with -agentvm option
+ - S8023310: Thread contention in the method Beans.IsDesignTime()
+ - S8024302: Clarify jar verifications
+ - S8024461: [macosx] Java crashed on mac10.9 for swing and 2d function manual test
+ - S8025255: (tz) Support tzdata2013g
+ - S8026037: [TESTBUG] sun/security/tools/jarsigner/warnings.sh test fails on Solaris
+ - S8026304: jarsigner output bad grammar
+ - S8026887: Make issues due to failed large pages allocations easier to debug
+ - S8027204: Revise the update of 8026204 and 8025758
+ - S8027224: test regression - ClassNotFoundException
+ - S8027370: Support tzdata2013h
+ - S8027378: Two closed/javax/xml/8005432 fails with jdk7u51b04
+ - S8027837: JDK-8021257 causes CORBA build failure on emdedded platforms
+ - S8027943: serial version of com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl changed in 7u45
+ - S8028057: Modify jarsigner man page documentation to document CCC 8024302: Clarify jar verifications
+ - S8028111: XML readers share the same entity expansion counter
+ - S8028215: ORB.init fails with SecurityException if properties select the JDK default ORB
+ - S8028293: Check local configuration for actual ephemeral port range
+ - S8028382: Two javax/xml/8005433 tests still fail after the fix JDK-8028147
+ - S8028453: AsynchronousSocketChannel.connect() requires SocketPermission due to bind to local address (win)
+ - S8028823: java/net/Makefile tabs converted to spaces
+ - S8029038: Revise fix for XML readers share the same entity expansion counter
* Bug fixes
- - PR1677: Update PaX support to detect running PaX kernel and use newer tools
+ - Fix broken bootstrap build by updating ecj-multicatch.patch
+ - PR1654: ppc32 needs a larger ThreadStackSize to build
+ - PR1677, G498288: Update PaX support to detect running PaX kernel and use newer tools
+ - PR1679: Allow OpenJDK to build on PaX-enabled kernels
+ - PR1684: Build fails with empty PAX_COMMAND
+ - Re-enable the 'gamma' test at the end of the HotSpot build, but only for HotSpot based bootstrap JDKs.
+ - RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix)
+ - RH910107: fail to load PC/SC library
+* New features
+ - PR1653: Support ppc64le via Zero
+* ARM port
+ - Allow ARM32 JIT to be disabled
+ - Replace literal offsets for METHOD_SIZEOFPARAMETERS and ISTATE_NEXT_FRAME with correct symbolic names.
+ - Turn ARM32 JIT on by default
+* Shark
+ - Add Shark definitions from 8003868
+ - Drop compile_method argument removed in 7083786 from sharkCompiler.cpp
New in release 2.3.13 (2014-01-14):
diff -r 541d09b19300 -r 65e24999d804 acinclude.m4
--- a/acinclude.m4 Mon Feb 24 18:59:38 2014 +0000
+++ b/acinclude.m4 Mon Mar 24 16:09:19 2014 +0000
@@ -2296,10 +2296,7 @@
fi
fi
fi
- if test -z "${PAX_COMMAND}"; then
- PAX_COMMAND="not specified"
- PAX_COMMAND_ARGS="not specified"
- else
+ if test -n "${PAX_COMMAND}"; then
AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
case "${host_cpu}" in
i?86)
@@ -2311,7 +2308,7 @@
esac
AC_MSG_RESULT(${PAX_COMMAND_ARGS})
fi
- AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
+ AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "x")
AC_SUBST(PAX_COMMAND)
AC_SUBST(PAX_COMMAND_ARGS)
])
@@ -2497,3 +2494,25 @@
AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN([IT_ENABLE_ARM32JIT],
+[
+ AC_MSG_CHECKING([whether to enable the ARM32 JIT])
+ AC_ARG_ENABLE([arm32-jit],
+ [AS_HELP_STRING(--enable-arm32-jit,build with the ARM32 JIT [[default=no]])],
+ [
+ case "${enableval}" in
+ yes)
+ enable_arm32jit=yes
+ ;;
+ *)
+ enable_arm32jit=no
+ ;;
+ esac
+ ],
+ [
+ enable_arm32jit=yes
+ ])
+ AC_MSG_RESULT([$enable_arm32jit])
+ AM_CONDITIONAL([ENABLE_ARM32JIT], test x"${enable_arm32jit}" = "xyes")
+])
diff -r 541d09b19300 -r 65e24999d804 configure.ac
--- a/configure.ac Mon Feb 24 18:59:38 2014 +0000
+++ b/configure.ac Mon Mar 24 16:09:19 2014 +0000
@@ -181,6 +181,7 @@
IT_ENABLE_JAR_COMPRESSION
IT_SET_SHARK_BUILD
IT_CHECK_ADDITIONAL_VMS
+IT_ENABLE_ARM32JIT
IT_WITH_VERSION_SUFFIX
IT_WITH_PROJECT
diff -r 541d09b19300 -r 65e24999d804 hotspot.map
--- a/hotspot.map Mon Feb 24 18:59:38 2014 +0000
+++ b/hotspot.map Mon Mar 24 16:09:19 2014 +0000
@@ -1,2 +1,2 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 3442eb7ef2d2 cda53696c0c5240f59ca8b21c8c38a347714ee95d0434f228e3a794b1aad65b4
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 9747f83d7a38 afc6b4e85ee0673da8effe4ba6eaba4a8f1edcc80d0c557f35157d970cb2e601
diff -r 541d09b19300 -r 65e24999d804 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Mon Feb 24 18:59:38 2014 +0000
+++ b/patches/boot/ecj-diamond.patch Mon Mar 24 16:09:19 2014 +0000
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-03-08 16:05:05.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-04-17 14:53:25.283551366 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-01-23 23:19:18.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-03-24 13:47:00.726495741 +0000
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,9 +11,9 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-03-08 16:05:05.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-04-17 14:53:25.291551495 +0100
-@@ -1316,7 +1316,7 @@
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-01-23 23:19:18.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-03-24 13:47:00.726495741 +0000
+@@ -1315,7 +1315,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
synchronized (this) {
@@ -23,8 +23,8 @@
for (ObjectAdapterFactory oaf : oaset)
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-03-08 16:05:05.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-04-17 14:53:25.291551495 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-01-23 23:19:18.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-03-24 13:47:00.726495741 +0000
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,9 +44,9 @@
for (WorkerThread wt : copy) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-15 23:41:13.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-17 14:53:25.291551495 +0100
-@@ -62,9 +62,10 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-01-28 18:02:26.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-03-24 13:47:00.726495741 +0000
+@@ -63,9 +63,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
private final AccessControlContext acc = AccessController.getContext();
@@ -61,8 +61,8 @@
private Reference<ClassLoader> loader;
private ExceptionListener listener;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-15 23:41:13.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-17 14:53:25.291551495 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-01-28 18:02:26.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-03-24 13:47:00.726495741 +0000
@@ -239,9 +239,9 @@
}
}
@@ -76,8 +76,8 @@
/**
* Constructs the type resolver for the given actual type.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-15 23:41:13.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-17 14:53:25.291551495 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-01-28 18:02:26.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-03-24 13:47:00.730495800 +0000
@@ -103,9 +103,9 @@
return this.def.compareTo(that.def);
}
@@ -149,8 +149,8 @@
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-17 14:52:22.422547047 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-17 14:53:25.291551495 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-03-24 13:25:33.695413121 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-03-24 13:47:00.730495800 +0000
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -219,8 +219,8 @@
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-17 14:52:22.294545002 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-17 14:53:25.291551495 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-03-24 13:25:33.571411269 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-03-24 13:47:00.730495800 +0000
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -231,8 +231,8 @@
InnerClass ic =
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-15 23:41:13.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-17 14:53:25.295551558 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-01-28 18:02:26.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-03-24 13:47:00.730495800 +0000
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -269,8 +269,8 @@
if (popset.add(values[i])) popvals.add(values[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-15 23:41:13.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-17 14:53:25.295551558 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-01-28 18:02:26.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-03-24 13:47:00.730495800 +0000
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -281,8 +281,8 @@
Coding x1 = codeMap.get(x0);
if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-15 23:41:13.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-17 14:53:25.295551558 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-01-28 18:02:26.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-03-24 13:47:00.730495800 +0000
@@ -915,7 +915,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -311,8 +311,8 @@
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-17 14:52:22.422547047 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-17 14:53:25.295551558 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-03-24 13:25:33.695413121 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-03-24 13:47:00.730495800 +0000
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -350,8 +350,8 @@
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-15 23:41:13.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-17 14:53:25.295551558 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-01-28 18:02:26.000000000 +0000
More information about the distro-pkg-dev
mailing list